You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by me...@apache.org on 2022/08/26 22:42:46 UTC
[myfaces] branch main updated: MYFACE-4387: JSF to Faces in Javadoc (#271)
This is an automated email from the ASF dual-hosted git repository.
melloware pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/main by this push:
new e9fe59f96 MYFACE-4387: JSF to Faces in Javadoc (#271)
e9fe59f96 is described below
commit e9fe59f96410f31a7f5c0fbd6838c1a22683a691
Author: Melloware <me...@gmail.com>
AuthorDate: Fri Aug 26 18:42:40 2022 -0400
MYFACE-4387: JSF to Faces in Javadoc (#271)
* MYFACE-4387: JSF to Faces in Javadoc
* Update UIViewParameter.java
* Update DefaultTagDecorator.java
---
.../main/java/jakarta/faces/FacesException.java | 2 +-
api/src/main/java/jakarta/faces/FacesWrapper.java | 2 +-
api/src/main/java/jakarta/faces/FactoryFinder.java | 4 +-
.../jakarta/faces/application/Application.java | 14 +-
.../faces/application/ApplicationFactory.java | 2 +-
.../jakarta/faces/application/FacesMessage.java | 2 +-
.../faces/application/NavigationHandler.java | 2 +-
.../jakarta/faces/application/StateManager.java | 14 +-
.../faces/application/StateManagerWrapper.java | 2 +-
.../faces/application/ViewExpiredException.java | 2 +-
.../jakarta/faces/application/ViewHandler.java | 28 ++--
.../faces/application/ViewHandlerWrapper.java | 2 +-
.../java/jakarta/faces/component/ActionSource.java | 2 +-
.../jakarta/faces/component/ActionSource2.java | 2 +-
.../jakarta/faces/component/ContextCallback.java | 2 +-
.../faces/component/EditableValueHolder.java | 2 +-
.../jakarta/faces/component/NamingContainer.java | 8 +-
.../java/jakarta/faces/component/StateHolder.java | 2 +-
.../java/jakarta/faces/component/UIColumn.java | 2 +-
.../java/jakarta/faces/component/UIComponent.java | 6 +-
.../jakarta/faces/component/UIComponentBase.java | 12 +-
.../main/java/jakarta/faces/component/UIData.java | 6 +-
.../main/java/jakarta/faces/component/UIForm.java | 2 +-
.../java/jakarta/faces/component/UIGraphic.java | 2 +-
.../main/java/jakarta/faces/component/UIInput.java | 6 +-
.../jakarta/faces/component/UISelectBoolean.java | 2 +-
.../java/jakarta/faces/component/UISelectOne.java | 2 +-
.../java/jakarta/faces/component/UIViewAction.java | 4 +-
.../java/jakarta/faces/component/UIViewRoot.java | 20 +--
.../java/jakarta/faces/component/ValueHolder.java | 2 +-
.../faces/component/_ComponentAttributesMap.java | 4 +-
.../java/jakarta/faces/component/_UIParameter.java | 2 +-
.../jakarta/faces/component/_UISelectItem.java | 2 +-
.../jakarta/faces/component/_UISelectItems.java | 4 +-
.../faces/component/html/_HtmlInputSecret.java | 2 +-
.../faces/component/html/_HtmlOutputLabel.java | 2 +-
.../component/html/_HtmlSelectManyListbox.java | 2 +-
.../component/html/_HtmlSelectOneListbox.java | 2 +-
.../jakarta/faces/context/ExternalContext.java | 28 ++--
.../java/jakarta/faces/context/FacesContext.java | 16 +--
.../jakarta/faces/context/FacesContextFactory.java | 2 +-
.../faces/context/PartialResponseWriter.java | 2 +-
.../java/jakarta/faces/context/ResponseStream.java | 2 +-
.../java/jakarta/faces/context/ResponseWriter.java | 2 +-
.../faces/context/ResponseWriterWrapper.java | 2 +-
.../jakarta/faces/convert/BigDecimalConverter.java | 2 +-
.../jakarta/faces/convert/BigIntegerConverter.java | 2 +-
.../jakarta/faces/convert/BooleanConverter.java | 2 +-
.../java/jakarta/faces/convert/ByteConverter.java | 2 +-
.../jakarta/faces/convert/CharacterConverter.java | 2 +-
.../main/java/jakarta/faces/convert/Converter.java | 2 +-
.../jakarta/faces/convert/ConverterException.java | 2 +-
.../jakarta/faces/convert/DateTimeConverter.java | 2 +-
.../jakarta/faces/convert/DoubleConverter.java | 2 +-
.../java/jakarta/faces/convert/EnumConverter.java | 2 +-
.../java/jakarta/faces/convert/FloatConverter.java | 2 +-
.../jakarta/faces/convert/IntegerConverter.java | 2 +-
.../java/jakarta/faces/convert/LongConverter.java | 2 +-
.../jakarta/faces/convert/NumberConverter.java | 2 +-
.../java/jakarta/faces/convert/ShortConverter.java | 2 +-
.../el/CompositeComponentExpressionHolder.java | 2 +-
.../faces/event/AbortProcessingException.java | 2 +-
.../main/java/jakarta/faces/event/ActionEvent.java | 2 +-
.../java/jakarta/faces/event/ActionListener.java | 2 +-
.../main/java/jakarta/faces/event/FacesEvent.java | 2 +-
.../java/jakarta/faces/event/FacesListener.java | 2 +-
.../main/java/jakarta/faces/event/PhaseEvent.java | 2 +-
api/src/main/java/jakarta/faces/event/PhaseId.java | 2 +-
.../java/jakarta/faces/event/PhaseListener.java | 2 +-
.../java/jakarta/faces/event/ValueChangeEvent.java | 2 +-
.../jakarta/faces/event/ValueChangeListener.java | 2 +-
.../java/jakarta/faces/lifecycle/Lifecycle.java | 2 +-
.../jakarta/faces/lifecycle/LifecycleFactory.java | 2 +-
.../java/jakarta/faces/model/ArrayDataModel.java | 2 +-
.../main/java/jakarta/faces/model/DataModel.java | 2 +-
.../java/jakarta/faces/model/DataModelEvent.java | 2 +-
.../jakarta/faces/model/DataModelListener.java | 2 +-
.../java/jakarta/faces/model/ListDataModel.java | 2 +-
.../jakarta/faces/model/ResultSetDataModel.java | 2 +-
.../java/jakarta/faces/model/ScalarDataModel.java | 2 +-
.../main/java/jakarta/faces/model/SelectItem.java | 2 +-
.../java/jakarta/faces/model/SelectItemGroup.java | 2 +-
.../main/java/jakarta/faces/render/RenderKit.java | 2 +-
.../jakarta/faces/render/RenderKitFactory.java | 2 +-
.../main/java/jakarta/faces/render/Renderer.java | 2 +-
.../jakarta/faces/render/ResponseStateManager.java | 2 +-
.../jakarta/faces/validator/BeanValidator.java | 8 +-
.../faces/validator/DoubleRangeValidator.java | 2 +-
.../jakarta/faces/validator/LengthValidator.java | 2 +-
.../faces/validator/LongRangeValidator.java | 2 +-
.../faces/validator/MethodExpressionValidator.java | 2 +-
.../jakarta/faces/validator/RegexValidator.java | 2 +-
.../java/jakarta/faces/validator/Validator.java | 2 +-
.../faces/validator/ValidatorException.java | 2 +-
.../faces/view/facelets/ComponentHandler.java | 4 +-
.../java/jakarta/faces/view/facelets/Facelet.java | 2 +-
.../faces/view/facelets/FaceletContext.java | 2 +-
.../java/jakarta/faces/webapp/FacesServlet.java | 6 +-
.../core/api/shared/CommonHtmlAttributes.java | 2 +-
.../myfaces/core/api/shared/MessageUtils.java | 4 +-
.../myfaces/application/ApplicationImpl.java | 10 +-
...ackwardsCompatibleNavigationHandlerWrapper.java | 4 +-
.../myfaces/application/NavigationHandlerImpl.java | 16 +--
.../myfaces/application/ResourceHandlerImpl.java | 4 +-
.../myfaces/application/ViewHandlerImpl.java | 2 +-
.../apache/myfaces/application/ViewIdSupport.java | 10 +-
.../managedproperty/ManagedPropertyProducer.java | 2 +-
.../myfaces/cdi/util/AbstractDynamicProducer.java | 2 +-
.../component/ComponentResourceContainer.java | 2 +-
.../component/validate/WholeBeanValidator.java | 2 +-
.../config/DefaultFacesConfigurationMerger.java | 8 +-
.../config/DefaultFacesConfigurationProvider.java | 4 +-
.../apache/myfaces/config/FacesConfigurator.java | 12 +-
.../org/apache/myfaces/config/MyfacesConfig.java | 18 +--
.../org/apache/myfaces/config/RuntimeConfig.java | 2 +-
.../annotation/DefaultAnnotationProvider.java | 3 +-
.../config/impl/FacesConfigEntityResolver.java | 2 +-
.../config/impl/FacesConfigUnmarshallerImpl.java | 2 +-
.../myfaces/context/AjaxExceptionHandlerImpl.java | 2 +-
.../apache/myfaces/context/flash/FlashImpl.java | 4 +-
.../context/servlet/FacesContextImplBase.java | 4 +-
.../context/servlet/PartialViewContextImpl.java | 2 +-
.../servlet/ServletExternalContextImpl.java | 18 +--
.../myfaces/el/DefaultELResolverBuilder.java | 2 +-
.../java/org/apache/myfaces/el/FacesELContext.java | 2 +-
.../el/resolver/CompositeComponentELResolver.java | 4 +-
.../myfaces/el/resolver/ImportHandlerResolver.java | 2 +-
.../el/resolver/ResourceBundleResolver.java | 4 +-
.../myfaces/el/resolver/ResourceResolver.java | 4 +-
.../el/resolver/ScopedAttributeResolver.java | 2 +-
.../implicitobject/FacesContextImplicitObject.java | 2 +-
.../implicitobject/ImplicitObjectResolver.java | 5 +-
.../implicitobject/ViewImplicitObject.java | 2 +-
.../lifecycle/ApplyRequestValuesExecutor.java | 2 +-
.../lifecycle/InvokeApplicationExecutor.java | 2 +-
.../apache/myfaces/lifecycle/LifecycleImpl.java | 4 +-
.../myfaces/lifecycle/PhaseListenerManager.java | 8 +-
.../lifecycle/ProcessValidationsExecutor.java | 2 +-
.../myfaces/lifecycle/RenderResponseExecutor.java | 2 +-
.../myfaces/lifecycle/RestoreViewExecutor.java | 8 +-
.../myfaces/lifecycle/RestoreViewSupport.java | 6 +-
.../lifecycle/UpdateModelValuesExecutor.java | 2 +-
.../clientwindow/WindowContextConfig.java | 2 +-
.../myfaces/renderkit/RenderKitFactoryImpl.java | 4 +-
.../apache/myfaces/renderkit/RendererUtils.java | 6 +-
.../myfaces/renderkit/html/HtmlRenderKitImpl.java | 4 +-
.../renderkit/html/HtmlResponseStateManager.java | 6 +-
.../renderkit/html/HtmlResponseWriterImpl.java | 6 +-
.../html/base/HtmlButtonRendererBase.java | 2 +-
.../renderkit/html/base/HtmlGridRendererBase.java | 2 +-
.../renderkit/html/base/HtmlLinkRendererBase.java | 4 +-
.../html/base/HtmlSecretRendererBase.java | 2 +-
.../html/base/HtmlSelectableRendererBase.java | 2 +-
.../renderkit/html/base/HtmlTableRendererBase.java | 6 +-
.../renderkit/html/util/ComponentAttrs.java | 2 +-
.../renderkit/html/util/HtmlRendererUtils.java | 6 +-
.../renderkit/html/util/SelectItemsUtils.java | 4 +-
.../org/apache/myfaces/spi/AnnotationProvider.java | 4 +-
.../myfaces/spi/FacesConfigurationMerger.java | 2 +-
.../myfaces/spi/FacesConfigurationProvider.java | 7 +-
.../myfaces/spi/FactoryFinderProviderFactory.java | 4 +-
.../org/apache/myfaces/spi/InjectionProvider.java | 4 +-
.../spi/ResourceLibraryContractsProvider.java | 2 +-
.../DefaultFacesConfigurationMergerFactory.java | 2 +-
.../apache/myfaces/util/ExternalContextUtils.java | 4 +-
.../myfaces/view/HttpServletResponseSwitch.java | 2 +-
.../apache/myfaces/view/ServletResponseSwitch.java | 2 +-
.../myfaces/view/ViewDeclarationLanguageBase.java | 2 +-
.../view/ViewDeclarationLanguageFactoryImpl.java | 2 +-
.../facelets/FaceletViewDeclarationLanguage.java | 8 +-
.../myfaces/view/facelets/FaceletsVDLUtils.java | 2 +-
.../facelets/PartialStateManagementStrategy.java | 6 +-
.../view/facelets/compiler/CompilationManager.java | 2 +-
.../myfaces/view/facelets/compiler/Compiler.java | 2 +-
.../myfaces/view/facelets/pool/ViewPool.java | 2 +-
.../myfaces/view/facelets/tag/TagHandlerUtils.java | 2 +-
.../CompositeComponentResourceTagHandler.java | 2 +-
.../view/facelets/tag/faces/ActionSourceRule.java | 2 +-
.../view/facelets/tag/faces/ComponentSupport.java | 2 +-
.../tag/faces/ComponentTagHandlerDelegate.java | 4 +-
.../tag/faces/EditableValueHolderRule.java | 2 +-
.../view/facelets/tag/faces/core/CoreLibrary.java | 2 +-
.../tag/faces/html/DefaultTagDecorator.java | 6 +-
.../facelets/tag/jstl/core/JstlCoreLibrary.java | 4 +-
.../tag/jstl/core/LegacyJstlCoreLibrary.java | 4 +-
.../myfaces/webapp/FacesInitializerImpl.java | 6 +-
.../webapp/MyFacesContainerInitializer.java | 6 +-
.../myfaces/webapp/MyFacesHttpSessionListener.java | 2 +-
.../webapp/StartupServletContextListener.java | 2 +-
.../faces/application/FacesMessageTest.java | 2 +-
.../jakarta/faces/component/UIOutputPSSTest.java | 4 +-
.../event/MethodExpressionActionListenerTest.java | 4 +-
.../MethodExpressionValueChangeListenerTest.java | 4 +-
.../myfaces/context/flash/FlashImplTest.java | 150 ++++++++++-----------
.../behavior/HtmlClientEventAttributesUtil.java | 2 +-
.../myfaces/test/core/AbstractMyFacesTestCase.java | 6 +-
.../myfaces/test/core/mock/MockMyFacesClient.java | 2 +-
.../test/core/runner/AbstractJsfTestContainer.java | 6 +-
.../test/utils/HtmlCheckAttributesUtil.java | 4 +-
.../myfaces/view/facelets/ExceptionTestCase.java | 6 +-
.../myfaces/view/facelets/bean/HelloWorld.java | 2 +-
.../compiler/HTML5FaceletsProcessingTestCase.java | 2 +-
.../LocalizedCompositeComponentTestCase.java | 2 +-
203 files changed, 459 insertions(+), 458 deletions(-)
diff --git a/api/src/main/java/jakarta/faces/FacesException.java b/api/src/main/java/jakarta/faces/FacesException.java
index 0220902ed..84cbc8a38 100755
--- a/api/src/main/java/jakarta/faces/FacesException.java
+++ b/api/src/main/java/jakarta/faces/FacesException.java
@@ -19,7 +19,7 @@
package jakarta.faces;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public class FacesException extends RuntimeException
{
diff --git a/api/src/main/java/jakarta/faces/FacesWrapper.java b/api/src/main/java/jakarta/faces/FacesWrapper.java
index d479b1ffb..823c03dd7 100644
--- a/api/src/main/java/jakarta/faces/FacesWrapper.java
+++ b/api/src/main/java/jakarta/faces/FacesWrapper.java
@@ -19,7 +19,7 @@
package jakarta.faces;
/**
- * Any wrapper class in JSF that must provide access to the object it wraps must implement this interface.
+ * Any wrapper class in Faces that must provide access to the object it wraps must implement this interface.
*
* @since 2.0
*/
diff --git a/api/src/main/java/jakarta/faces/FactoryFinder.java b/api/src/main/java/jakarta/faces/FactoryFinder.java
index a462a6a64..6dbd1bc43 100755
--- a/api/src/main/java/jakarta/faces/FactoryFinder.java
+++ b/api/src/main/java/jakarta/faces/FactoryFinder.java
@@ -51,7 +51,7 @@ import org.apache.myfaces.core.api.shared.lang.Assert;
import org.apache.myfaces.core.api.shared.lang.ClassUtils;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public final class FactoryFinder
{
@@ -171,7 +171,7 @@ public final class FactoryFinder
* </p>
*
* <p>
- * The standard factories and wrappers in JSF all implement the interface {@link FacesWrapper}. If the returned
+ * The standard factories and wrappers in Faces all implement the interface {@link FacesWrapper}. If the returned
* <code>Object</code> is an implementation of one of the standard factories, it must be legal to cast it to an
* instance of <code>FacesWrapper</code> and call {@link FacesWrapper#getWrapped()} on the instance.
* </p>
diff --git a/api/src/main/java/jakarta/faces/application/Application.java b/api/src/main/java/jakarta/faces/application/Application.java
index 5239a95d9..f70d23617 100755
--- a/api/src/main/java/jakarta/faces/application/Application.java
+++ b/api/src/main/java/jakarta/faces/application/Application.java
@@ -57,7 +57,7 @@ import jakarta.faces.validator.Validator;
* {@link ApplicationFactory}. Because this instance is shared, it must be implemented in a thread-safe manner.
* </p>
*
- * Holds webapp-wide resources for a JSF application. There is a single one of these for a web application, accessable
+ * Holds webapp-wide resources for a Faces application. There is a single one of these for a web application, accessable
* via
*
* <pre>
@@ -67,7 +67,7 @@ import jakarta.faces.validator.Validator;
* In particular, this provides a factory for UIComponent objects. It also provides convenience methods for creating
* ValueBinding objects.
*
- * See Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * See Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
@SuppressWarnings("deprecation")
public abstract class Application
@@ -115,7 +115,7 @@ public abstract class Application
return null;
}
- // The concrete methods throwing UnsupportedOperationExceptiom were added for JSF 1.2.
+ // The concrete methods throwing UnsupportedOperationExceptiom were added for Faces 1.2.
// They supply default to allows old Application implementations to still work.
/**
@@ -247,7 +247,7 @@ public abstract class Application
*/
public void addELResolver(ELResolver resolver)
{
- // The following concrete methods were added for JSF 1.2. They supply default
+ // The following concrete methods were added for Faces 1.2. They supply default
// implementations that throw UnsupportedOperationException.
// This allows old Application implementations to still work.
Application application = getMyfacesApplicationInstance();
@@ -769,7 +769,7 @@ public abstract class Application
/**
* <p>
- * Return the singleton, stateless, thread-safe <code>{@link ResourceHandler}</code> for this application. The JSF
+ * Return the singleton, stateless, thread-safe <code>{@link ResourceHandler}</code> for this application. The Faces
* implementation must support the following techniques for declaring an alternate implementation of <code>
* ResourceHandler</code>.
* </p>
@@ -785,7 +785,7 @@ public abstract class Application
*
* <p>
* In all of the above cases, the runtime must employ the decorator pattern as for every other pluggable artifact in
- * JSF.
+ * Faces.
* </p>
*
* @since 2.0
@@ -1170,7 +1170,7 @@ public abstract class Application
public void addSearchKeywordResolver(SearchKeywordResolver resolver)
{
- // The following concrete methods were added for JSF 1.2. They supply default
+ // The following concrete methods were added for Faces 1.2. They supply default
// implementations that throw UnsupportedOperationException.
// This allows old Application implementations to still work.
Application application = getMyfacesApplicationInstance();
diff --git a/api/src/main/java/jakarta/faces/application/ApplicationFactory.java b/api/src/main/java/jakarta/faces/application/ApplicationFactory.java
index 645fdd0ac..7ad3e540e 100755
--- a/api/src/main/java/jakarta/faces/application/ApplicationFactory.java
+++ b/api/src/main/java/jakarta/faces/application/ApplicationFactory.java
@@ -21,7 +21,7 @@ package jakarta.faces.application;
import jakarta.faces.FacesWrapper;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public abstract class ApplicationFactory implements FacesWrapper<ApplicationFactory>
{
diff --git a/api/src/main/java/jakarta/faces/application/FacesMessage.java b/api/src/main/java/jakarta/faces/application/FacesMessage.java
index 450ba90d9..6c7108154 100755
--- a/api/src/main/java/jakarta/faces/application/FacesMessage.java
+++ b/api/src/main/java/jakarta/faces/application/FacesMessage.java
@@ -107,7 +107,7 @@ public class FacesMessage implements Serializable
VALUES_MAP = Collections.unmodifiableMap(map);
List<FacesMessage.Severity> severityList = new ArrayList<Severity>(map.values());
- Collections.sort(severityList); // the JSF spec requires it to be sorted
+ Collections.sort(severityList); // the Faces spec requires it to be sorted
VALUES = Collections.unmodifiableList(severityList);
}
diff --git a/api/src/main/java/jakarta/faces/application/NavigationHandler.java b/api/src/main/java/jakarta/faces/application/NavigationHandler.java
index 56fdeeda3..1da764751 100755
--- a/api/src/main/java/jakarta/faces/application/NavigationHandler.java
+++ b/api/src/main/java/jakarta/faces/application/NavigationHandler.java
@@ -21,7 +21,7 @@ package jakarta.faces.application;
import jakarta.faces.context.FacesContext;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public abstract class NavigationHandler
{
diff --git a/api/src/main/java/jakarta/faces/application/StateManager.java b/api/src/main/java/jakarta/faces/application/StateManager.java
index 611864540..b3d7c56c9 100755
--- a/api/src/main/java/jakarta/faces/application/StateManager.java
+++ b/api/src/main/java/jakarta/faces/application/StateManager.java
@@ -33,7 +33,7 @@ import org.apache.myfaces.core.api.shared.lang.Assert;
* <p>
* It is up to the concrete implementation to decide whether to use information from the "view template" that was used
* to first create the view, or whether to store sufficient information to enable the view to be restored without any
- * reference to the original template. However as JSF components have mutable fields that can be set by code, and
+ * reference to the original template. However as Faces components have mutable fields that can be set by code, and
* affected by user input, at least some state does need to be kept in order to recreate a previously-existing component
* tree.
* <p>
@@ -49,12 +49,12 @@ import org.apache.myfaces.core.api.shared.lang.Assert;
* <p>
* This class is usually invoked by a concrete implementation of ViewHandler.
* <p>
- * Note that class ViewHandler isolates JSF components from the details of the request format. This class isolates JSF
- * components from the details of the response format. Because request and response are usually tightly coupled, the
- * StateManager and ViewHandler implementations are also usually fairly tightly coupled (ie the ViewHandler/StateManager
- * implementations come as pairs).
+ * Note that class ViewHandler isolates Faces components from the details of the request format. This class isolates
+ * Faces components from the details of the response format. Because request and response are typically tightly coupled,
+ * the StateManager and ViewHandler implementations are also typically fairly tightly coupled (ie the
+ * ViewHandler/StateManager implementations come as pairs).
* <p>
- * See also the <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * See also the <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public abstract class StateManager
{
@@ -196,7 +196,7 @@ public abstract class StateManager
* When server-side state is enabled, at most a "token" is expected to be written.
* <p>
* This method should be overridden by subclasses. It is not abstract because a default implementation is provided
- * that forwards to the old writeState method; this allows subclasses of StateManager written using the JSF1.1 API
+ * that forwards to the old writeState method; this allows subclasses of StateManager written using the Faces1.1 API
* to continue to work.
* <p>
*
diff --git a/api/src/main/java/jakarta/faces/application/StateManagerWrapper.java b/api/src/main/java/jakarta/faces/application/StateManagerWrapper.java
index eda7df302..0e5edf6f9 100644
--- a/api/src/main/java/jakarta/faces/application/StateManagerWrapper.java
+++ b/api/src/main/java/jakarta/faces/application/StateManagerWrapper.java
@@ -24,7 +24,7 @@ import jakarta.faces.FacesWrapper;
import java.io.IOException;
/**
- * see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public abstract class StateManagerWrapper extends StateManager implements FacesWrapper<StateManager>
{
diff --git a/api/src/main/java/jakarta/faces/application/ViewExpiredException.java b/api/src/main/java/jakarta/faces/application/ViewExpiredException.java
index ed6780b61..d950e28db 100644
--- a/api/src/main/java/jakarta/faces/application/ViewExpiredException.java
+++ b/api/src/main/java/jakarta/faces/application/ViewExpiredException.java
@@ -22,7 +22,7 @@ package jakarta.faces.application;
import jakarta.faces.FacesException;
/**
- * See Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * See Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public class ViewExpiredException extends FacesException
{
diff --git a/api/src/main/java/jakarta/faces/application/ViewHandler.java b/api/src/main/java/jakarta/faces/application/ViewHandler.java
index d9c875703..5d74f0bca 100755
--- a/api/src/main/java/jakarta/faces/application/ViewHandler.java
+++ b/api/src/main/java/jakarta/faces/application/ViewHandler.java
@@ -49,7 +49,7 @@ import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConf
* rendering methods on components; see method "renderView".
* <p>
* This class also isolates callers from the underlying request/response system. In particular, this class does not
- * explicitly depend upon the jakarta.servlet apis. This allows JSF to be used on servers that do not implement the
+ * explicitly depend upon the jakarta.servlet apis. This allows Faces to be used on servers that do not implement the
* servlet API (for example, plain CGI).
* <p>
* Examples:
@@ -63,7 +63,7 @@ import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConf
* This class is expected to be invoked via the concrete implementation of {@link jakarta.faces.lifecycle.Lifecycle}.
* <p>
* For the official specification for this class, see <a
- * href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>.
+ * href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>.
*/
public abstract class ViewHandler
{
@@ -74,7 +74,7 @@ public abstract class ViewHandler
/**
* Indicate the default suffixes, separated by spaces to derive the default file URI
- * used by JSF to create views and render pages.
+ * used by Faces to create views and render pages.
*/
@JSFWebConfigParam(defaultValue=".xhtml", since="1.1", group="viewhandler", deprecated = true)
@Deprecated(since = "4.0")
@@ -133,7 +133,7 @@ public abstract class ViewHandler
public static final java.lang.String FACELETS_SKIP_COMMENTS_PARAM_NAME = "jakarta.faces.FACELETS_SKIP_COMMENTS";
/**
- * @since JSF 1.2
+ * @since Faces 1.2
*/
public String calculateCharacterEncoding(FacesContext context)
{
@@ -172,7 +172,7 @@ public abstract class ViewHandler
* Some request protocols allow an application user to specify what locale they prefer the response to be in. For
* example, HTTP requests can specify the "accept-language" header.
* <p>
- * Method {@link jakarta.faces.application.Application#getSupportedLocales()} defines what locales this JSF
+ * Method {@link jakarta.faces.application.Application#getSupportedLocales()} defines what locales this Faces
* application is capable of supporting.
* <p>
* This method should match such sources of data up and return the Locale object that is the best choice for
@@ -181,7 +181,7 @@ public abstract class ViewHandler
public abstract Locale calculateLocale(FacesContext context);
/**
- * Return the id of an available render-kit that should be used to map the JSF components into user presentation.
+ * Return the id of an available render-kit that should be used to map the Faces components into user presentation.
* <p>
* The render-kit selected (eg html, xhtml, pdf, xul, ...) may depend upon the user, properties associated with the
* request, etc.
@@ -231,15 +231,15 @@ public abstract class ViewHandler
}
/**
- * Returns a URL, suitable for encoding and rendering, that (if activated) will cause the JSF
+ * Returns a URL, suitable for encoding and rendering, that (if activated) will cause the Faces
* request processing lifecycle for the specified viewId to be executed
*/
public abstract String getActionURL(FacesContext context, String viewId);
/**
- * Return a JSF action URL derived from the viewId argument that is suitable to be used as
- * the target of a link in a JSF response. Compiliant implementations must implement this method
- * as specified in section JSF.7.5.2. The default implementation simply calls through to
+ * Return a Faces action URL derived from the viewId argument that is suitable to be used as
+ * the target of a link in a Faces response. Compiliant implementations must implement this method
+ * as specified in section Faces.7.5.2. The default implementation simply calls through to
* getActionURL(jakarta.faces.context.FacesContext, java.lang.String), passing the arguments context and viewId.
*
* @param context
@@ -281,9 +281,9 @@ public abstract class ViewHandler
}
/**
- * Return a JSF action URL derived from the viewId argument that is suitable to be used by
+ * Return a Faces action URL derived from the viewId argument that is suitable to be used by
* the NavigationHandler to issue a redirect request to the URL using a NonFaces request.
- * Compiliant implementations must implement this method as specified in section JSF.7.5.2.
+ * Compiliant implementations must implement this method as specified in section Faces.7.5.2.
* The default implementation simply calls through to
* getActionURL(jakarta.faces.context.FacesContext, java.lang.String), passing the arguments context and viewId.
*
@@ -320,7 +320,7 @@ public abstract class ViewHandler
* if non-null, into the ExternalContext.setRequestCharacterEncoding(java.lang.String) method.
* If ExternalContext.getRequestCharacterEncoding() returns non-null take no action.
*
- * @since JSF 1.2
+ * @since Faces 1.2
*/
public void initView(FacesContext context) throws FacesException
{
@@ -402,7 +402,7 @@ public abstract class ViewHandler
}
/**
- * Return a JSF URL that represents a websocket connection for the passed channel and channelToken
+ * Return a Faces URL that represents a websocket connection for the passed channel and channelToken
*
* @since 2.3
* @param context
diff --git a/api/src/main/java/jakarta/faces/application/ViewHandlerWrapper.java b/api/src/main/java/jakarta/faces/application/ViewHandlerWrapper.java
index b07d061f6..c2ab65488 100644
--- a/api/src/main/java/jakarta/faces/application/ViewHandlerWrapper.java
+++ b/api/src/main/java/jakarta/faces/application/ViewHandlerWrapper.java
@@ -33,7 +33,7 @@ import jakarta.faces.context.FacesContext;
import jakarta.faces.view.ViewDeclarationLanguage;
/**
- * see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public abstract class ViewHandlerWrapper extends ViewHandler
implements FacesWrapper<ViewHandler>
diff --git a/api/src/main/java/jakarta/faces/component/ActionSource.java b/api/src/main/java/jakarta/faces/component/ActionSource.java
index f311c4ea9..20e2985a8 100755
--- a/api/src/main/java/jakarta/faces/component/ActionSource.java
+++ b/api/src/main/java/jakarta/faces/component/ActionSource.java
@@ -19,7 +19,7 @@
package jakarta.faces.component;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public interface ActionSource
{
diff --git a/api/src/main/java/jakarta/faces/component/ActionSource2.java b/api/src/main/java/jakarta/faces/component/ActionSource2.java
index eb1c43720..7eed64be5 100644
--- a/api/src/main/java/jakarta/faces/component/ActionSource2.java
+++ b/api/src/main/java/jakarta/faces/component/ActionSource2.java
@@ -22,7 +22,7 @@ package jakarta.faces.component;
import jakarta.el.MethodExpression;
/**
- * See Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * See Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public interface ActionSource2 extends ActionSource
{
diff --git a/api/src/main/java/jakarta/faces/component/ContextCallback.java b/api/src/main/java/jakarta/faces/component/ContextCallback.java
index 856cd6cce..43f4213ca 100644
--- a/api/src/main/java/jakarta/faces/component/ContextCallback.java
+++ b/api/src/main/java/jakarta/faces/component/ContextCallback.java
@@ -22,7 +22,7 @@ package jakarta.faces.component;
import jakarta.faces.context.FacesContext;
/**
- * See Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * See Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public interface ContextCallback
{
diff --git a/api/src/main/java/jakarta/faces/component/EditableValueHolder.java b/api/src/main/java/jakarta/faces/component/EditableValueHolder.java
index 9e2534edd..5b2b0c714 100755
--- a/api/src/main/java/jakarta/faces/component/EditableValueHolder.java
+++ b/api/src/main/java/jakarta/faces/component/EditableValueHolder.java
@@ -45,7 +45,7 @@ import jakarta.faces.validator.Validator;
* Rendering the value-binding expression named "value" allows components to display data from the user's model classes.
* This is the most common way a component's renderer obtains the value to display.
*
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a> for
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a> for
* more.
*/
public interface EditableValueHolder extends ValueHolder
diff --git a/api/src/main/java/jakarta/faces/component/NamingContainer.java b/api/src/main/java/jakarta/faces/component/NamingContainer.java
index 70b194d73..045648130 100755
--- a/api/src/main/java/jakarta/faces/component/NamingContainer.java
+++ b/api/src/main/java/jakarta/faces/component/NamingContainer.java
@@ -22,7 +22,7 @@ package jakarta.faces.component;
* Interface implemented by components that provide a new "namespace" for the ids of their
* child components.
* <p>
- * Component ids must be unique between all descendants of a NamingContainer; the JSF library
+ * Component ids must be unique between all descendants of a NamingContainer; the Faces library
* will report a fatal error and refuse to process or render any view where two components
* in the same NamingContainer have identical id values. However a component that is a descendant
* of one NamingContainer component is permitted to have the same id as a component that is a
@@ -38,8 +38,8 @@ package jakarta.faces.component;
* <p>
* Requiring every component in a large view (which is possibly built by including or
* composing multiple files together) to have an id which is different from every other id
- * is simply unmanageable; JSF certainly must provide <i>some</i> kind of id namespacing.
- * Therefore this base class is defined, and a few standard JSF components subclass it
+ * is simply unmanageable; Faces certainly must provide <i>some</i> kind of id namespacing.
+ * Therefore this base class is defined, and a few standard Faces components subclass it
* (in particular, f:subview).
* <p>
* When generating clientId values during rendering, descendants of a NamingContainer instance
@@ -51,7 +51,7 @@ package jakarta.faces.component;
* values generated would quickly grow excessively long.
* <p>
* See the javadoc for this class in the
- * <a href="http://java.sun.com/j2ee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * <a href="http://java.sun.com/j2ee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
* for further details.
*/
public interface NamingContainer
diff --git a/api/src/main/java/jakarta/faces/component/StateHolder.java b/api/src/main/java/jakarta/faces/component/StateHolder.java
index d74507e95..ff5226d09 100755
--- a/api/src/main/java/jakarta/faces/component/StateHolder.java
+++ b/api/src/main/java/jakarta/faces/component/StateHolder.java
@@ -19,7 +19,7 @@
package jakarta.faces.component;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public interface StateHolder
{
diff --git a/api/src/main/java/jakarta/faces/component/UIColumn.java b/api/src/main/java/jakarta/faces/component/UIColumn.java
index 16f39545a..93b6f32c0 100755
--- a/api/src/main/java/jakarta/faces/component/UIColumn.java
+++ b/api/src/main/java/jakarta/faces/component/UIColumn.java
@@ -22,7 +22,7 @@ import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFCompone
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFacet;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
@JSFComponent
public class UIColumn extends UIComponentBase
diff --git a/api/src/main/java/jakarta/faces/component/UIComponent.java b/api/src/main/java/jakarta/faces/component/UIComponent.java
index 7d7faa87d..47be4d736 100755
--- a/api/src/main/java/jakarta/faces/component/UIComponent.java
+++ b/api/src/main/java/jakarta/faces/component/UIComponent.java
@@ -132,7 +132,7 @@ public abstract class UIComponent
private _DeltaStateHelper _stateHelper = null;
/**
- * In JSF 2.0 bindings map was deprecated, and replaced with a map
+ * In Faces 2.0 bindings map was deprecated, and replaced with a map
* inside stateHelper. We need this one here because stateHelper needs
* to be implemented from here and internally it depends from this property.
*/
@@ -509,7 +509,7 @@ public abstract class UIComponent
}
/**
- * For JSF-framework internal use only. Don't call this method to add components to the component tree. Use
+ * For Faces-framework internal use only. Don't call this method to add components to the component tree. Use
* <code>parent.getChildren().add(child)</code> instead.
*/
public abstract void setParent(UIComponent parent);
@@ -728,7 +728,7 @@ public abstract class UIComponent
//getFacesContext().getApplication().publishEvent(getFacesContext(),
// PostRestoreStateEvent.class, UIComponent.class, this);
- // JSF 2.2 vdl.createComponent() requires special handling to refresh
+ // Faces 2.2 vdl.createComponent() requires special handling to refresh
// dynamic parts when refreshing is done. The only way to do it is
// attaching a listener to PostRestoreStateEvent, so we need to do this
// invocation here.
diff --git a/api/src/main/java/jakarta/faces/component/UIComponentBase.java b/api/src/main/java/jakarta/faces/component/UIComponentBase.java
index b706779ad..6d3fac26e 100755
--- a/api/src/main/java/jakarta/faces/component/UIComponentBase.java
+++ b/api/src/main/java/jakarta/faces/component/UIComponentBase.java
@@ -61,13 +61,13 @@ import org.apache.myfaces.core.api.shared.lang.SharedStringBuilder;
/**
- * Standard implementation of the UIComponent base class; all standard JSF components extend this class.
+ * Standard implementation of the UIComponent base class; all standard Faces components extend this class.
* <p>
- * <i>Disclaimer</i>: The official definition for the behaviour of this class is the JSF 1.1 specification but for legal
+ * <i>Disclaimer</i>: The official definition for the behaviour of this class is the Faces 1.1 specification but for legal
* reasons the specification cannot be replicated here. Any javadoc here therefore describes the current implementation
* rather than the spec, though this class has been verified as correctly implementing the spec.
*
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a> for
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a> for
* more.
*/
@JSFComponent(type = "jakarta.faces.ComponentBase", family = "jakarta.faces.ComponentBase",
@@ -139,7 +139,7 @@ public abstract class UIComponentBase extends UIComponent
* Set an identifier for this component which is unique within the scope of the nearest ancestor NamingContainer
* component. The id is not necessarily unique across all components in the current view.
* <p>
- * The id must start with an underscore if it is generated by the JSF framework, and must <i>not</i> start with an
+ * The id must start with an underscore if it is generated by the Faces framework, and must <i>not</i> start with an
* underscore if it has been specified by the user (eg in a JSP tag).
* <p>
* The first character of the id must be an underscore or letter. Following characters may be letters, digits,
@@ -1046,9 +1046,9 @@ public abstract class UIComponentBase extends UIComponent
public String getRendererType()
{
// rendererType is literal-only, no ValueExpression - MYFACES-3136:
- // Even if this is true, according to JSF spec section 8 Rendering Model,
+ // Even if this is true, according to Faces spec section 8 Rendering Model,
// this part is essential to implement "delegated implementation" pattern,
- // so we can't do this optimization here. Instead, JSF developers could prevent
+ // so we can't do this optimization here. Instead, Faces developers could prevent
// this evaluation overriding this method directly.
if (_rendererType != null)
{
diff --git a/api/src/main/java/jakarta/faces/component/UIData.java b/api/src/main/java/jakarta/faces/component/UIData.java
index aceef19de..0e002c72b 100644
--- a/api/src/main/java/jakarta/faces/component/UIData.java
+++ b/api/src/main/java/jakarta/faces/component/UIData.java
@@ -117,7 +117,7 @@ import org.apache.myfaces.core.api.shared.lang.Assert;
* invokeApplication phase has no effect on the rendering of the table. When a validation error has occurred, a new
* DataModel is <i>not</i> fetched, and the saved state of the child components is <i>not</i> discarded.
* </p>
- * see Javadoc of the <a href="http://java.sun.com/j2ee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of the <a href="http://java.sun.com/j2ee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
* for more information.
*/
@JSFComponent(defaultRendererType = "jakarta.faces.Table")
@@ -1788,7 +1788,7 @@ public class UIData extends UIComponentBase implements NamingContainer, UniqueId
* @param context
* is the current faces context.
* @param processAction
- * specifies a JSF phase: decode, validate or update.
+ * specifies a Faces phase: decode, validate or update.
*/
private void processColumnFacets(FacesContext context, int processAction)
{
@@ -1821,7 +1821,7 @@ public class UIData extends UIComponentBase implements NamingContainer, UniqueId
* @param context
* is the current faces context.
* @param processAction
- * specifies a JSF phase: decode, validate or update.
+ * specifies a Faces phase: decode, validate or update.
*/
private void processColumnChildren(FacesContext context, int processAction)
{
diff --git a/api/src/main/java/jakarta/faces/component/UIForm.java b/api/src/main/java/jakarta/faces/component/UIForm.java
index 2082c61fa..99f6a3510 100755
--- a/api/src/main/java/jakarta/faces/component/UIForm.java
+++ b/api/src/main/java/jakarta/faces/component/UIForm.java
@@ -35,7 +35,7 @@ import java.util.Collection;
import org.apache.myfaces.core.api.shared.lang.Assert;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
@JSFComponent(type = "jakarta.faces.Form", family = "jakarta.faces.Form")
public class UIForm extends UIComponentBase implements NamingContainer, UniqueIdVendor
diff --git a/api/src/main/java/jakarta/faces/component/UIGraphic.java b/api/src/main/java/jakarta/faces/component/UIGraphic.java
index 168be31ce..baf2e44a3 100644
--- a/api/src/main/java/jakarta/faces/component/UIGraphic.java
+++ b/api/src/main/java/jakarta/faces/component/UIGraphic.java
@@ -27,7 +27,7 @@ import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFPropert
* Displays a graphical image.
* <p>
* See the javadoc for this class in the
- * <a href="http://java.sun.com/j2ee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * <a href="http://java.sun.com/j2ee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
* for further details.
*/
@JSFComponent(defaultRendererType = "jakarta.faces.Image")
diff --git a/api/src/main/java/jakarta/faces/component/UIInput.java b/api/src/main/java/jakarta/faces/component/UIInput.java
index 4b43c18b1..2eacd9375 100644
--- a/api/src/main/java/jakarta/faces/component/UIInput.java
+++ b/api/src/main/java/jakarta/faces/component/UIInput.java
@@ -560,7 +560,7 @@ public class UIInput extends UIOutput implements EditableValueHolder
String param = ec.getInitParameter(CLEAR_INPUT_WHEN_SUBMITTED_VALUE_IS_NULL_OR_EMPTY_PARAM_NAME);
// evaluate the param
- // NOTE: On JSF 2.3, this value will be set to true by default.
+ // NOTE: On Faces 2.3, this value will be set to true by default.
if (param == null)
{
clearInputWhenSubmittedValueIsNullOrEmpty = true; // default
@@ -657,7 +657,7 @@ public class UIInput extends UIOutput implements EditableValueHolder
}
}
- // Begin new JSF 2.0 requirement (INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL)
+ // Begin new Faces 2.0 requirement (INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL)
if (shouldInterpretEmptyStringSubmittedValuesAsNull(context) && isEmptyString(submittedValue))
{
setSubmittedValue(null);
@@ -667,7 +667,7 @@ public class UIInput extends UIOutput implements EditableValueHolder
submittedValue = null;
}
}
- // End new JSF 2.0 requirement (INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL)
+ // End new Faces 2.0 requirement (INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL)
Object convertedValue;
try
diff --git a/api/src/main/java/jakarta/faces/component/UISelectBoolean.java b/api/src/main/java/jakarta/faces/component/UISelectBoolean.java
index a6c5ca540..df004e805 100644
--- a/api/src/main/java/jakarta/faces/component/UISelectBoolean.java
+++ b/api/src/main/java/jakarta/faces/component/UISelectBoolean.java
@@ -31,7 +31,7 @@ import org.apache.myfaces.core.api.shared.lang.Assert;
* </p>
* <p>
* See the javadoc for this class in the
- * <a href="http://java.sun.com/j2ee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * <a href="http://java.sun.com/j2ee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
* for further details.
* </p>
*/
diff --git a/api/src/main/java/jakarta/faces/component/UISelectOne.java b/api/src/main/java/jakarta/faces/component/UISelectOne.java
index f6d2a8de5..7381c5bc4 100644
--- a/api/src/main/java/jakarta/faces/component/UISelectOne.java
+++ b/api/src/main/java/jakarta/faces/component/UISelectOne.java
@@ -43,7 +43,7 @@ import org.apache.myfaces.core.api.shared.SelectItemsUtil;
* </p>
* <p>
* See the javadoc for this class in the <a
- * href="http://java.sun.com/j2ee/javaserverfaces/1.1_01/docs/api/index.html">JSF Specification</a> for further details.
+ * href="http://java.sun.com/j2ee/javaserverfaces/1.1_01/docs/api/index.html">Faces Specification</a> for further details.
* </p>
*/
@JSFComponent(defaultRendererType = "jakarta.faces.Menu")
diff --git a/api/src/main/java/jakarta/faces/component/UIViewAction.java b/api/src/main/java/jakarta/faces/component/UIViewAction.java
index f51fbdf11..6eaf87da5 100644
--- a/api/src/main/java/jakarta/faces/component/UIViewAction.java
+++ b/api/src/main/java/jakarta/faces/component/UIViewAction.java
@@ -42,7 +42,7 @@ public class UIViewAction extends UIComponentBase implements ActionSource2
/**
* Key in facesContext attribute map to check if a viewAction broadcast is
- * being processed. This is used to check when a JSF lifecycle restart is required
+ * being processed. This is used to check when a Faces lifecycle restart is required
* by the NavigationHandler implementation.
*/
private static final String BROADCAST_PROCESSING_KEY = "oam.viewAction.broadcast";
@@ -159,7 +159,7 @@ public class UIViewAction extends UIComponentBase implements ActionSource2
// "... Otherwise, execute the lifecycle on the new UIViewRoot ..."
// Note these words are implemented in the NavigationHandler, but
// the original proposal from seam s:viewAction did a trick here
- // to restart the JSF lifecycle.
+ // to restart the Faces lifecycle.
}
}
}
diff --git a/api/src/main/java/jakarta/faces/component/UIViewRoot.java b/api/src/main/java/jakarta/faces/component/UIViewRoot.java
index 9e0ab9f01..3d440cf0c 100644
--- a/api/src/main/java/jakarta/faces/component/UIViewRoot.java
+++ b/api/src/main/java/jakarta/faces/component/UIViewRoot.java
@@ -70,7 +70,7 @@ import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConf
import org.apache.myfaces.core.api.shared.lang.Assert;
/**
- * Creates a JSF View, which is a container that holds all of the components that are part of the view.
+ * Creates a Faces View, which is a container that holds all of the components that are part of the view.
* <p>
* Unless otherwise specified, all attributes accept static values or EL expressions.
* </p>
@@ -327,7 +327,7 @@ public class UIViewRoot extends UIComponentBase implements UniqueIdVendor
componentResources.add(componentResource);
}
- // this is required to make dynamic resource loading possible since JSF 2.3
+ // this is required to make dynamic resource loading possible since Faces 2.3
if (context.getPartialViewContext().isAjaxRequest())
{
boolean isBuildingInitialState
@@ -975,7 +975,7 @@ public class UIViewRoot extends UIComponentBase implements UniqueIdVendor
/**
* Invoke view-specific phase listeners, plus an optional EL MethodExpression.
* <p>
- * JSF1.2 adds the ability for PhaseListener objects to be added to a UIViewRoot instance, and for
+ * Faces1.2 adds the ability for PhaseListener objects to be added to a UIViewRoot instance, and for
* "beforePhaseListener" and "afterPhaseListener" EL expressions to be defined on the viewroot. This method is
* expected to be called at appropriate times, and will then execute the relevant listener callbacks.
* <p>
@@ -1197,7 +1197,7 @@ public class UIViewRoot extends UIComponentBase implements UniqueIdVendor
* Broadcast all events in the specified collection, stopping the at any time an AbortProcessingException
* is thrown.
*
- * @param context the current JSF context
+ * @param context the current Faces context
* @param events the events to broadcast
* @return
*
@@ -1310,7 +1310,7 @@ public class UIViewRoot extends UIComponentBase implements UniqueIdVendor
* <p>
* This inherited property is disabled. Although this class extends a base-class that defines a read/write rendered
* property, this particular subclass does not support setting it. Yes, this is broken OO design: direct all
- * complaints to the JSF spec group.
+ * complaints to the Faces spec group.
*/
@Override
@JSFProperty(tagExcluded = true)
@@ -1586,8 +1586,8 @@ public class UIViewRoot extends UIComponentBase implements UniqueIdVendor
Object[] values = (Object[])state;
super.restoreState(facesContext,values[0]);
- // JSF 2.2 spec says that restoreViewScopeState can be called but only if
- // StateManagementStrategy is used. If that's not the case (JSF 1.2 state saving),
+ // Faces 2.2 spec says that restoreViewScopeState can be called but only if
+ // StateManagementStrategy is used. If that's not the case (Faces 1.2 state saving),
// restoreViewScopeState could not be called, so this code should avoid restore
// the state twice.
if (!_restoreViewScopeStateCalled)
@@ -1812,7 +1812,7 @@ public class UIViewRoot extends UIComponentBase implements UniqueIdVendor
// with PhaseId.UPDATE_MODEL_VALUES if:
// * PartialViewContext.isPartialRequest() returns true and we don't have a request to process all
// components in the view (PartialViewContext.isExecuteAll() returns false)
- //section 13.4.2 from the JSF2 spec also see https://issues.apache.org/jira/browse/MYFACES-2119
+ //section 13.4.2 from the Faces2 spec also see https://issues.apache.org/jira/browse/MYFACES-2119
if (pvc.isPartialRequest() && !pvc.isExecuteAll())
{
pvc.processPartial(PhaseId.APPLY_REQUEST_VALUES);
@@ -1839,7 +1839,7 @@ public class UIViewRoot extends UIComponentBase implements UniqueIdVendor
// with PhaseId.UPDATE_MODEL_VALUES if:
// PartialViewContext.isPartialRequest() returns true and we don't have a request to process all components
// in the view (PartialViewContext.isExecuteAll() returns false)
- //section 13.4.2 from the JSF2 spec also see https://issues.apache.org/jira/browse/MYFACES-2119
+ //section 13.4.2 from the Faces2 spec also see https://issues.apache.org/jira/browse/MYFACES-2119
if (pvc.isPartialRequest() && !pvc.isExecuteAll())
{
pvc.processPartial(PhaseId.PROCESS_VALIDATIONS);
@@ -1866,7 +1866,7 @@ public class UIViewRoot extends UIComponentBase implements UniqueIdVendor
// with PhaseId.UPDATE_MODEL_VALUES if:
// * PartialViewContext.isPartialRequest() returns true and we don't have a request to process
// all components in the view (PartialViewContext.isExecuteAll() returns false)
- //section 13.4.2 from the JSF2 spec also see https://issues.apache.org/jira/browse/MYFACES-2119
+ //section 13.4.2 from the Faces2 spec also see https://issues.apache.org/jira/browse/MYFACES-2119
if (pvc.isPartialRequest() && !pvc.isExecuteAll())
{
pvc.processPartial(PhaseId.UPDATE_MODEL_VALUES);
diff --git a/api/src/main/java/jakarta/faces/component/ValueHolder.java b/api/src/main/java/jakarta/faces/component/ValueHolder.java
index a0892afce..8c8439750 100755
--- a/api/src/main/java/jakarta/faces/component/ValueHolder.java
+++ b/api/src/main/java/jakarta/faces/component/ValueHolder.java
@@ -21,7 +21,7 @@ package jakarta.faces.component;
import jakarta.faces.convert.Converter;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public interface ValueHolder
{
diff --git a/api/src/main/java/jakarta/faces/component/_ComponentAttributesMap.java b/api/src/main/java/jakarta/faces/component/_ComponentAttributesMap.java
index 28deeb2bc..f339402ef 100755
--- a/api/src/main/java/jakarta/faces/component/_ComponentAttributesMap.java
+++ b/api/src/main/java/jakarta/faces/component/_ComponentAttributesMap.java
@@ -46,7 +46,7 @@ import org.apache.myfaces.core.api.shared.lang.PropertyDescriptorWrapper;
* Some of the behaviours of this class don't really comply with the
* definitions of the Map class; for example the key parameter to all
* methods is required to be of type String only, and after clear(),
- * calls to get can return non-null values. However the JSF spec
+ * calls to get can return non-null values. However the Faces spec
* requires that this class behave in the way implemented below. See
* UIComponent.getAttributes for more details.
* </p>
@@ -198,7 +198,7 @@ class _ComponentAttributesMap implements Map<String, Object>, Serializable
if (!_isCompositeComponentSet)
{
// Note we are not setting _isCompositeComponentSet, because when the component tree is built
- // using JSF 1.2 state saving, PostAddToViewEvent is propagated and the component is check
+ // using Faces 1.2 state saving, PostAddToViewEvent is propagated and the component is check
// if is a composite component, but the state is not restored, so the check return always
// false. A check for processing events was added to prevent that scenario, but anyway that
// makes invalid set _isCompositeComponentSet to true on this location.
diff --git a/api/src/main/java/jakarta/faces/component/_UIParameter.java b/api/src/main/java/jakarta/faces/component/_UIParameter.java
index 449a0841f..d2b894454 100644
--- a/api/src/main/java/jakarta/faces/component/_UIParameter.java
+++ b/api/src/main/java/jakarta/faces/component/_UIParameter.java
@@ -39,7 +39,7 @@ abstract class _UIParameter extends UIComponentBase
/**
* Disable this property; although this class extends a base-class that defines a read/write rendered property, this
- * particular subclass does not support setting it. Yes, this is broken OO design: direct all complaints to the JSF
+ * particular subclass does not support setting it. Yes, this is broken OO design: direct all complaints to the Faces
* spec group.
*/
@Override
diff --git a/api/src/main/java/jakarta/faces/component/_UISelectItem.java b/api/src/main/java/jakarta/faces/component/_UISelectItem.java
index 58fe8e3c3..87e10a224 100644
--- a/api/src/main/java/jakarta/faces/component/_UISelectItem.java
+++ b/api/src/main/java/jakarta/faces/component/_UISelectItem.java
@@ -44,7 +44,7 @@ abstract class _UISelectItem extends UIComponentBase
/**
* Disable this property; although this class extends a base-class that defines a read/write rendered property, this
- * particular subclass does not support setting it. Yes, this is broken OO design: direct all complaints to the JSF
+ * particular subclass does not support setting it. Yes, this is broken OO design: direct all complaints to the Faces
* spec group.
*/
@Override
diff --git a/api/src/main/java/jakarta/faces/component/_UISelectItems.java b/api/src/main/java/jakarta/faces/component/_UISelectItems.java
index 64faddb6d..0f0edeb6b 100644
--- a/api/src/main/java/jakarta/faces/component/_UISelectItems.java
+++ b/api/src/main/java/jakarta/faces/component/_UISelectItems.java
@@ -53,7 +53,7 @@ abstract class _UISelectItems extends UIComponentBase
* Disable this property; although this class extends a base-class that
* defines a read/write rendered property, this particular subclass
* does not support setting it. Yes, this is broken OO design: direct
- * all complaints to the JSF spec group.
+ * all complaints to the Faces spec group.
*/
@JSFExclude
@JSFProperty(tagExcluded=true)
@@ -162,7 +162,7 @@ abstract class _UISelectItems extends UIComponentBase
/**
* Determines if the rendered markup for the current item receives
- * normal JSF HTML escaping or not.
+ * normal Faces HTML escaping or not.
*
* @since 2.0
* @return
diff --git a/api/src/main/java/jakarta/faces/component/html/_HtmlInputSecret.java b/api/src/main/java/jakarta/faces/component/html/_HtmlInputSecret.java
index 845e10c34..aa2ba9d7d 100644
--- a/api/src/main/java/jakarta/faces/component/html/_HtmlInputSecret.java
+++ b/api/src/main/java/jakarta/faces/component/html/_HtmlInputSecret.java
@@ -53,7 +53,7 @@ abstract class _HtmlInputSecret extends UIInput implements _AccesskeyProperty,
/**
* If true, the value will be re-sent (in plaintext) when the form
- * is rerendered (see JSF.7.4.4). Default is false.
+ * is rerendered (see Faces.7.4.4). Default is false.
*
* @JSFProperty
* defaultValue = "false"
diff --git a/api/src/main/java/jakarta/faces/component/html/_HtmlOutputLabel.java b/api/src/main/java/jakarta/faces/component/html/_HtmlOutputLabel.java
index a6a090d65..ffe3e0aea 100644
--- a/api/src/main/java/jakarta/faces/component/html/_HtmlOutputLabel.java
+++ b/api/src/main/java/jakarta/faces/component/html/_HtmlOutputLabel.java
@@ -25,7 +25,7 @@ import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFCompone
/**
* Renders a HTML label element.
*
- * In addition to the JSF specification, MyFaces allows it to directly give an output text via the "value" attribute.
+ * In addition to the Faces specification, MyFaces allows it to directly give an output text via the "value" attribute.
*/
@JSFComponent(name = "h:outputLabel",
clazz = "jakarta.faces.component.html.HtmlOutputLabel",template=true,
diff --git a/api/src/main/java/jakarta/faces/component/html/_HtmlSelectManyListbox.java b/api/src/main/java/jakarta/faces/component/html/_HtmlSelectManyListbox.java
index 327c0935e..3145b3909 100644
--- a/api/src/main/java/jakarta/faces/component/html/_HtmlSelectManyListbox.java
+++ b/api/src/main/java/jakarta/faces/component/html/_HtmlSelectManyListbox.java
@@ -69,7 +69,7 @@ abstract class _HtmlSelectManyListbox extends UISelectMany implements
"jakarta.faces.HtmlSelectManyListbox";
/**
- * see JSF Spec.
+ * see Faces Spec.
*
* @JSFProperty
* defaultValue="Integer.MIN_VALUE"
diff --git a/api/src/main/java/jakarta/faces/component/html/_HtmlSelectOneListbox.java b/api/src/main/java/jakarta/faces/component/html/_HtmlSelectOneListbox.java
index 703591ae4..f8eee9138 100644
--- a/api/src/main/java/jakarta/faces/component/html/_HtmlSelectOneListbox.java
+++ b/api/src/main/java/jakarta/faces/component/html/_HtmlSelectOneListbox.java
@@ -67,7 +67,7 @@ abstract class _HtmlSelectOneListbox extends UISelectOne implements
"jakarta.faces.HtmlSelectOneListbox";
/**
- * see JSF Spec.
+ * see Faces Spec.
*
* @JSFProperty
* defaultValue="Integer.MIN_VALUE"
diff --git a/api/src/main/java/jakarta/faces/context/ExternalContext.java b/api/src/main/java/jakarta/faces/context/ExternalContext.java
index 4997fbd1d..4ad4ccce5 100755
--- a/api/src/main/java/jakarta/faces/context/ExternalContext.java
+++ b/api/src/main/java/jakarta/faces/context/ExternalContext.java
@@ -29,7 +29,7 @@ import java.util.Set;
import jakarta.faces.lifecycle.ClientWindow;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public abstract class ExternalContext
{
@@ -184,7 +184,7 @@ public abstract class ExternalContext
public abstract Map<String,String> getInitParameterMap();
/**
- * @since JSF 2.0
+ * @since Faces 2.0
*/
public String getMimeType(String file)
{
@@ -199,7 +199,7 @@ public abstract class ExternalContext
}
/**
- * @since JSF 2.0
+ * @since Faces 2.0
*/
public String getRealPath(String path)
{
@@ -282,7 +282,7 @@ public abstract class ExternalContext
public abstract String getRequestPathInfo();
/**
- * @since JSF 2.0
+ * @since Faces 2.0
*/
public String getRequestScheme()
{
@@ -297,7 +297,7 @@ public abstract class ExternalContext
}
/**
- * @since JSF 2.0
+ * @since Faces 2.0
*/
public String getRequestServerName()
{
@@ -312,7 +312,7 @@ public abstract class ExternalContext
}
/**
- * @since JSF 2.0
+ * @since Faces 2.0
*/
public int getRequestServerPort()
{
@@ -360,7 +360,7 @@ public abstract class ExternalContext
if (ctx == null)
{
- throw new UnsupportedOperationException("JSF 1.2 : figure out how to tell if this is a Portlet request");
+ throw new UnsupportedOperationException("Faces 1.2 : figure out how to tell if this is a Portlet request");
}
return ctx.getResponseCharacterEncoding();
@@ -369,7 +369,7 @@ public abstract class ExternalContext
/**
* throws <code>UnsupportedOperationException</code> by default.
*
- * @since JSF 1.2
+ * @since Faces 1.2
*/
public String getResponseContentType()
{
@@ -384,7 +384,7 @@ public abstract class ExternalContext
}
/**
- * @since JSF 2.0
+ * @since Faces 2.0
*/
public OutputStream getResponseOutputStream() throws IOException
{
@@ -399,7 +399,7 @@ public abstract class ExternalContext
}
/**
- * @since JSF 2.0
+ * @since Faces 2.0
*/
public Writer getResponseOutputWriter() throws IOException
{
@@ -520,7 +520,7 @@ public abstract class ExternalContext
/**
* throws <code>UnsupportedOperationException</code> by default.
*
- * @since JSF 1.2
+ * @since Faces 1.2
* @param request
*/
public void setRequest(Object request)
@@ -538,7 +538,7 @@ public abstract class ExternalContext
/**
* throws <code>UnsupportedOperationException</code> by default.
*
- * @since JSF 1.2
+ * @since Faces 1.2
* @param encoding
* @throws java.io.UnsupportedEncodingException
*/
@@ -558,7 +558,7 @@ public abstract class ExternalContext
/**
* throws <code>UnsupportedOperationException</code> by default.
*
- * @since JSF 1.2
+ * @since Faces 1.2
* @param response
*/
public void setResponse(Object response)
@@ -594,7 +594,7 @@ public abstract class ExternalContext
/**
* throws <code>UnsupportedOperationException</code> by default.
*
- * @since JSF 1.2
+ * @since Faces 1.2
* @param encoding
*/
public void setResponseCharacterEncoding(String encoding)
diff --git a/api/src/main/java/jakarta/faces/context/FacesContext.java b/api/src/main/java/jakarta/faces/context/FacesContext.java
index 65f2151ac..61d43c010 100755
--- a/api/src/main/java/jakarta/faces/context/FacesContext.java
+++ b/api/src/main/java/jakarta/faces/context/FacesContext.java
@@ -35,7 +35,7 @@ import jakarta.faces.render.RenderKit;
import org.apache.myfaces.core.api.shared.lang.Assert;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public abstract class FacesContext
{
@@ -93,24 +93,24 @@ public abstract class FacesContext
/**
* Return the context within which all EL-expressions are evaluated.
* <p>
- * A JSF implementation is expected to provide a full implementation of this class. However JSF also explicitly
+ * A Faces implementation is expected to provide a full implementation of this class. However Faces also explicitly
* allows user code to apply the "decorator" pattern to this type, by overriding the FacesContextFactory class. In
* that pattern, the decorating class has a reference to an "underlying" implementation and forward calls to it,
* possibly after taking other related actions.
* <p>
* The decorator pattern does have difficulties with backwards-compatibility when new methods are added to the class
- * being decorated, as with this method which was added in JSF1.2. Decorator classes that were written for JSF1.1
- * will subclass this class, but will not override this method to pass the call on to the "underlying" instance.
- * This base implementation therefore must do that for it.
+ * being decorated, as with this method which was added in Faces1.2. Decorator classes that were written for
+ * Faces1.1 will subclass this class, but will not override this method to pass the call on to the "underlying"
+ * instance. This base implementation therefore must do that for it.
* <p>
- * Unfortunately the JSF designers stuffed up the design; this base class has no way of knowing what the
+ * Unfortunately the Faces designers stuffed up the design; this base class has no way of knowing what the
* "underlying" instance is! The current implementation here is therefore to delegate directly to the very
* <i>first</i> FacesContext instance registered within this request (via setCurrentInstance). This instance should
- * be the "full" implementation provided by the JSF framework. The drawback is that when any decorator class is
+ * be the "full" implementation provided by the Faces framework. The drawback is that when any decorator class is
* present which defaults to this base implementation, then any following decorator instances that do override this
* method do not get it invoked.
* <p>
- * It is believed that the Sun JSF implementation (Mojarra) does something similar.
+ * It is believed that the Sun Faces implementation (Mojarra) does something similar.
*
* @since 1.2
*/
diff --git a/api/src/main/java/jakarta/faces/context/FacesContextFactory.java b/api/src/main/java/jakarta/faces/context/FacesContextFactory.java
index 53986cd1a..296864ff9 100755
--- a/api/src/main/java/jakarta/faces/context/FacesContextFactory.java
+++ b/api/src/main/java/jakarta/faces/context/FacesContextFactory.java
@@ -23,7 +23,7 @@ import jakarta.faces.FacesWrapper;
import jakarta.faces.lifecycle.Lifecycle;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public abstract class FacesContextFactory implements FacesWrapper<FacesContextFactory>
{
diff --git a/api/src/main/java/jakarta/faces/context/PartialResponseWriter.java b/api/src/main/java/jakarta/faces/context/PartialResponseWriter.java
index ba01ddcf2..a4b7b5ada 100644
--- a/api/src/main/java/jakarta/faces/context/PartialResponseWriter.java
+++ b/api/src/main/java/jakarta/faces/context/PartialResponseWriter.java
@@ -126,7 +126,7 @@ public class PartialResponseWriter extends ResponseWriterWrapper
@Override
public void startDocument() throws IOException
{
- // JSF 2.2 section 2.2.6.1 Render Response Partial Processing
+ // Faces 2.2 section 2.2.6.1 Render Response Partial Processing
// use writePreamble(...)
//_wrapped.write("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
diff --git a/api/src/main/java/jakarta/faces/context/ResponseStream.java b/api/src/main/java/jakarta/faces/context/ResponseStream.java
index e0f0c0fc8..b7b7968be 100755
--- a/api/src/main/java/jakarta/faces/context/ResponseStream.java
+++ b/api/src/main/java/jakarta/faces/context/ResponseStream.java
@@ -21,7 +21,7 @@ package jakarta.faces.context;
import java.io.OutputStream;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public abstract class ResponseStream extends OutputStream
{
diff --git a/api/src/main/java/jakarta/faces/context/ResponseWriter.java b/api/src/main/java/jakarta/faces/context/ResponseWriter.java
index ad9c3fc22..873df27d3 100755
--- a/api/src/main/java/jakarta/faces/context/ResponseWriter.java
+++ b/api/src/main/java/jakarta/faces/context/ResponseWriter.java
@@ -23,7 +23,7 @@ import java.io.IOException;
import java.io.Writer;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public abstract class ResponseWriter extends Writer
{
diff --git a/api/src/main/java/jakarta/faces/context/ResponseWriterWrapper.java b/api/src/main/java/jakarta/faces/context/ResponseWriterWrapper.java
index 269d0db3f..332f1b000 100644
--- a/api/src/main/java/jakarta/faces/context/ResponseWriterWrapper.java
+++ b/api/src/main/java/jakarta/faces/context/ResponseWriterWrapper.java
@@ -25,7 +25,7 @@ import java.io.IOException;
import java.io.Writer;
/**
- * see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public abstract class ResponseWriterWrapper extends ResponseWriter implements FacesWrapper<ResponseWriter>
{
diff --git a/api/src/main/java/jakarta/faces/convert/BigDecimalConverter.java b/api/src/main/java/jakarta/faces/convert/BigDecimalConverter.java
index 51a8fa915..5abb1a2b3 100755
--- a/api/src/main/java/jakarta/faces/convert/BigDecimalConverter.java
+++ b/api/src/main/java/jakarta/faces/convert/BigDecimalConverter.java
@@ -28,7 +28,7 @@ import org.apache.myfaces.core.api.shared.MessageUtils;
import org.apache.myfaces.core.api.shared.lang.Assert;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
@JSFConverter
public class BigDecimalConverter
diff --git a/api/src/main/java/jakarta/faces/convert/BigIntegerConverter.java b/api/src/main/java/jakarta/faces/convert/BigIntegerConverter.java
index ad791ad6b..488c0da90 100755
--- a/api/src/main/java/jakarta/faces/convert/BigIntegerConverter.java
+++ b/api/src/main/java/jakarta/faces/convert/BigIntegerConverter.java
@@ -28,7 +28,7 @@ import org.apache.myfaces.core.api.shared.MessageUtils;
import org.apache.myfaces.core.api.shared.lang.Assert;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
@JSFConverter
public class BigIntegerConverter implements Converter
diff --git a/api/src/main/java/jakarta/faces/convert/BooleanConverter.java b/api/src/main/java/jakarta/faces/convert/BooleanConverter.java
index c58ee12e4..f0d4fd88d 100755
--- a/api/src/main/java/jakarta/faces/convert/BooleanConverter.java
+++ b/api/src/main/java/jakarta/faces/convert/BooleanConverter.java
@@ -26,7 +26,7 @@ import org.apache.myfaces.core.api.shared.MessageUtils;
import org.apache.myfaces.core.api.shared.lang.Assert;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
@JSFConverter
public class BooleanConverter implements Converter
diff --git a/api/src/main/java/jakarta/faces/convert/ByteConverter.java b/api/src/main/java/jakarta/faces/convert/ByteConverter.java
index eef8bf65f..cde6d863b 100755
--- a/api/src/main/java/jakarta/faces/convert/ByteConverter.java
+++ b/api/src/main/java/jakarta/faces/convert/ByteConverter.java
@@ -26,7 +26,7 @@ import org.apache.myfaces.core.api.shared.MessageUtils;
import org.apache.myfaces.core.api.shared.lang.Assert;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
@JSFConverter
public class ByteConverter implements Converter
diff --git a/api/src/main/java/jakarta/faces/convert/CharacterConverter.java b/api/src/main/java/jakarta/faces/convert/CharacterConverter.java
index f68936c0f..99e14480b 100755
--- a/api/src/main/java/jakarta/faces/convert/CharacterConverter.java
+++ b/api/src/main/java/jakarta/faces/convert/CharacterConverter.java
@@ -26,7 +26,7 @@ import org.apache.myfaces.core.api.shared.MessageUtils;
import org.apache.myfaces.core.api.shared.lang.Assert;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
@JSFConverter
public class CharacterConverter implements Converter
diff --git a/api/src/main/java/jakarta/faces/convert/Converter.java b/api/src/main/java/jakarta/faces/convert/Converter.java
index 0a7c6fff0..17f6f32fb 100755
--- a/api/src/main/java/jakarta/faces/convert/Converter.java
+++ b/api/src/main/java/jakarta/faces/convert/Converter.java
@@ -23,7 +23,7 @@ import jakarta.faces.context.FacesContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public interface Converter<T>
{
diff --git a/api/src/main/java/jakarta/faces/convert/ConverterException.java b/api/src/main/java/jakarta/faces/convert/ConverterException.java
index e324a8191..2364ffefe 100755
--- a/api/src/main/java/jakarta/faces/convert/ConverterException.java
+++ b/api/src/main/java/jakarta/faces/convert/ConverterException.java
@@ -22,7 +22,7 @@ import jakarta.faces.FacesException;
import jakarta.faces.application.FacesMessage;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public class ConverterException
extends FacesException
diff --git a/api/src/main/java/jakarta/faces/convert/DateTimeConverter.java b/api/src/main/java/jakarta/faces/convert/DateTimeConverter.java
index 87073d8f0..97ae12569 100755
--- a/api/src/main/java/jakarta/faces/convert/DateTimeConverter.java
+++ b/api/src/main/java/jakarta/faces/convert/DateTimeConverter.java
@@ -50,7 +50,7 @@ import org.apache.myfaces.core.api.shared.lang.Assert;
*
* Unless otherwise specified, all attributes accept static values or EL expressions.
*
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
@JSFConverter(name = "f:convertDateTime", bodyContent = "empty")
@JSFJspProperty(
diff --git a/api/src/main/java/jakarta/faces/convert/DoubleConverter.java b/api/src/main/java/jakarta/faces/convert/DoubleConverter.java
index 4c22531f9..d252c9ea3 100755
--- a/api/src/main/java/jakarta/faces/convert/DoubleConverter.java
+++ b/api/src/main/java/jakarta/faces/convert/DoubleConverter.java
@@ -29,7 +29,7 @@ import org.apache.myfaces.core.api.shared.MessageUtils;
import org.apache.myfaces.core.api.shared.lang.Assert;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
@JSFConverter
public class DoubleConverter implements Converter
diff --git a/api/src/main/java/jakarta/faces/convert/EnumConverter.java b/api/src/main/java/jakarta/faces/convert/EnumConverter.java
index 81007a0e4..bde0991eb 100644
--- a/api/src/main/java/jakarta/faces/convert/EnumConverter.java
+++ b/api/src/main/java/jakarta/faces/convert/EnumConverter.java
@@ -29,7 +29,7 @@ import org.apache.myfaces.core.api.shared.MessageUtils;
import org.apache.myfaces.core.api.shared.lang.Assert;
/**
- * see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
@JSFConverter
public class EnumConverter implements Converter, PartialStateHolder
diff --git a/api/src/main/java/jakarta/faces/convert/FloatConverter.java b/api/src/main/java/jakarta/faces/convert/FloatConverter.java
index 3957b769c..733e95049 100755
--- a/api/src/main/java/jakarta/faces/convert/FloatConverter.java
+++ b/api/src/main/java/jakarta/faces/convert/FloatConverter.java
@@ -26,7 +26,7 @@ import org.apache.myfaces.core.api.shared.MessageUtils;
import org.apache.myfaces.core.api.shared.lang.Assert;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
@JSFConverter
public class FloatConverter implements Converter
diff --git a/api/src/main/java/jakarta/faces/convert/IntegerConverter.java b/api/src/main/java/jakarta/faces/convert/IntegerConverter.java
index 1b892c3e1..dce69ad09 100755
--- a/api/src/main/java/jakarta/faces/convert/IntegerConverter.java
+++ b/api/src/main/java/jakarta/faces/convert/IntegerConverter.java
@@ -26,7 +26,7 @@ import org.apache.myfaces.core.api.shared.MessageUtils;
import org.apache.myfaces.core.api.shared.lang.Assert;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
@JSFConverter
public class IntegerConverter implements Converter
diff --git a/api/src/main/java/jakarta/faces/convert/LongConverter.java b/api/src/main/java/jakarta/faces/convert/LongConverter.java
index c80583661..ddc309f19 100755
--- a/api/src/main/java/jakarta/faces/convert/LongConverter.java
+++ b/api/src/main/java/jakarta/faces/convert/LongConverter.java
@@ -26,7 +26,7 @@ import org.apache.myfaces.core.api.shared.MessageUtils;
import org.apache.myfaces.core.api.shared.lang.Assert;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
@JSFConverter
public class LongConverter implements Converter
diff --git a/api/src/main/java/jakarta/faces/convert/NumberConverter.java b/api/src/main/java/jakarta/faces/convert/NumberConverter.java
index 3999e4234..39ce4748a 100755
--- a/api/src/main/java/jakarta/faces/convert/NumberConverter.java
+++ b/api/src/main/java/jakarta/faces/convert/NumberConverter.java
@@ -46,7 +46,7 @@ import org.apache.myfaces.core.api.shared.lang.Assert;
*
* Unless otherwise specified, all attributes accept static values or EL expressions.
*
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
@JSFConverter(name = "f:convertNumber", bodyContent = "empty")
@JSFJspProperty(
diff --git a/api/src/main/java/jakarta/faces/convert/ShortConverter.java b/api/src/main/java/jakarta/faces/convert/ShortConverter.java
index 3f15e70fd..913e09cb9 100755
--- a/api/src/main/java/jakarta/faces/convert/ShortConverter.java
+++ b/api/src/main/java/jakarta/faces/convert/ShortConverter.java
@@ -26,7 +26,7 @@ import org.apache.myfaces.core.api.shared.MessageUtils;
import org.apache.myfaces.core.api.shared.lang.Assert;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
@JSFConverter
public class ShortConverter implements Converter
diff --git a/api/src/main/java/jakarta/faces/el/CompositeComponentExpressionHolder.java b/api/src/main/java/jakarta/faces/el/CompositeComponentExpressionHolder.java
index b9ba3a0f6..b0c25649b 100644
--- a/api/src/main/java/jakarta/faces/el/CompositeComponentExpressionHolder.java
+++ b/api/src/main/java/jakarta/faces/el/CompositeComponentExpressionHolder.java
@@ -21,7 +21,7 @@ package jakarta.faces.el;
import jakarta.el.ValueExpression;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public interface CompositeComponentExpressionHolder
{
diff --git a/api/src/main/java/jakarta/faces/event/AbortProcessingException.java b/api/src/main/java/jakarta/faces/event/AbortProcessingException.java
index 7c13f9c64..efd9b80bd 100755
--- a/api/src/main/java/jakarta/faces/event/AbortProcessingException.java
+++ b/api/src/main/java/jakarta/faces/event/AbortProcessingException.java
@@ -21,7 +21,7 @@ package jakarta.faces.event;
import jakarta.faces.FacesException;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/2.0/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/2.0/docs/api/index.html">Faces Specification</a>
*/
public class AbortProcessingException extends FacesException
{
diff --git a/api/src/main/java/jakarta/faces/event/ActionEvent.java b/api/src/main/java/jakarta/faces/event/ActionEvent.java
index a2a64c740..b534fa643 100755
--- a/api/src/main/java/jakarta/faces/event/ActionEvent.java
+++ b/api/src/main/java/jakarta/faces/event/ActionEvent.java
@@ -22,7 +22,7 @@ import jakarta.faces.component.UIComponent;
import jakarta.faces.context.FacesContext;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public class ActionEvent extends FacesEvent
{
diff --git a/api/src/main/java/jakarta/faces/event/ActionListener.java b/api/src/main/java/jakarta/faces/event/ActionListener.java
index c5e831aed..6506ff5ae 100755
--- a/api/src/main/java/jakarta/faces/event/ActionListener.java
+++ b/api/src/main/java/jakarta/faces/event/ActionListener.java
@@ -19,7 +19,7 @@
package jakarta.faces.event;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public interface ActionListener extends FacesListener
{
diff --git a/api/src/main/java/jakarta/faces/event/FacesEvent.java b/api/src/main/java/jakarta/faces/event/FacesEvent.java
index fde436425..30d282774 100755
--- a/api/src/main/java/jakarta/faces/event/FacesEvent.java
+++ b/api/src/main/java/jakarta/faces/event/FacesEvent.java
@@ -25,7 +25,7 @@ import jakarta.faces.component.UIComponent;
import jakarta.faces.context.FacesContext;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public abstract class FacesEvent extends EventObject
{
diff --git a/api/src/main/java/jakarta/faces/event/FacesListener.java b/api/src/main/java/jakarta/faces/event/FacesListener.java
index 3d09335c7..333ace0ff 100755
--- a/api/src/main/java/jakarta/faces/event/FacesListener.java
+++ b/api/src/main/java/jakarta/faces/event/FacesListener.java
@@ -21,7 +21,7 @@ package jakarta.faces.event;
import java.util.EventListener;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public interface FacesListener extends EventListener
{
diff --git a/api/src/main/java/jakarta/faces/event/PhaseEvent.java b/api/src/main/java/jakarta/faces/event/PhaseEvent.java
index ce1a847d3..bfeaf4c4c 100755
--- a/api/src/main/java/jakarta/faces/event/PhaseEvent.java
+++ b/api/src/main/java/jakarta/faces/event/PhaseEvent.java
@@ -24,7 +24,7 @@ import java.util.EventObject;
import org.apache.myfaces.core.api.shared.lang.Assert;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public class PhaseEvent extends EventObject
{
diff --git a/api/src/main/java/jakarta/faces/event/PhaseId.java b/api/src/main/java/jakarta/faces/event/PhaseId.java
index 70aafb9f7..fa80faf99 100755
--- a/api/src/main/java/jakarta/faces/event/PhaseId.java
+++ b/api/src/main/java/jakarta/faces/event/PhaseId.java
@@ -25,7 +25,7 @@ import jakarta.faces.FacesException;
import org.apache.myfaces.core.api.shared.lang.Assert;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public class PhaseId implements Comparable
{
diff --git a/api/src/main/java/jakarta/faces/event/PhaseListener.java b/api/src/main/java/jakarta/faces/event/PhaseListener.java
index c478bb9d7..65bdb9f44 100755
--- a/api/src/main/java/jakarta/faces/event/PhaseListener.java
+++ b/api/src/main/java/jakarta/faces/event/PhaseListener.java
@@ -19,7 +19,7 @@
package jakarta.faces.event;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public interface PhaseListener extends java.util.EventListener, java.io.Serializable
{
diff --git a/api/src/main/java/jakarta/faces/event/ValueChangeEvent.java b/api/src/main/java/jakarta/faces/event/ValueChangeEvent.java
index 8cc71a9ef..4d330aeaf 100755
--- a/api/src/main/java/jakarta/faces/event/ValueChangeEvent.java
+++ b/api/src/main/java/jakarta/faces/event/ValueChangeEvent.java
@@ -22,7 +22,7 @@ import jakarta.faces.component.UIComponent;
import jakarta.faces.context.FacesContext;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public class ValueChangeEvent extends FacesEvent
{
diff --git a/api/src/main/java/jakarta/faces/event/ValueChangeListener.java b/api/src/main/java/jakarta/faces/event/ValueChangeListener.java
index bdd0dd943..0c16f6c12 100755
--- a/api/src/main/java/jakarta/faces/event/ValueChangeListener.java
+++ b/api/src/main/java/jakarta/faces/event/ValueChangeListener.java
@@ -19,7 +19,7 @@
package jakarta.faces.event;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public interface ValueChangeListener extends FacesListener
{
diff --git a/api/src/main/java/jakarta/faces/lifecycle/Lifecycle.java b/api/src/main/java/jakarta/faces/lifecycle/Lifecycle.java
index 6f79e0cc7..9a134710d 100755
--- a/api/src/main/java/jakarta/faces/lifecycle/Lifecycle.java
+++ b/api/src/main/java/jakarta/faces/lifecycle/Lifecycle.java
@@ -22,7 +22,7 @@ import jakarta.faces.FacesException;
import jakarta.faces.context.FacesContext;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public abstract class Lifecycle
{
diff --git a/api/src/main/java/jakarta/faces/lifecycle/LifecycleFactory.java b/api/src/main/java/jakarta/faces/lifecycle/LifecycleFactory.java
index 692b4224e..689b57c69 100755
--- a/api/src/main/java/jakarta/faces/lifecycle/LifecycleFactory.java
+++ b/api/src/main/java/jakarta/faces/lifecycle/LifecycleFactory.java
@@ -23,7 +23,7 @@ import java.util.Iterator;
import jakarta.faces.FacesWrapper;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public abstract class LifecycleFactory implements
FacesWrapper<LifecycleFactory>
diff --git a/api/src/main/java/jakarta/faces/model/ArrayDataModel.java b/api/src/main/java/jakarta/faces/model/ArrayDataModel.java
index 0c17e8d69..b0911f88d 100755
--- a/api/src/main/java/jakarta/faces/model/ArrayDataModel.java
+++ b/api/src/main/java/jakarta/faces/model/ArrayDataModel.java
@@ -21,7 +21,7 @@ package jakarta.faces.model;
import org.apache.myfaces.core.api.shared.lang.Assert;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public class ArrayDataModel<E> extends DataModel<E>
{
diff --git a/api/src/main/java/jakarta/faces/model/DataModel.java b/api/src/main/java/jakarta/faces/model/DataModel.java
index 6fead6005..52d3d638c 100644
--- a/api/src/main/java/jakarta/faces/model/DataModel.java
+++ b/api/src/main/java/jakarta/faces/model/DataModel.java
@@ -46,7 +46,7 @@ import org.apache.myfaces.core.api.shared.lang.Assert;
* that explicitly serializes dataModel.getWrappedData.
*
* See Javadoc of
- * <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a> for more.
+ * <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a> for more.
*/
public abstract class DataModel<E> implements Iterable<E>
{
diff --git a/api/src/main/java/jakarta/faces/model/DataModelEvent.java b/api/src/main/java/jakarta/faces/model/DataModelEvent.java
index 930e95879..872cd2cd2 100755
--- a/api/src/main/java/jakarta/faces/model/DataModelEvent.java
+++ b/api/src/main/java/jakarta/faces/model/DataModelEvent.java
@@ -19,7 +19,7 @@
package jakarta.faces.model;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public class DataModelEvent extends java.util.EventObject
{
diff --git a/api/src/main/java/jakarta/faces/model/DataModelListener.java b/api/src/main/java/jakarta/faces/model/DataModelListener.java
index 604db2612..c03b64f0a 100755
--- a/api/src/main/java/jakarta/faces/model/DataModelListener.java
+++ b/api/src/main/java/jakarta/faces/model/DataModelListener.java
@@ -19,7 +19,7 @@
package jakarta.faces.model;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public interface DataModelListener extends java.util.EventListener
{
diff --git a/api/src/main/java/jakarta/faces/model/ListDataModel.java b/api/src/main/java/jakarta/faces/model/ListDataModel.java
index 0ac5d550a..38edaf5b3 100755
--- a/api/src/main/java/jakarta/faces/model/ListDataModel.java
+++ b/api/src/main/java/jakarta/faces/model/ListDataModel.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.myfaces.core.api.shared.lang.Assert;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public class ListDataModel<E> extends DataModel<E>
{
diff --git a/api/src/main/java/jakarta/faces/model/ResultSetDataModel.java b/api/src/main/java/jakarta/faces/model/ResultSetDataModel.java
index b8c6cb8f3..93c98c645 100755
--- a/api/src/main/java/jakarta/faces/model/ResultSetDataModel.java
+++ b/api/src/main/java/jakarta/faces/model/ResultSetDataModel.java
@@ -33,7 +33,7 @@ import java.util.TreeMap;
import org.apache.myfaces.core.api.shared.lang.Assert;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public class ResultSetDataModel extends DataModel<Map<String,Object>>
{
diff --git a/api/src/main/java/jakarta/faces/model/ScalarDataModel.java b/api/src/main/java/jakarta/faces/model/ScalarDataModel.java
index 1b9c2a410..e4f83fa26 100755
--- a/api/src/main/java/jakarta/faces/model/ScalarDataModel.java
+++ b/api/src/main/java/jakarta/faces/model/ScalarDataModel.java
@@ -19,7 +19,7 @@
package jakarta.faces.model;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public class ScalarDataModel<E> extends DataModel<E>
{
diff --git a/api/src/main/java/jakarta/faces/model/SelectItem.java b/api/src/main/java/jakarta/faces/model/SelectItem.java
index 8d4e7e312..d70621c33 100755
--- a/api/src/main/java/jakarta/faces/model/SelectItem.java
+++ b/api/src/main/java/jakarta/faces/model/SelectItem.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
import org.apache.myfaces.core.api.shared.lang.Assert;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public class SelectItem implements Serializable
{
diff --git a/api/src/main/java/jakarta/faces/model/SelectItemGroup.java b/api/src/main/java/jakarta/faces/model/SelectItemGroup.java
index 19489eb30..f5f9bfc80 100755
--- a/api/src/main/java/jakarta/faces/model/SelectItemGroup.java
+++ b/api/src/main/java/jakarta/faces/model/SelectItemGroup.java
@@ -22,7 +22,7 @@ import java.util.Collection;
import org.apache.myfaces.core.api.shared.lang.Assert;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public class SelectItemGroup extends SelectItem
{
diff --git a/api/src/main/java/jakarta/faces/render/RenderKit.java b/api/src/main/java/jakarta/faces/render/RenderKit.java
index 7c75a10dd..cbb3627ea 100755
--- a/api/src/main/java/jakarta/faces/render/RenderKit.java
+++ b/api/src/main/java/jakarta/faces/render/RenderKit.java
@@ -30,7 +30,7 @@ import jakarta.faces.context.ResponseWriter;
import org.apache.myfaces.core.api.shared.lang.Assert;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public abstract class RenderKit
{
diff --git a/api/src/main/java/jakarta/faces/render/RenderKitFactory.java b/api/src/main/java/jakarta/faces/render/RenderKitFactory.java
index 393ed7d09..d7a3e020b 100755
--- a/api/src/main/java/jakarta/faces/render/RenderKitFactory.java
+++ b/api/src/main/java/jakarta/faces/render/RenderKitFactory.java
@@ -23,7 +23,7 @@ import jakarta.faces.context.FacesContext;
import java.util.Iterator;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public abstract class RenderKitFactory implements
FacesWrapper<RenderKitFactory>
diff --git a/api/src/main/java/jakarta/faces/render/Renderer.java b/api/src/main/java/jakarta/faces/render/Renderer.java
index 6d3628f8d..9eebfdb1d 100755
--- a/api/src/main/java/jakarta/faces/render/Renderer.java
+++ b/api/src/main/java/jakarta/faces/render/Renderer.java
@@ -26,7 +26,7 @@ import jakarta.faces.convert.ConverterException;
import org.apache.myfaces.core.api.shared.lang.Assert;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public abstract class Renderer<T extends UIComponent>
{
diff --git a/api/src/main/java/jakarta/faces/render/ResponseStateManager.java b/api/src/main/java/jakarta/faces/render/ResponseStateManager.java
index 8e9742cb2..acdbe857a 100755
--- a/api/src/main/java/jakarta/faces/render/ResponseStateManager.java
+++ b/api/src/main/java/jakarta/faces/render/ResponseStateManager.java
@@ -22,7 +22,7 @@ import jakarta.faces.context.FacesContext;
import java.io.IOException;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public abstract class ResponseStateManager
{
diff --git a/api/src/main/java/jakarta/faces/validator/BeanValidator.java b/api/src/main/java/jakarta/faces/validator/BeanValidator.java
index a146a7f19..1d5dacef0 100644
--- a/api/src/main/java/jakarta/faces/validator/BeanValidator.java
+++ b/api/src/main/java/jakarta/faces/validator/BeanValidator.java
@@ -72,7 +72,7 @@ public class BeanValidator implements Validator, PartialStateHolder
private static final Logger log = Logger.getLogger(BeanValidator.class.getName());
/**
- * Converter ID, as defined by the JSF 2.0 specification.
+ * Converter ID, as defined by the Faces 2.0 specification.
*/
public static final String VALIDATOR_ID = "jakarta.faces.Bean";
@@ -189,7 +189,7 @@ public class BeanValidator implements Validator, PartialStateHolder
// Note that validationGroupsArray was initialized when createValidator was called
Class[] validationGroupsArray = this.validationGroupsArray;
- // JSF 2.3: If the ENABLE_VALIDATE_WHOLE_BEAN_PARAM_NAME application parameter is enabled and this Validator
+ // Faces 2.3: If the ENABLE_VALIDATE_WHOLE_BEAN_PARAM_NAME application parameter is enabled and this Validator
// instance has validation groups other than or in addition to the Default group
boolean containsOtherValidationGroup = false;
if (validationGroupsArray != null && validationGroupsArray.length > 0)
@@ -221,7 +221,7 @@ public class BeanValidator implements Validator, PartialStateHolder
if (isValidateWholeBeanEnabled(context) && containsOtherValidationGroup)
{
- // JSF 2.3: record the fact that this field failed validation so that any <f:validateWholeBean />
+ // Faces 2.3: record the fact that this field failed validation so that any <f:validateWholeBean />
// component later in the tree is able to skip class-level validation for the bean for which this
// particular field is a property. Regardless of whether or not
// ENABLE_VALIDATE_WHOLE_BEAN_PARAM_NAME is set, throw the new exception.
@@ -233,7 +233,7 @@ public class BeanValidator implements Validator, PartialStateHolder
else
{
- // JSF 2.3: If the returned Set is empty, the ENABLE_VALIDATE_WHOLE_BEAN_PARAM_NAME application parameter
+ // Faces 2.3: If the returned Set is empty, the ENABLE_VALIDATE_WHOLE_BEAN_PARAM_NAME application parameter
// is enabled and this Validator instance has validation groups other than or in addition to the
// Default group
if (isValidateWholeBeanEnabled(context) && containsOtherValidationGroup)
diff --git a/api/src/main/java/jakarta/faces/validator/DoubleRangeValidator.java b/api/src/main/java/jakarta/faces/validator/DoubleRangeValidator.java
index 0e70e9933..93233b755 100755
--- a/api/src/main/java/jakarta/faces/validator/DoubleRangeValidator.java
+++ b/api/src/main/java/jakarta/faces/validator/DoubleRangeValidator.java
@@ -37,7 +37,7 @@ import org.apache.myfaces.core.api.shared.lang.Assert;
*
* Unless otherwise specified, all attributes accept static values or EL expressions.
*
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
@JSFValidator(name = "f:validateDoubleRange", bodyContent = "empty")
@JSFJspProperty(
diff --git a/api/src/main/java/jakarta/faces/validator/LengthValidator.java b/api/src/main/java/jakarta/faces/validator/LengthValidator.java
index 1e659d9b3..ea4e090be 100755
--- a/api/src/main/java/jakarta/faces/validator/LengthValidator.java
+++ b/api/src/main/java/jakarta/faces/validator/LengthValidator.java
@@ -38,7 +38,7 @@ import org.apache.myfaces.core.api.shared.lang.Assert;
*
* Unless otherwise specified, all attributes accept static values or EL expressions.
*
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
@JSFValidator(name = "f:validateLength", bodyContent = "empty")
@JSFJspProperty(
diff --git a/api/src/main/java/jakarta/faces/validator/LongRangeValidator.java b/api/src/main/java/jakarta/faces/validator/LongRangeValidator.java
index 9de4e4c0e..15c421c66 100755
--- a/api/src/main/java/jakarta/faces/validator/LongRangeValidator.java
+++ b/api/src/main/java/jakarta/faces/validator/LongRangeValidator.java
@@ -37,7 +37,7 @@ import org.apache.myfaces.core.api.shared.lang.Assert;
*
* Unless otherwise specified, all attributes accept static values or EL expressions.
*
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
@JSFValidator(name = "f:validateLongRange", bodyContent = "empty")
@JSFJspProperty(
diff --git a/api/src/main/java/jakarta/faces/validator/MethodExpressionValidator.java b/api/src/main/java/jakarta/faces/validator/MethodExpressionValidator.java
index d1284f4b6..c13a6489c 100644
--- a/api/src/main/java/jakarta/faces/validator/MethodExpressionValidator.java
+++ b/api/src/main/java/jakarta/faces/validator/MethodExpressionValidator.java
@@ -27,7 +27,7 @@ import jakarta.faces.context.FacesContext;
import org.apache.myfaces.core.api.shared.lang.Assert;
/**
- * see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public class MethodExpressionValidator implements Validator, StateHolder
{
diff --git a/api/src/main/java/jakarta/faces/validator/RegexValidator.java b/api/src/main/java/jakarta/faces/validator/RegexValidator.java
index d959a1d02..4fb94a21e 100644
--- a/api/src/main/java/jakarta/faces/validator/RegexValidator.java
+++ b/api/src/main/java/jakarta/faces/validator/RegexValidator.java
@@ -80,7 +80,7 @@ public class RegexValidator implements Validator, PartialStateHolder
{
/**
- * Converter ID, as defined by the JSF 2.0 specification.
+ * Converter ID, as defined by the Faces 2.0 specification.
*/
public static final String VALIDATOR_ID = "jakarta.faces.RegularExpression";
diff --git a/api/src/main/java/jakarta/faces/validator/Validator.java b/api/src/main/java/jakarta/faces/validator/Validator.java
index 33d1b3469..e8d2e7cfe 100755
--- a/api/src/main/java/jakarta/faces/validator/Validator.java
+++ b/api/src/main/java/jakarta/faces/validator/Validator.java
@@ -23,7 +23,7 @@ import jakarta.faces.context.FacesContext;
import java.util.EventListener;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public interface Validator<T> extends EventListener
{
diff --git a/api/src/main/java/jakarta/faces/validator/ValidatorException.java b/api/src/main/java/jakarta/faces/validator/ValidatorException.java
index ba4868bcd..f90dc3a09 100755
--- a/api/src/main/java/jakarta/faces/validator/ValidatorException.java
+++ b/api/src/main/java/jakarta/faces/validator/ValidatorException.java
@@ -24,7 +24,7 @@ import jakarta.faces.FacesException;
import jakarta.faces.application.FacesMessage;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
public class ValidatorException
extends FacesException
diff --git a/api/src/main/java/jakarta/faces/view/facelets/ComponentHandler.java b/api/src/main/java/jakarta/faces/view/facelets/ComponentHandler.java
index 94785114b..89b46450c 100644
--- a/api/src/main/java/jakarta/faces/view/facelets/ComponentHandler.java
+++ b/api/src/main/java/jakarta/faces/view/facelets/ComponentHandler.java
@@ -21,8 +21,8 @@ package jakarta.faces.view.facelets;
import jakarta.faces.component.UIComponent;
/**
- * Implementation of the tag logic used in the JSF specification. This is your golden hammer for wiring UIComponents to
- * Facelets.
+ * Implementation of the tag logic used in the Faces specification. This is your golden hammer for wiring UIComponents
+ * to Facelets.
*/
public class ComponentHandler extends DelegatingMetaTagHandler
{
diff --git a/api/src/main/java/jakarta/faces/view/facelets/Facelet.java b/api/src/main/java/jakarta/faces/view/facelets/Facelet.java
index bb1385a6a..4cffa8da5 100644
--- a/api/src/main/java/jakarta/faces/view/facelets/Facelet.java
+++ b/api/src/main/java/jakarta/faces/view/facelets/Facelet.java
@@ -24,7 +24,7 @@ import jakarta.faces.context.FacesContext;
/**
* The parent or root object in a FaceletHandler composition. The Facelet will take care of populating the passed
- * UIComponent parent in relation to the create/restore lifecycle of JSF.
+ * UIComponent parent in relation to the create/restore lifecycle of Faces.
*/
public abstract class Facelet
{
diff --git a/api/src/main/java/jakarta/faces/view/facelets/FaceletContext.java b/api/src/main/java/jakarta/faces/view/facelets/FaceletContext.java
index c59927957..b4ca63998 100644
--- a/api/src/main/java/jakarta/faces/view/facelets/FaceletContext.java
+++ b/api/src/main/java/jakarta/faces/view/facelets/FaceletContext.java
@@ -31,7 +31,7 @@ import jakarta.faces.context.FacesContext;
/**
* The parent or root object in a FaceletHandler composition. The Facelet will
* take care of populating the passed UIComponent parent in relation to the
- * create/restore lifecycle of JSF.
+ * create/restore lifecycle of Faces.
*
* @since 2.0
*/
diff --git a/api/src/main/java/jakarta/faces/webapp/FacesServlet.java b/api/src/main/java/jakarta/faces/webapp/FacesServlet.java
index 4883d18f7..74546d297 100755
--- a/api/src/main/java/jakarta/faces/webapp/FacesServlet.java
+++ b/api/src/main/java/jakarta/faces/webapp/FacesServlet.java
@@ -40,7 +40,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
/**
- * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
+ * see Javadoc of <a href="http://java.sun.com/javaee/javaserverfaces/1.2/docs/api/index.html">Faces Specification</a>
*/
@MultipartConfig
public final class FacesServlet implements Servlet
@@ -49,7 +49,7 @@ public final class FacesServlet implements Servlet
/**
* Comma separated list of URIs of (additional) faces config files.
- * (e.g. /WEB-INF/my-config.xml)See JSF 1.0 PRD2, 10.3.2
+ * (e.g. /WEB-INF/my-config.xml)See Faces 1.0 PRD2, 10.3.2
* Attention: You do not need to put /WEB-INF/faces-config.xml in here.
*/
@JSFWebConfigParam(since="1.1")
@@ -216,7 +216,7 @@ public final class FacesServlet implements Servlet
}
else
{
- //JSF 2.2: attach window
+ //Faces 2.2: attach window
_lifecycle.attachWindow(facesContext);
// If this returns false, handle as follows:
// call Lifecycle.execute(jakarta.faces.context.FacesContext)
diff --git a/api/src/main/java/org/apache/myfaces/core/api/shared/CommonHtmlAttributes.java b/api/src/main/java/org/apache/myfaces/core/api/shared/CommonHtmlAttributes.java
index cea9d25be..c5284dcfc 100644
--- a/api/src/main/java/org/apache/myfaces/core/api/shared/CommonHtmlAttributes.java
+++ b/api/src/main/java/org/apache/myfaces/core/api/shared/CommonHtmlAttributes.java
@@ -24,7 +24,7 @@ import java.util.Map;
import jakarta.faces.component.UIComponent;
/**
- * This is a list of the most common properties used by a JSF html component, organized by interfaces.
+ * This is a list of the most common properties used by a Faces html component, organized by interfaces.
*/
public class CommonHtmlAttributes
{
diff --git a/api/src/main/java/org/apache/myfaces/core/api/shared/MessageUtils.java b/api/src/main/java/org/apache/myfaces/core/api/shared/MessageUtils.java
index 12df3ad56..b934433db 100755
--- a/api/src/main/java/org/apache/myfaces/core/api/shared/MessageUtils.java
+++ b/api/src/main/java/org/apache/myfaces/core/api/shared/MessageUtils.java
@@ -180,7 +180,7 @@ public class MessageUtils
try
{
- //First we try the JSF implementation class loader
+ //First we try the Faces implementation class loader
if (bundleControl == null)
{
return ResourceBundle.getBundle(bundleName,
@@ -198,7 +198,7 @@ public class MessageUtils
{
try
{
- //Next we try the JSF API class loader
+ //Next we try the Faces API class loader
if (bundleControl == null)
{
return ResourceBundle.getBundle(bundleName,
diff --git a/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java b/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
index 2bfc29b0a..a6f8748d2 100755
--- a/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
@@ -1065,7 +1065,7 @@ public class ApplicationImpl extends Application
* Obtain a reference to the composite component metadata for this composite component by calling
* ViewDeclarationLanguage.getComponentMetadata(jakarta.faces.context.FacesContext,
* jakarta.faces.application.Resource), passing the facesContext and componentResource arguments to this method.
- * This version of JSF specification uses JavaBeans as the API to the component metadata.
+ * This version of Faces specification uses JavaBeans as the API to the component metadata.
*/
BeanInfo metadata = vdl.getComponentMetadata(context, componentResource);
if (metadata == null)
@@ -1097,7 +1097,7 @@ public class ApplicationImpl extends Application
* Otherwise, determine if a script based component for this Resource can be found by calling
* ViewDeclarationLanguage.getScriptComponentResource(jakarta.faces.context.FacesContext,
* jakarta.faces.application.Resource). If the result is non-null, and is a script written in one of the
- * languages listed in JSF 4.3 of the specification prose document, create a UIComponent instance from the
+ * languages listed in Faces 4.3 of the specification prose document, create a UIComponent instance from the
* script resource.
*/
resource = vdl.getScriptComponentResource(context, componentResource);
@@ -1304,13 +1304,13 @@ public class ApplicationImpl extends Application
* Class converterClass) method on this class. Here the the appropriate Class definition is found, then an instance
* is created and returned.
* <p>
- * A converter registered via a config file can have any number of nested attribute or property tags. The JSF
+ * A converter registered via a config file can have any number of nested attribute or property tags. The Faces
* specification is very vague about what effect these nested tags have. This method ignores nested attribute
* definitions, but for each nested property tag the corresponding setter is invoked on the new Converter instance
* passing the property's defaultValuer. Basic typeconversion is done so the target properties on the Converter
* instance can be String, int, boolean, etc. Note that:
* <ol>
- * <li>the Sun Mojarra JSF implemenation ignores nested property tags completely, so this behaviour cannot be
+ * <li>the Sun Mojarra Faces implemenation ignores nested property tags completely, so this behaviour cannot be
* relied on across implementations.
* <li>there is no equivalent functionality for converter classes registered via the Application.addConverter api
* method.
@@ -1477,7 +1477,7 @@ public class ApplicationImpl extends Application
try
{
// look for a constructor that takes a single Class object
- // See JSF 1.2 javadoc for Converter
+ // See Faces 1.2 javadoc for Converter
Constructor<? extends Converter> constructor = converterClass
.getConstructor(new Class[] { Class.class });
diff --git a/impl/src/main/java/org/apache/myfaces/application/BackwardsCompatibleNavigationHandlerWrapper.java b/impl/src/main/java/org/apache/myfaces/application/BackwardsCompatibleNavigationHandlerWrapper.java
index b53326fff..2e2102b10 100644
--- a/impl/src/main/java/org/apache/myfaces/application/BackwardsCompatibleNavigationHandlerWrapper.java
+++ b/impl/src/main/java/org/apache/myfaces/application/BackwardsCompatibleNavigationHandlerWrapper.java
@@ -29,8 +29,8 @@ import jakarta.faces.context.FacesContext;
/**
* This class is used as a double wrapper for NavigationHandler
* and ConfigurableNavigationHandler to be backwards compatible
- * to the pre JSF 2.0 NavigationHandlers which are not
- * ConfigurableNavigationHandlers (since JSF 2.0 the standard
+ * to the pre Faces 2.0 NavigationHandlers which are not
+ * ConfigurableNavigationHandlers (since Faces 2.0 the standard
* NavigationHandler implementation has to inherit from
* ConfigurableNavigationHandler).
*
diff --git a/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
index b759cb0fc..1971cef12 100755
--- a/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
@@ -151,7 +151,7 @@ public class NavigationHandlerImpl extends ConfigurableNavigationHandler
facesContext.getViewRoot().getViewId();
String toViewId = navigationCase.getToViewId(facesContext);
// A redirect is required only if the viewId changes. If the viewId
- // does not change, section 7.4.2 says that a redirect/restart JSF
+ // does not change, section 7.4.2 says that a redirect/restart Faces
// lifecycle is not necessary.
if (fromViewId == null && toViewId != null)
{
@@ -242,7 +242,7 @@ public class NavigationHandlerImpl extends ConfigurableNavigationHandler
}
}
- // JSF 2.0 the javadoc of handleNavigation() says something like this
+ // Faces 2.0 the javadoc of handleNavigation() says something like this
// "...If the view has changed after an application action, call
// PartialViewContext.setRenderAll(true)...". The effect is that ajax requests
// are included on navigation.
@@ -264,7 +264,7 @@ public class NavigationHandlerImpl extends ConfigurableNavigationHandler
processor.disposeView(facesContext, facesContext.getViewRoot());
}
- // JSF 2.0 Spec call Flash.setRedirect(true) to notify Flash scope and take proper actions
+ // Faces 2.0 Spec call Flash.setRedirect(true) to notify Flash scope and take proper actions
externalContext.getFlash().setRedirect(true);
try
{
@@ -282,7 +282,7 @@ public class NavigationHandlerImpl extends ConfigurableNavigationHandler
//create new view
String newViewId = navigationCase.getToViewId(facesContext);
- // JSF 2.0 the javadoc of handleNavigation() says something like this
+ // Faces 2.0 the javadoc of handleNavigation() says something like this
// "...If the view has changed after an application action, call
// PartialViewContext.setRenderAll(true)...". The effect is that ajax requests
// are included on navigation.
@@ -515,7 +515,7 @@ public class NavigationHandlerImpl extends ConfigurableNavigationHandler
{
FlowHandler flowHandler = facesContext.getApplication().getFlowHandler();
List<Flow> activeFlows = FlowHandlerImpl.getActiveFlows(facesContext, flowHandler);
- // JSF 2.2 section 7.4.2: "... When outside of a flow, view identifier
+ // Faces 2.2 section 7.4.2: "... When outside of a flow, view identifier
// has the additional possibility of being a flow id.
Flow targetFlow = calculateTargetFlow(facesContext, outcome, flowHandler, activeFlows, toFlowDocumentId);
Flow currentFlow = navigationContext.getCurrentFlow(facesContext);
@@ -529,7 +529,7 @@ public class NavigationHandlerImpl extends ConfigurableNavigationHandler
if (currentFlow != null)
{
- // JSF 2.2 section 7.4.2: When inside a flow, a view identifier has
+ // Faces 2.2 section 7.4.2: When inside a flow, a view identifier has
// the additional possibility of being the id of any node within the
// current flow or the id of another flow
if (targetFlow != null)
@@ -755,7 +755,7 @@ public class NavigationHandlerImpl extends ConfigurableNavigationHandler
navigationCase = getNavigationCaseFromFlowStructure(facesContext,
flowNavigationStructure, actionToGo, outcomeToGo, viewId);
- // JSF 2.2 section 7.4.2 "... any text that references a view identifier, such as
+ // Faces 2.2 section 7.4.2 "... any text that references a view identifier, such as
// <from-view-id> or <to-view-id>,
// can also refer to a flow node ..."
if (navigationCase != null)
@@ -1190,7 +1190,7 @@ public class NavigationHandlerImpl extends ConfigurableNavigationHandler
String cazeActionRef = caze.getFromAction();
Boolean cazeIf = caze.getCondition(context);
boolean ifMatches = cazeIf == null ? false : cazeIf;
- // JSF 2.0: support conditional navigation via <if>.
+ // Faces 2.0: support conditional navigation via <if>.
// Use for later cases.
if(outcome == null && (cazeOutcome != null || cazeIf == null) && actionRef == null)
diff --git a/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
index 2ec23e3c2..07dd538d0 100644
--- a/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
@@ -929,7 +929,7 @@ public class ResourceHandlerImpl extends ResourceHandler
/**
* Recursively unwarp the resource until we find the real resourceName
- * This is needed because the JSF2 specced ResourceWrapper doesn't override
+ * This is needed because the Faces2 specced ResourceWrapper doesn't override
* the getResourceName() method :(
* @param resource
* @return the first non-null resourceName or <code>null</code> if none set
@@ -1658,7 +1658,7 @@ public class ResourceHandlerImpl extends ResourceHandler
// "... Considering the web app root ..."
// "... Considering faces flows (at the locations specified in the spec prose document section
- // Faces Flows in the Using JSF in Web Applications chapter) ..."
+ // Faces Flows in the Using Faces in Web Applications chapter) ..."
for (ResourceLoader loader : getResourceHandlerSupport().getViewResourceLoaders())
{
ResourceMeta resourceMeta = deriveViewResourceMeta(
diff --git a/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
index d7d20656b..8073e7a38 100644
--- a/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
@@ -56,7 +56,7 @@ import org.apache.myfaces.core.api.shared.lang.Assert;
import org.apache.myfaces.view.facelets.StateWriter;
/**
- * JSF 2.0 ViewHandler implementation
+ * Faces 2.0 ViewHandler implementation
*
* @since 2.0
*/
diff --git a/impl/src/main/java/org/apache/myfaces/application/ViewIdSupport.java b/impl/src/main/java/org/apache/myfaces/application/ViewIdSupport.java
index 12d5dd180..18e3782a5 100644
--- a/impl/src/main/java/org/apache/myfaces/application/ViewIdSupport.java
+++ b/impl/src/main/java/org/apache/myfaces/application/ViewIdSupport.java
@@ -150,7 +150,7 @@ public class ViewIdSupport
throw new InvalidViewIdException();
}
- // In JSF 2.3 some changes were done in the VDL to avoid the jsp vdl
+ // In Faces 2.3 some changes were done in the VDL to avoid the jsp vdl
// RequestDispatcher redirection (only accept viewIds with jsp extension).
// If we have this case
if (viewId != null && viewId.equals(mapping.getPrefix()))
@@ -204,7 +204,7 @@ public class ViewIdSupport
builder.append(contextPath);
}
- // In JSF 2.3 we could have cases where the viewId can be bound to an url-pattern that is not
+ // In Faces 2.3 we could have cases where the viewId can be bound to an url-pattern that is not
// prefix or suffix, but exact mapping. In this part we need to take the viewId and check if
// the viewId is bound or not with a mapping.
if (mapping != null && mapping.isExactMapping())
@@ -242,7 +242,7 @@ public class ViewIdSupport
}
else if (mapping.isExtensionMapping())
{
- //See JSF 2.0 section 7.5.2
+ //See Faces 2.0 section 7.5.2
boolean founded = false;
for (String contextSuffix : config.getViewSuffix())
{
@@ -256,7 +256,7 @@ public class ViewIdSupport
}
if (!founded)
{
- //See JSF 2.0 section 7.5.2
+ //See Faces 2.0 section 7.5.2
// - If the argument viewId has an extension, and this extension is mapping,
// the result is contextPath + viewId
//
@@ -295,7 +295,7 @@ public class ViewIdSupport
}
- //JSF 2.2 check view protection.
+ //Faces 2.2 check view protection.
if (isViewProtected(context, viewId))
{
int index = builder.indexOf("?");
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/managedproperty/ManagedPropertyProducer.java b/impl/src/main/java/org/apache/myfaces/cdi/managedproperty/ManagedPropertyProducer.java
index 77ba5463b..f56e6c3f7 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/managedproperty/ManagedPropertyProducer.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/managedproperty/ManagedPropertyProducer.java
@@ -83,7 +83,7 @@ public class ManagedPropertyProducer extends AbstractDynamicProducer<Object>
if (facesContext == null)
{
throw new FacesException("@ManagedProperty(\"" + typeInfo.getExpression()
- + "\") can only be resolved in a JSF request!");
+ + "\") can only be resolved in a Faces request!");
}
return facesContext.getApplication().evaluateExpressionGet(
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/util/AbstractDynamicProducer.java b/impl/src/main/java/org/apache/myfaces/cdi/util/AbstractDynamicProducer.java
index 6268357f8..788ed7ce6 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/util/AbstractDynamicProducer.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/util/AbstractDynamicProducer.java
@@ -100,7 +100,7 @@ public abstract class AbstractDynamicProducer<T> implements Bean<T>, Passivation
@Override
public void destroy(T instance, CreationalContext<T> creationalContext)
{
- // not required - we just push a JSF artifact into CDI
+ // not required - we just push a Faces artifact into CDI
}
@Override
diff --git a/impl/src/main/java/org/apache/myfaces/component/ComponentResourceContainer.java b/impl/src/main/java/org/apache/myfaces/component/ComponentResourceContainer.java
index fe706f609..456fa27d8 100644
--- a/impl/src/main/java/org/apache/myfaces/component/ComponentResourceContainer.java
+++ b/impl/src/main/java/org/apache/myfaces/component/ComponentResourceContainer.java
@@ -27,7 +27,7 @@ import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFCompone
/**
* Dummy class that is used as a container for resources
- * (see JSF 2.0 rev A UIViewRoot.addComponentResource javadoc)
+ * (see Faces 2.0 rev A UIViewRoot.addComponentResource javadoc)
*
* @author Leonardo Uribe (latest modification by $Author$)
* @version $Revision$ $Date$
diff --git a/impl/src/main/java/org/apache/myfaces/component/validate/WholeBeanValidator.java b/impl/src/main/java/org/apache/myfaces/component/validate/WholeBeanValidator.java
index 3652f4af9..e22e3ef2c 100644
--- a/impl/src/main/java/org/apache/myfaces/component/validate/WholeBeanValidator.java
+++ b/impl/src/main/java/org/apache/myfaces/component/validate/WholeBeanValidator.java
@@ -120,7 +120,7 @@ public class WholeBeanValidator implements Validator
if (Boolean.TRUE.equals(beanValidationFailed))
{
- // JSF 2.3 Skip class level validation
+ // Faces 2.3 Skip class level validation
return;
}
diff --git a/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationMerger.java b/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationMerger.java
index dbfd30836..3ac7f9dd8 100644
--- a/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationMerger.java
+++ b/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationMerger.java
@@ -48,7 +48,7 @@ import org.apache.myfaces.util.lang.StringUtils;
* Default impl of the FacesConfigurationMerger-SPI.
*
* This impl gets all FacesConfig data from the current FacesConfigurationProvider SPI impl and merges
- * it into one FacesConfigData object using the ordering and sorting rules of the JSF spec.
+ * it into one FacesConfigData object using the ordering and sorting rules of the Faces spec.
*
* @author Jakob Korherr
*/
@@ -84,7 +84,7 @@ public class DefaultFacesConfigurationMerger extends FacesConfigurationMerger
else
{
//assume false if no faces-config.xml was found
- //metadata-complete can only be specified in faces-config.xml per the JSF 2.0 schema
+ //metadata-complete can only be specified in faces-config.xml per the Faces 2.0 schema
metadataComplete = false;
}
@@ -104,11 +104,11 @@ public class DefaultFacesConfigurationMerger extends FacesConfigurationMerger
// faces-config.xml files from jakarta.faces.CONFIG_FILES
appConfigResources.addAll(facesConfigProvider.getContextSpecifiedFacesConfig(externalContext));
- // JSF 2.2 ApplicationConfigurationResourceDocumentPopulator FacesConfig
+ // Faces 2.2 ApplicationConfigurationResourceDocumentPopulator FacesConfig
appConfigResources.addAll(facesConfigProvider.
getApplicationConfigurationResourceDocumentPopulatorFacesConfig(externalContext));
- // JSF 2.2 Faces Flow
+ // Faces 2.2 Faces Flow
appConfigResources.addAll(facesConfigProvider.getFacesFlowFacesConfig(externalContext));
// apply the ordering and sorting algorithm
diff --git a/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java b/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
index 7d8fdd1cc..44341af2a 100644
--- a/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
@@ -434,7 +434,7 @@ public class DefaultFacesConfigurationProvider extends FacesConfigurationProvide
+ FacesServlet.CONFIG_FILES_ATTR
+ " context parameter of "
+ "the deployment descriptor. This will automatically be removed, "
- + "if we wouldn't do this, it would be loaded twice. See JSF spec 1.1, 10.3.2");
+ + "if we wouldn't do this, it would be loaded twice. See Faces spec 1.1, 10.3.2");
}
}
else
@@ -669,7 +669,7 @@ public class DefaultFacesConfigurationProvider extends FacesConfigurationProvide
else
{
// Zero lenght, if that so the flow definition must be implicitly derived.
- // See JSF 2.2 section 11.4.3.3
+ // See Faces 2.2 section 11.4.3.3
//
FacesConfigImpl facesConfig = new FacesConfigImpl();
FacesFlowDefinitionImpl flow = new FacesFlowDefinitionImpl();
diff --git a/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java b/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
index 8e36a58b3..b8a505fc5 100755
--- a/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
+++ b/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
@@ -407,7 +407,7 @@ public class FacesConfigurator
{
configure();
- // JSF 2.0 Publish PostConstructApplicationEvent after all configuration resources
+ // Faces 2.0 Publish PostConstructApplicationEvent after all configuration resources
// has been parsed and processed
FacesContext facesContext = getFacesContext();
Application application = facesContext.getApplication();
@@ -533,7 +533,7 @@ public class FacesConfigurator
+ FacesServlet.CONFIG_FILES_ATTR
+ " context parameter of "
+ "the deployment descriptor. This will automatically be removed, "
- + "if we wouldn't do this, it would be loaded twice. See JSF spec 1.1, 10.3.2");
+ + "if we wouldn't do this, it would be loaded twice. See Faces spec 1.1, 10.3.2");
}
}
else
@@ -781,7 +781,7 @@ public class FacesConfigurator
application.addBehavior(behavior.getBehaviorId(), behavior.getBehaviorClass());
}
- //JSF 2.2 set FlowHandler from factory.
+ //Faces 2.2 set FlowHandler from factory.
FlowHandlerFactory flowHandlerFactory = (FlowHandlerFactory)
FactoryFinder.getFactory(FactoryFinder.FLOW_HANDLER_FACTORY);
FlowHandler flowHandler = flowHandlerFactory.createFlowHandler(
@@ -967,7 +967,7 @@ public class FacesConfigurator
try
{
- // JSF 2.2 section 11.4.2.1 scan for available resource library contracts
+ // Faces 2.2 section 11.4.2.1 scan for available resource library contracts
// and store the result in a internal data structure, so it can be used
// later in ViewDeclarationLanguage.calculateResourceLibraryContracts(
// FacesContext context, String viewId)
@@ -986,7 +986,7 @@ public class FacesConfigurator
}
- // JSF 2.2 section 11.4.2.1 check all contracts are loaded
+ // Faces 2.2 section 11.4.2.1 check all contracts are loaded
if (log.isLoggable(Level.INFO))
{
for (List<String> list : runtimeConfig.getContractMappings().values())
@@ -1003,7 +1003,7 @@ public class FacesConfigurator
}
}
- // JSF 2.2 section 11.4.2.1 if no contractMappings set, all available contracts applies
+ // Faces 2.2 section 11.4.2.1 if no contractMappings set, all available contracts applies
// to all views.
if (runtimeConfig.getContractMappings().isEmpty())
{
diff --git a/impl/src/main/java/org/apache/myfaces/config/MyfacesConfig.java b/impl/src/main/java/org/apache/myfaces/config/MyfacesConfig.java
index 172da25e3..da9dcf757 100755
--- a/impl/src/main/java/org/apache/myfaces/config/MyfacesConfig.java
+++ b/impl/src/main/java/org/apache/myfaces/config/MyfacesConfig.java
@@ -43,8 +43,8 @@ import org.apache.myfaces.view.facelets.ELExpressionCacheMode;
* files and are needed by the core implementation.
*
* MyfacesConfig is meant for components that implement some of the extended features
- * of MyFaces. Anyhow, using the MyFaces JSF implementation is no precondition for using
- * MyfacesConfig in custom components. Upon using another JSF implementation
+ * of MyFaces. Anyhow, using the MyFaces Faces implementation is no precondition for using
+ * MyfacesConfig in custom components. Upon using another Faces implementation
* (or omitting the extended init parameters) all config properties will simply have
* their default values.
*/
@@ -66,16 +66,16 @@ public class MyfacesConfig
* Define if the input field that should store the state (jakarta.faces.ViewState) should render
* id="jakarta.faces.ViewState".
*
- * JSF API 1.2 defines a "jakarta.faces.ViewState" client parameter, that must be rendered as both the "name"
+ * Faces API 1.2 defines a "jakarta.faces.ViewState" client parameter, that must be rendered as both the "name"
* and the "id" attribute of the hidden input that is rendered for the purpose of state saving
* (see ResponseStateManager.VIEW_STATE_PARAM).
* Actually this causes duplicate id attributes and thus invalid XHTML pages when multiple forms are rendered on
* one page. With the org.apache.myfaces.RENDER_VIEWSTATE_ID context parameter you can tune this behaviour.
* <br/>Set it to
- * <ul><li>true - to render JSF 1.2 compliant id attributes (that might cause invalid XHTML), or</li>
+ * <ul><li>true - to render Faces 1.2 compliant id attributes (that might cause invalid XHTML), or</li>
* <li>false - to omit rendering of the id attribute (which is only needed for very special
* AJAX/Javascript components)</li></ul>
- * Default value is: true (for backwards compatibility and JSF 1.2 compliancy)
+ * Default value is: true (for backwards compatibility and Faces 1.2 compliancy)
*/
@JSFWebConfigParam(defaultValue="true", expectedValues="true, false, on, off, yes, no",since="1.1",
ignoreUpperLowerCase=true, group="state")
@@ -187,7 +187,7 @@ public class MyfacesConfig
/**
* Change default getType() behavior for composite component EL resolver, from return null
- * (see JSF 2_0 spec section 5_6_2_2) to
+ * (see Faces 2_0 spec section 5_6_2_2) to
* use the metadata information added by composite:attribute, ensuring components working with
* chained EL expressions to find the
* right type when a getType() is called over the source EL expression.
@@ -556,7 +556,7 @@ public class MyfacesConfig
* Define a custom comparator class used to sort the ELResolvers.
*
* <p>This is useful when it is necessary to put an ELResolver on top of other resolvers. Note set
- * this param override the default ordering described by JSF spec section 5.
+ * this param override the default ordering described by Faces spec section 5.
* </p>
*/
@JSFWebConfigParam(since = "1.2.10, 2.0.2", group="EL",
@@ -566,7 +566,7 @@ public class MyfacesConfig
@JSFWebConfigParam(since = "2.1.0", group="EL",
desc="The Class of an java.util.function.Predicate<ELResolver> implementation."
+ "If used and returns false for a ELResolver instance, such resolver will not be installed in "
- + "ELResolvers chain. Use with caution - can break functionality defined in JSF specification "
+ + "ELResolvers chain. Use with caution - can break functionality defined in Faces specification "
+ "'ELResolver Instances Provided by Faces'")
public static final String EL_RESOLVER_PREDICATE = "org.apache.myfaces.EL_RESOLVER_PREDICATE";
@@ -598,7 +598,7 @@ public class MyfacesConfig
private static final boolean VIEWID_DERIVE_CACHE_ENABLED_DEFAULT = true;
/**
- * Enforce f:validateBean to be called first before any JSF validator.
+ * Enforce f:validateBean to be called first before any Faces validator.
*/
@JSFWebConfigParam(defaultValue="false", expectedValues="true, false", since = "2.2.10", group="validation")
public final static String BEAN_BEFORE_JSF_VALIDATION
diff --git a/impl/src/main/java/org/apache/myfaces/config/RuntimeConfig.java b/impl/src/main/java/org/apache/myfaces/config/RuntimeConfig.java
index 712166757..ea9009c9f 100755
--- a/impl/src/main/java/org/apache/myfaces/config/RuntimeConfig.java
+++ b/impl/src/main/java/org/apache/myfaces/config/RuntimeConfig.java
@@ -86,7 +86,7 @@ public class RuntimeConfig
new HashMap<>();
/**
- * JSF 2.2 section 11.4.2.1.
+ * Faces 2.2 section 11.4.2.1.
*
* Scanning for all available contracts is necessary because the spec says
* "... if the information from the application configuration resources refers
diff --git a/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java b/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java
index de9b460cf..9055b91a7 100644
--- a/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java
@@ -286,9 +286,8 @@ public class DefaultAnnotationProvider extends AnnotationProvider
* <p>Return a list of classes to examine from the specified JAR archive.
* If this archive has no classes in it, a zero-length list is returned.</p>
*
- * @param context <code>ExternalContext</code> instance for
- * this application
* @param jar <code>JarFile</code> for the archive to be scanned
+ * @param list <code>List</code> list of classes
*
* @exception ClassNotFoundException if a located class cannot be loaded
*/
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java b/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java
index 37d4b21a4..2b4de7c1e 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java
@@ -32,7 +32,7 @@ import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
/**
- * SAX EntityResolver to provide JSF-specific resources (DTDs) for well-known identifiers.
+ * SAX EntityResolver to provide Faces-specific resources (DTDs) for well-known identifiers.
*
* @author Manfred Geiler (latest modification by $Author$)
* @author Thomas Spiegl
diff --git a/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigUnmarshallerImpl.java b/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigUnmarshallerImpl.java
index 84cd5d193..d40aec360 100755
--- a/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigUnmarshallerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigUnmarshallerImpl.java
@@ -211,7 +211,7 @@ public class FacesConfigUnmarshallerImpl implements FacesConfigUnmarshaller<Face
for (FacesFlowDefinition facesFlowDefinition : config.getFacesFlowDefinitions())
{
- // JSF 2.2 section 11.4.3.1 says this: "... Flows are defined using the
+ // Faces 2.2 section 11.4.3.1 says this: "... Flows are defined using the
// <flow-definition> element. This element must have an id attribute which uniquely
// identifies the flow within the scope of the Application Configuration Resource
// file in which the element appears. To enable multiple flows with the same id to
diff --git a/impl/src/main/java/org/apache/myfaces/context/AjaxExceptionHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/context/AjaxExceptionHandlerImpl.java
index 14975abcf..45c339217 100644
--- a/impl/src/main/java/org/apache/myfaces/context/AjaxExceptionHandlerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/AjaxExceptionHandlerImpl.java
@@ -42,7 +42,7 @@ import org.apache.myfaces.core.api.shared.lang.Assert;
/**
*
- * Specialized Ajax Handler, according to JSF 2.0 rev A section 13.3.7.
+ * Specialized Ajax Handler, according to Faces 2.0 rev A section 13.3.7.
*/
public class AjaxExceptionHandlerImpl extends ExceptionHandler
{
diff --git a/impl/src/main/java/org/apache/myfaces/context/flash/FlashImpl.java b/impl/src/main/java/org/apache/myfaces/context/flash/FlashImpl.java
index 0888e1b1f..24382fc44 100644
--- a/impl/src/main/java/org/apache/myfaces/context/flash/FlashImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/flash/FlashImpl.java
@@ -278,7 +278,7 @@ public class FlashImpl extends Flash implements ReleasableFlash
// is true and it should only be called by the NavigationHandler
// in a redirect case RIGHT BEFORE ExternalContext.redirect().
// Maybe a PreRedirectEvent issued by the ExternalContext would be a good
- // choice for JSF 2.1.
+ // choice for Faces 2.1.
FacesContext facesContext = FacesContext.getCurrentInstance();
ExternalContext externalContext = facesContext.getExternalContext();
@@ -1057,7 +1057,7 @@ public class FlashImpl extends Flash implements ReleasableFlash
if (!map.isEmpty())
{
- //JSF 2.2 invoke PreClearFlashEvent
+ //Faces 2.2 invoke PreClearFlashEvent
facesContext.getApplication().publishEvent(facesContext,
PreClearFlashEvent.class, map);
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImplBase.java b/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImplBase.java
index 9d55b6443..af1ec59be 100644
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImplBase.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImplBase.java
@@ -134,7 +134,7 @@ public abstract class FacesContextImplBase extends FacesContext
_cachedRenderKitId = null;
_separatorChar = null;
- // Spec JSF 2 section getAttributes when release is called the attributes map
+ // Spec Faces 2 section getAttributes when release is called the attributes map
// must!!! be cleared! (probably to trigger some clearance methods on possible
// added entries before nullifying everything)
if (_attributes != null)
@@ -255,7 +255,7 @@ public abstract class FacesContextImplBase extends FacesContext
*
* Also the map does not cause any events according to the spec!
*
- * @since JSF 2.0
+ * @since Faces 2.0
*
* @throws IllegalStateException
* if the current context already is released!
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java b/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
index e8711fe27..b66eda47a 100644
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
@@ -462,7 +462,7 @@ public class PartialViewContextImpl extends PartialViewContext
}
else
{
- // In JSF 2.3 it was added jakarta.faces.Resource as an update target to add scripts or
+ // In Faces 2.3 it was added jakarta.faces.Resource as an update target to add scripts or
// stylesheets inside <head> tag
List<UIComponent> updatedComponents = new ArrayList<>();
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java b/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
index d760937b5..8ed56c45d 100755
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
@@ -66,7 +66,7 @@ import org.apache.myfaces.core.api.shared.lang.SharedStringBuilder;
import org.apache.myfaces.util.lang.StringUtils;
/**
- * Implements the external context for servlet request. JSF 1.2, 6.1.3
+ * Implements the external context for servlet request. Faces 1.2, 6.1.3
*
* @author Manfred Geiler (latest modification by $Author$)
* @author Anton Koinov
@@ -226,7 +226,7 @@ public final class ServletExternalContextImpl extends ServletExternalContextImpl
}
/**
- * @since JSF 2.0
+ * @since Faces 2.0
*/
@Override
public Writer getResponseOutputWriter() throws IOException
@@ -654,7 +654,7 @@ public final class ServletExternalContextImpl extends ServletExternalContextImpl
}
/**
- * @since JSF 1.2
+ * @since Faces 1.2
* @param request
*/
@Override
@@ -673,7 +673,7 @@ public final class ServletExternalContextImpl extends ServletExternalContextImpl
}
/**
- * @since JSF 1.2
+ * @since Faces 1.2
* @param encoding
* @throws java.io.UnsupportedEncodingException
*/
@@ -686,7 +686,7 @@ public final class ServletExternalContextImpl extends ServletExternalContextImpl
}
/**
- * @since JSF 1.2
+ * @since Faces 1.2
*/
@Override
public String getRequestCharacterEncoding()
@@ -695,7 +695,7 @@ public final class ServletExternalContextImpl extends ServletExternalContextImpl
}
/**
- * @since JSF 1.2
+ * @since Faces 1.2
*/
@Override
public String getResponseCharacterEncoding()
@@ -704,7 +704,7 @@ public final class ServletExternalContextImpl extends ServletExternalContextImpl
}
/**
- * @since JSF 1.2
+ * @since Faces 1.2
* @param response
*/
@Override
@@ -724,7 +724,7 @@ public final class ServletExternalContextImpl extends ServletExternalContextImpl
}
/**
- * @since JSF 1.2
+ * @since Faces 1.2
* @param encoding
*/
@Override
@@ -802,7 +802,7 @@ public final class ServletExternalContextImpl extends ServletExternalContextImpl
}
/**
- * @since JSF 2.0
+ * @since Faces 2.0
*/
@Override
public void addResponseCookie(final String name,
diff --git a/impl/src/main/java/org/apache/myfaces/el/DefaultELResolverBuilder.java b/impl/src/main/java/org/apache/myfaces/el/DefaultELResolverBuilder.java
index e3c81085d..788dc95bb 100644
--- a/impl/src/main/java/org/apache/myfaces/el/DefaultELResolverBuilder.java
+++ b/impl/src/main/java/org/apache/myfaces/el/DefaultELResolverBuilder.java
@@ -93,7 +93,7 @@ public class DefaultELResolverBuilder extends ELResolverBuilder
// add the ELResolvers to a List first to be able to sort them
List<ELResolver> list = new ArrayList<>();
- // Add CDI ELResolver for JSF 2.3
+ // Add CDI ELResolver for Faces 2.3
if (isReplaceImplicitObjectResolverWithCDIResolver(facesContext))
{
list.add(ImplicitObjectResolver.makeResolverForCDI());
diff --git a/impl/src/main/java/org/apache/myfaces/el/FacesELContext.java b/impl/src/main/java/org/apache/myfaces/el/FacesELContext.java
index eb99ea5e3..6d2a3c4bc 100644
--- a/impl/src/main/java/org/apache/myfaces/el/FacesELContext.java
+++ b/impl/src/main/java/org/apache/myfaces/el/FacesELContext.java
@@ -29,7 +29,7 @@ import jakarta.el.VariableMapper;
import jakarta.faces.context.FacesContext;
/**
- * ELContext used for JSF.
+ * ELContext used for Faces.
*
* @author Stan Silvert
*/
diff --git a/impl/src/main/java/org/apache/myfaces/el/resolver/CompositeComponentELResolver.java b/impl/src/main/java/org/apache/myfaces/el/resolver/CompositeComponentELResolver.java
index 34a869304..38d6cd050 100644
--- a/impl/src/main/java/org/apache/myfaces/el/resolver/CompositeComponentELResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/resolver/CompositeComponentELResolver.java
@@ -41,7 +41,7 @@ import org.apache.myfaces.util.lang.StringUtils;
import org.apache.myfaces.view.facelets.tag.composite.CompositeComponentBeanInfo;
/**
- * Composite component attribute EL resolver. See JSF spec, section 5.6.2.2.
+ * Composite component attribute EL resolver. See Faces spec, section 5.6.2.2.
*/
public final class CompositeComponentELResolver extends ELResolver
@@ -94,7 +94,7 @@ public final class CompositeComponentELResolver extends ELResolver
if (!myfacesConfig.isStrictJsf2CCELResolver())
{
- // handle JSF 2.2 spec revisions:
+ // handle Faces 2.2 spec revisions:
// code resembles that found in Mojarra because it originates from
// the same contributor, whose ICLA is on file
Class<?> exprType = null;
diff --git a/impl/src/main/java/org/apache/myfaces/el/resolver/ImportHandlerResolver.java b/impl/src/main/java/org/apache/myfaces/el/resolver/ImportHandlerResolver.java
index da3caabfb..8e22c5c0f 100644
--- a/impl/src/main/java/org/apache/myfaces/el/resolver/ImportHandlerResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/resolver/ImportHandlerResolver.java
@@ -29,7 +29,7 @@ import jakarta.el.PropertyNotFoundException;
import org.apache.myfaces.util.lang.ClassUtils;
/**
- * See JSF 2.2 section 5.6.2.8
+ * See Faces 2.2 section 5.6.2.8
*/
public class ImportHandlerResolver extends ScopedAttributeResolver
{
diff --git a/impl/src/main/java/org/apache/myfaces/el/resolver/ResourceBundleResolver.java b/impl/src/main/java/org/apache/myfaces/el/resolver/ResourceBundleResolver.java
index 0f8e60887..d66d555b1 100644
--- a/impl/src/main/java/org/apache/myfaces/el/resolver/ResourceBundleResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/resolver/ResourceBundleResolver.java
@@ -34,7 +34,7 @@ import jakarta.faces.context.FacesContext;
import org.apache.myfaces.config.RuntimeConfig;
/**
- * See JSF 1.2 spec section 5.6.1.4
+ * See Faces 1.2 spec section 5.6.1.4
*
* @author Stan Silvert
*/
@@ -55,7 +55,7 @@ public final class ResourceBundleResolver extends ELResolver
public void setValue(final ELContext context, final Object base, final Object property, final Object value)
throws NullPointerException, PropertyNotFoundException, PropertyNotWritableException, ELException
{
- // JSF 2.0 spec section 5.6.1.4
+ // Faces 2.0 spec section 5.6.1.4
// "... If base is null and property is a String equal to the value of the
// <var> element of one of the <resource-bundle>'s in the application
// configuration resources throw jakarta.el.PropertyNotWriteable, since
diff --git a/impl/src/main/java/org/apache/myfaces/el/resolver/ResourceResolver.java b/impl/src/main/java/org/apache/myfaces/el/resolver/ResourceResolver.java
index 07301f4b0..c9ecf798d 100644
--- a/impl/src/main/java/org/apache/myfaces/el/resolver/ResourceResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/resolver/ResourceResolver.java
@@ -36,7 +36,7 @@ import org.apache.myfaces.resource.ResourceELUtils;
import org.apache.myfaces.view.facelets.el.CompositeComponentELUtils;
/**
- * See JSF 2.0 spec section 5.6.1.3 and 5.6.2.4
+ * See Faces 2.0 spec section 5.6.1.3 and 5.6.2.4
*
* @author Leonardo Uribe
*
@@ -126,7 +126,7 @@ public final class ResourceResolver extends ELResolver
}
else
{
- // JSF 2.2 "this" identifier can refer to a library or contract.
+ // Faces 2.2 "this" identifier can refer to a library or contract.
libraryName = ResourceELUtils.getResourceLibraryForResolver(facesContext);
contractName = ResourceELUtils.getResourceContractForResolver(facesContext);
}
diff --git a/impl/src/main/java/org/apache/myfaces/el/resolver/ScopedAttributeResolver.java b/impl/src/main/java/org/apache/myfaces/el/resolver/ScopedAttributeResolver.java
index 0c407bbce..a8711c4db 100644
--- a/impl/src/main/java/org/apache/myfaces/el/resolver/ScopedAttributeResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/resolver/ScopedAttributeResolver.java
@@ -35,7 +35,7 @@ import java.util.List;
import java.util.Map;
/**
- * See JSF 1.2 spec section 5.6.2.7
+ * See Faces 1.2 spec section 5.6.2.7
*
* @author Stan Silvert
*/
diff --git a/impl/src/main/java/org/apache/myfaces/el/resolver/implicitobject/FacesContextImplicitObject.java b/impl/src/main/java/org/apache/myfaces/el/resolver/implicitobject/FacesContextImplicitObject.java
index 4094e2014..3250a16dd 100644
--- a/impl/src/main/java/org/apache/myfaces/el/resolver/implicitobject/FacesContextImplicitObject.java
+++ b/impl/src/main/java/org/apache/myfaces/el/resolver/implicitobject/FacesContextImplicitObject.java
@@ -58,7 +58,7 @@ public class FacesContextImplicitObject extends ImplicitObject
@Override
public FeatureDescriptor getDescriptor()
{
- return makeDescriptor(NAME, "Per-request information for a JSF request", FacesContext.class);
+ return makeDescriptor(NAME, "Per-request information for a Faces request", FacesContext.class);
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/el/resolver/implicitobject/ImplicitObjectResolver.java b/impl/src/main/java/org/apache/myfaces/el/resolver/implicitobject/ImplicitObjectResolver.java
index 777a31553..877894578 100644
--- a/impl/src/main/java/org/apache/myfaces/el/resolver/implicitobject/ImplicitObjectResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/resolver/implicitobject/ImplicitObjectResolver.java
@@ -30,7 +30,7 @@ import java.util.Iterator;
import java.util.Map;
/**
- * See JSF 1.2 spec sections 5.6.1.1 and 5.6.2.1
+ * See Faces 1.2 spec sections 5.6.1.1 and 5.6.2.1
*
* @author Stan Silvert
*/
@@ -39,7 +39,8 @@ public class ImplicitObjectResolver extends ELResolver
private Map<String, ImplicitObject> implicitObjects;
/**
- * Static factory for an ELResolver for resolving implicit objects in all of Faces. See JSF 1.2 spec section 5.6.1.2
+ * Static factory for an ELResolver for resolving implicit objects in all of Faces.
+ * See Faces 1.2 spec section 5.6.1.2
*/
public static ELResolver makeResolver()
{
diff --git a/impl/src/main/java/org/apache/myfaces/el/resolver/implicitobject/ViewImplicitObject.java b/impl/src/main/java/org/apache/myfaces/el/resolver/implicitobject/ViewImplicitObject.java
index 1a9200f2f..4f99324dd 100644
--- a/impl/src/main/java/org/apache/myfaces/el/resolver/implicitobject/ViewImplicitObject.java
+++ b/impl/src/main/java/org/apache/myfaces/el/resolver/implicitobject/ViewImplicitObject.java
@@ -58,7 +58,7 @@ public class ViewImplicitObject extends ImplicitObject
@Override
public FeatureDescriptor getDescriptor()
{
- return makeDescriptor(NAME, "The root object of a JSF component tree", UIViewRoot.class);
+ return makeDescriptor(NAME, "The root object of a Faces component tree", UIViewRoot.class);
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/ApplyRequestValuesExecutor.java b/impl/src/main/java/org/apache/myfaces/lifecycle/ApplyRequestValuesExecutor.java
index 32c41d70a..db60d4a09 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/ApplyRequestValuesExecutor.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/ApplyRequestValuesExecutor.java
@@ -23,7 +23,7 @@ import jakarta.faces.event.PhaseId;
import org.apache.myfaces.view.facelets.ViewPoolProcessor;
/**
- * Implements the apply request values phase (JSF Spec 2.2.2)
+ * Implements the apply request values phase (Faces Spec 2.2.2)
*
* @author Nikolay Petrov (latest modification by $Author$)
* @version $Revision$ $Date$
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/InvokeApplicationExecutor.java b/impl/src/main/java/org/apache/myfaces/lifecycle/InvokeApplicationExecutor.java
index fbccd3fae..7219a14dd 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/InvokeApplicationExecutor.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/InvokeApplicationExecutor.java
@@ -23,7 +23,7 @@ import jakarta.faces.event.PhaseId;
import org.apache.myfaces.view.facelets.ViewPoolProcessor;
/**
- * Implements the invoke application phase (JSF Spec 2.2.5)
+ * Implements the invoke application phase (Faces Spec 2.2.5)
*
* @author Nikolay Petrov (latest modification by $Author$)
* @version $Revision$ $Date$
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java b/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
index 61d3af631..c7efa136e 100755
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
@@ -177,7 +177,7 @@ public class LifecycleImpl extends Lifecycle
catch (Throwable e)
{
- // JSF 2.0: publish the executor's exception (if any).
+ // Faces 2.0: publish the executor's exception (if any).
publishException (e, currentPhaseId, context);
}
@@ -243,7 +243,7 @@ public class LifecycleImpl extends Lifecycle
catch (Throwable e)
{
- // JSF 2.0: publish the executor's exception (if any).
+ // Faces 2.0: publish the executor's exception (if any).
publishException (e, renderExecutor.getPhase(), facesContext);
}
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseListenerManager.java b/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseListenerManager.java
index c91cbf323..15ae0190e 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseListenerManager.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseListenerManager.java
@@ -30,8 +30,8 @@ import jakarta.faces.event.PhaseListener;
import jakarta.faces.lifecycle.Lifecycle;
/**
- * This class encapsulates the logic used to call PhaseListeners. It was needed because of issue 9 of the JSF 1.2 spec.
- * See section 11.3 for more details.
+ * This class encapsulates the logic used to call PhaseListeners. It was needed because of issue 9 of the Faces 1.2
+ * spec. See section 11.3 for more details.
*
* @author Stan Silvert
*/
@@ -82,7 +82,7 @@ class PhaseListenerManager
{
beforePhaseSuccess[i] = false; // redundant - for clarity
- // JSF 2.0: publish exceptions instead of logging them.
+ // Faces 2.0: publish exceptions instead of logging them.
publishException (e, phaseId, ExceptionQueuedEventContext.IN_BEFORE_PHASE_KEY);
@@ -119,7 +119,7 @@ class PhaseListenerManager
}
catch (Throwable e)
{
- // JSF 2.0: publish exceptions instead of logging them.
+ // Faces 2.0: publish exceptions instead of logging them.
publishException(e, phaseId, ExceptionQueuedEventContext.IN_AFTER_PHASE_KEY);
}
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/ProcessValidationsExecutor.java b/impl/src/main/java/org/apache/myfaces/lifecycle/ProcessValidationsExecutor.java
index cc0d261ff..ab5b57425 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/ProcessValidationsExecutor.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/ProcessValidationsExecutor.java
@@ -22,7 +22,7 @@ import jakarta.faces.context.FacesContext;
import jakarta.faces.event.PhaseId;
/**
- * Implements the process validations phase (JSF Spec 2.2.3)
+ * Implements the process validations phase (Faces Spec 2.2.3)
*
* @author Nikolay Petrov (latest modification by $Author$)
* @version $Revision$ $Date$
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/RenderResponseExecutor.java b/impl/src/main/java/org/apache/myfaces/lifecycle/RenderResponseExecutor.java
index c7dd1a4fe..4c2a5e134 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/RenderResponseExecutor.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/RenderResponseExecutor.java
@@ -39,7 +39,7 @@ import jakarta.faces.view.ViewDeclarationLanguage;
import org.apache.myfaces.config.MyfacesConfig;
/**
- * Implements the render response phase (JSF Spec 2.2.6)
+ * Implements the render response phase (Faces Spec 2.2.6)
*
* @author Nikolay Petrov (latest modification by $Author$)
* @version $Revision$ $Date$
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java b/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java
index deb26aa3b..46c3e7402 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java
@@ -57,10 +57,10 @@ import org.apache.myfaces.config.MyfacesConfig;
import org.apache.myfaces.util.ExternalContextUtils;
/**
- * Implements the Restore View Phase (JSF Spec 2.2.1)
+ * Implements the Restore View Phase (Faces Spec 2.2.1)
*
* @author Nikolay Petrov (latest modification by $Author$)
- * @author Bruno Aranda (JSF 1.2)
+ * @author Bruno Aranda (Faces 1.2)
* @version $Revision$ $Date$
*/
class RestoreViewExecutor extends PhaseExecutor
@@ -437,7 +437,7 @@ class RestoreViewExecutor extends PhaseExecutor
{
// Origin Header match and
// STRICT_JSF_2_ORIGIN_HEADER_APP_PATH property is set to false (default)
- // Because we don't want to strictly follow JSF 2.x spec
+ // Because we don't want to strictly follow Faces 2.x spec
}
else
{
@@ -513,7 +513,7 @@ class RestoreViewExecutor extends PhaseExecutor
* Note: In this phase it is not possible to invoke the beforePhase method, because we
* first have to restore the view to get its attributes. Also it is not really possible
* to call the afterPhase method inside of UIViewRoot for this phase, thus it was decided
- * in the JSF 2.0 spec rev A to put this here.
+ * in the Faces 2.0 spec rev A to put this here.
* @param facesContext
*/
private void _invokeViewRootAfterPhaseListener(FacesContext facesContext)
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewSupport.java b/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewSupport.java
index 97fa69249..979768f2f 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewSupport.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewSupport.java
@@ -52,12 +52,12 @@ public class RestoreViewSupport
public void processComponentBinding(FacesContext facesContext, UIComponent component)
{
- // JSF 2.0: Old hack related to t:aliasBean was fixed defining a event that traverse
+ // Faces 2.0: Old hack related to t:aliasBean was fixed defining a event that traverse
// whole tree and let components to override UIComponent.processEvent() method to include it.
- // Remove this hack SKIP_ITERATION_HINT and use VisitHints.SKIP_ITERATION in JSF 2.1 only
+ // Remove this hack SKIP_ITERATION_HINT and use VisitHints.SKIP_ITERATION in Faces 2.1 only
// is not possible, because jsf 2.0 API-based libraries can use the String
- // hint, JSF21-based libraries can use both.
+ // hint, Faces21-based libraries can use both.
try
{
facesContext.getAttributes().put(MyFacesVisitHints.SKIP_ITERATION_HINT, Boolean.TRUE);
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/UpdateModelValuesExecutor.java b/impl/src/main/java/org/apache/myfaces/lifecycle/UpdateModelValuesExecutor.java
index 4ee80f9a2..0edab95a6 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/UpdateModelValuesExecutor.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/UpdateModelValuesExecutor.java
@@ -22,7 +22,7 @@ import jakarta.faces.context.FacesContext;
import jakarta.faces.event.PhaseId;
/**
- * Implements the update model values phase (JSF Spec 2.2.4)
+ * Implements the update model values phase (Faces Spec 2.2.4)
*
* @author Nikolay Petrov (latest modification by $Author$)
* @version $Revision$ $Date$
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/WindowContextConfig.java b/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/WindowContextConfig.java
index b24cc789c..4b1ca303a 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/WindowContextConfig.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/WindowContextConfig.java
@@ -42,7 +42,7 @@ public class WindowContextConfig
/**
* Allows to restrict window-ids.
- * <p>With the default window handler (esp. for JSF 1.2), URLs have to contain the window-id.
+ * <p>With the default window handler (esp. for Faces 1.2), URLs have to contain the window-id.
* If users bookmark these links, they could open 2-n tabs (with the bookmark) which have the same window-id.
* It is only possible to prevent it if the ClientSideWindowHandler is used.
* </p>
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/RenderKitFactoryImpl.java b/impl/src/main/java/org/apache/myfaces/renderkit/RenderKitFactoryImpl.java
index 133a6338b..99836eb86 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/RenderKitFactoryImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/RenderKitFactoryImpl.java
@@ -31,7 +31,7 @@ import jakarta.faces.render.RenderKitFactory;
import org.apache.myfaces.core.api.shared.lang.Assert;
/**
- * RenderKitFactory implementation as defined in Spec. JSF.7.3
+ * RenderKitFactory implementation as defined in Spec. Faces.7.3
*
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
@@ -76,7 +76,7 @@ public class RenderKitFactoryImpl extends RenderKitFactory
if (renderkit == null)
{
// throw new IllegalArgumentException("Unknown RenderKit '" + renderKitId + "'.");
- // JSF Spec API Doc says:
+ // Faces Spec API Doc says:
// "If there is no registered RenderKit for the specified identifier, return null"
// vs "IllegalArgumentException - if no RenderKit instance can be returned for the specified identifier"
// First sentence is more precise, so we just log a warning
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/RendererUtils.java b/impl/src/main/java/org/apache/myfaces/renderkit/RendererUtils.java
index c70181299..af24372f3 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/RendererUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/RendererUtils.java
@@ -333,7 +333,7 @@ public final class RendererUtils
}
/**
- * See JSF Spec. 8.5 Table 8-1
+ * See Faces Spec. 8.5 Table 8-1
* @param value
* @return boolean
*/
@@ -868,7 +868,7 @@ public final class RendererUtils
final UIComponent component, final String attributeName)
{
- // JSF 2.0: if "name" attribute is available, treat as a resource reference.
+ // Faces 2.0: if "name" attribute is available, treat as a resource reference.
final Map<String, Object> attributes = component.getAttributes();
final String resourceName = (String) attributes.get(ComponentAttrs.NAME_ATTR);
if (resourceName != null && (resourceName.length() > 0))
@@ -941,7 +941,7 @@ public final class RendererUtils
return null;
}
- // With JSF 2.0 url for resources can be done with EL like #{resource['resourcename']}
+ // With Faces 2.0 url for resources can be done with EL like #{resource['resourcename']}
// and such EL after evalution contains context path for the current web application already,
// -> we dont want call viewHandler.getResourceURL()
if (uri.contains(ResourceHandler.RESOURCE_IDENTIFIER))
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
index c422607f1..4e9438724 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
@@ -189,7 +189,7 @@ public class HtmlRenderKitImpl extends RenderKit implements LazyRenderKit
}
/**
- * @since JSF 2.0
+ * @since Faces 2.0
*/
@Override
public Iterator<String> getComponentFamilies()
@@ -199,7 +199,7 @@ public class HtmlRenderKitImpl extends RenderKit implements LazyRenderKit
}
/**
- * @since JSF 2.0
+ * @since Faces 2.0
*/
@Override
public Iterator<String> getRendererTypes(String componentFamily)
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
index 16d7a00fa..ba6ecdbcd 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
@@ -125,7 +125,7 @@ public class HtmlResponseStateManager extends MyfacesResponseStateManager
if (myfacesConfig.isRenderViewStateId())
{
// responseWriter.writeAttribute(HTML.ID_ATTR, STANDARD_STATE_SAVING_PARAM, null);
- // JSF 2.2 if jakarta.faces.ViewState is used as the id, in portlet
+ // Faces 2.2 if jakarta.faces.ViewState is used as the id, in portlet
// case it will be duplicate ids and that not xml friendly.
responseWriter.writeAttribute(HTML.ID_ATTR,
HtmlResponseStateManager.generateUpdateViewStateId(facesContext),
@@ -271,7 +271,7 @@ public class HtmlResponseStateManager extends MyfacesResponseStateManager
public static String generateUpdateClientWindowId(FacesContext facesContext)
{
- // JSF 2.2 section 2.2.6.1 Partial State Rendering
+ // Faces 2.2 section 2.2.6.1 Partial State Rendering
// According to the javascript doc of faces.ajax.response,
//
// The new syntax looks like this:
@@ -303,7 +303,7 @@ public class HtmlResponseStateManager extends MyfacesResponseStateManager
public static String generateUpdateViewStateId(FacesContext facesContext)
{
- // JSF 2.2 section 2.2.6.1 Partial State Rendering
+ // Faces 2.2 section 2.2.6.1 Partial State Rendering
// According to the javascript doc of faces.ajax.response,
//
// The new syntax looks like this:
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImpl.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImpl.java
index 3b1c4a0b2..fe1ef0bbc 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImpl.java
@@ -425,7 +425,7 @@ public class HtmlResponseWriterImpl extends ResponseWriter
value = ((ValueExpression)value).getValue(getFacesContext().getELContext());
}
// encodeAndWriteURIAttribute(key, value, key);
- // JSF 2.2 In the renderkit javadoc of jsf 2.2 spec says this
+ // Faces 2.2 In the renderkit javadoc of jsf 2.2 spec says this
// (Rendering Pass Through Attributes):
// "... The ResponseWriter must ensure that any pass through attributes are
// rendered on the outer-most markup element for the component. If there is
@@ -769,7 +769,7 @@ public class HtmlResponseWriterImpl extends ResponseWriter
throw new IllegalStateException("Must be called before the start element is closed (attribute '"
+ name + "')");
}
- // From JSF 2.2 RenderKit javadoc: "... If there is a pass through attribute with the same
+ // From Faces 2.2 RenderKit javadoc: "... If there is a pass through attribute with the same
// name as a renderer specific attribute, the pass through attribute takes precedence. ..."
if (_passThroughAttributesMap != null && _passThroughAttributesMap.containsKey(name))
{
@@ -823,7 +823,7 @@ public class HtmlResponseWriterImpl extends ResponseWriter
throw new IllegalStateException("Must be called before the start element is closed (attribute '"
+ name + "')");
}
- // From JSF 2.2 RenderKit javadoc: "... If there is a pass through attribute with the same
+ // From Faces 2.2 RenderKit javadoc: "... If there is a pass through attribute with the same
// name as a renderer specific attribute, the pass through attribute takes precedence. ..."
if (_passThroughAttributesMap != null && _passThroughAttributesMap.containsKey(name))
{
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlButtonRendererBase.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlButtonRendererBase.java
index ff52361e1..22f7e4d18 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlButtonRendererBase.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlButtonRendererBase.java
@@ -120,7 +120,7 @@ public class HtmlButtonRendererBase extends HtmlRenderer
ResponseWriter writer = facesContext.getResponseWriter();
- // commandButton does not need to be nested in a form since JSF 2.0
+ // commandButton does not need to be nested in a form since Faces 2.0
UIForm form = ComponentUtils.findClosest(UIForm.class, uiComponent);
boolean reset = isReset(uiComponent);
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlGridRendererBase.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlGridRendererBase.java
index 336ac1d64..133752393 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlGridRendererBase.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlGridRendererBase.java
@@ -290,7 +290,7 @@ public class HtmlGridRendererBase extends HtmlRenderer
if(bodyrowsAttr != null && !bodyrowsAttr.isEmpty())
{
String[] bodyrowsString = StringUtils.trim(StringUtils.splitShortString(bodyrowsAttr, ','));
- // parsing with no exception handling, because of JSF-spec:
+ // parsing with no exception handling, because of Faces-spec:
// "If present, this must be a comma separated list of integers."
bodyrows = new Integer[bodyrowsString.length];
for(int i = 0; i < bodyrowsString.length; i++)
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlLinkRendererBase.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlLinkRendererBase.java
index aab1e939b..c962e4c9e 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlLinkRendererBase.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlLinkRendererBase.java
@@ -427,7 +427,7 @@ public abstract class HtmlLinkRendererBase extends HtmlRenderer
HtmlRendererUtils.renderHTMLAttribute(writer, HTML.STYLE_CLASS_ATTR, HTML.STYLE_CLASS_ATTR, styleClass);
}
- // render value as required by JSF 1.1 renderkitdocs
+ // render value as required by Faces 1.1 renderkitdocs
if(value != null)
{
writer.writeText(value.toString(), ComponentAttrs.VALUE_ATTR);
@@ -436,7 +436,7 @@ public abstract class HtmlLinkRendererBase extends HtmlRenderer
// render warning message for a h:commandLink with no nesting form
if (form == null)
{
- writer.writeText(": This link is deactivated, because it is not embedded in a JSF form.", null);
+ writer.writeText(": This link is deactivated, because it is not embedded in a Faces form.", null);
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlSecretRendererBase.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlSecretRendererBase.java
index 128c24844..2534be768 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlSecretRendererBase.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlSecretRendererBase.java
@@ -42,7 +42,7 @@ import org.apache.myfaces.renderkit.html.util.HTML;
import org.apache.myfaces.renderkit.html.util.ComponentAttrs;
/**
- * see Spec.1.0 EA - JSF.7.6.4 Renderer Types for UIInput Components
+ * see Spec.1.0 EA - Faces.7.6.4 Renderer Types for UIInput Components
*/
public class HtmlSecretRendererBase extends HtmlRenderer
{
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlSelectableRendererBase.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlSelectableRendererBase.java
index d022f00cf..125bc2858 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlSelectableRendererBase.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlSelectableRendererBase.java
@@ -94,7 +94,7 @@ public class HtmlSelectableRendererBase extends HtmlRenderer
{
CommonHtmlAttributesUtil.renderChangeEventProperty(writer, commonPropertiesMarked, uiComponent);
CommonHtmlAttributesUtil.renderEventProperties(writer, commonPropertiesMarked, uiComponent);
- // Note that on JSF 2.3, selectable components don't need onselect attribute
+ // Note that on Faces 2.3, selectable components don't need onselect attribute
// Please see https://issues.apache.org/jira/browse/MYFACES-4190
CommonHtmlAttributesUtil.renderFieldEventPropertiesWithoutOnchangeAndOnselect(writer,
commonPropertiesMarked, uiComponent);
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlTableRendererBase.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlTableRendererBase.java
index eab5df426..91a6610c8 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlTableRendererBase.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlTableRendererBase.java
@@ -46,7 +46,7 @@ import org.apache.myfaces.renderkit.html.util.ComponentAttrs;
/**
* Common methods for renderers for components that subclass the standard
- * JSF HtmlDataTable component.
+ * Faces HtmlDataTable component.
*/
public class HtmlTableRendererBase extends HtmlRenderer
{
@@ -325,7 +325,7 @@ public class HtmlTableRendererBase extends HtmlRenderer
if (bodyrowsAttr != null && !bodyrowsAttr.isEmpty())
{
String[] bodyrowsString = StringUtils.trim(StringUtils.splitShortString(bodyrowsAttr, ','));
- // parsing with no exception handling, because of JSF-spec:
+ // parsing with no exception handling, because of Faces-spec:
// "If present, this must be a comma separated list of integers."
bodyrows = new Integer[bodyrowsString.length];
for(int i = 0; i < bodyrowsString.length; i++)
@@ -1239,7 +1239,7 @@ public class HtmlTableRendererBase extends HtmlRenderer
{
if (uiComponent instanceof UIColumn)
{
- // allow column to override style class, new in JSF 1.2
+ // allow column to override style class, new in Faces 1.2
if (uiComponent instanceof HtmlColumn)
{
HtmlColumn column = (HtmlColumn)uiComponent;
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/util/ComponentAttrs.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/util/ComponentAttrs.java
index d35d8c703..e836c6724 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/util/ComponentAttrs.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/util/ComponentAttrs.java
@@ -22,7 +22,7 @@ import jakarta.faces.event.ActionListener;
/**
- * Constant declarations for JSF tags
+ * Constant declarations for Faces tags
*/
public interface ComponentAttrs
{
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/util/HtmlRendererUtils.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/util/HtmlRendererUtils.java
index 64aa64d97..8beca683d 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/util/HtmlRendererUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/util/HtmlRendererUtils.java
@@ -633,9 +633,9 @@ public final class HtmlRendererUtils
boolean escape = AttributeUtils.getBooleanAttribute(component, ComponentAttrs.ESCAPE_ATTR, false);
//default is to escape
- //In JSF 1.2, when a SelectItem is created by default
+ //In Faces 1.2, when a SelectItem is created by default
//selectItem.isEscape() returns true (this property
- //is not available on JSF 1.1).
+ //is not available on Faces 1.1).
//so, if we found a escape property on the component
//set to true, escape every item, but if not
//check if isEscape() = true first.
@@ -663,7 +663,7 @@ public final class HtmlRendererUtils
{
if (!RendererUtils.isDefaultAttributeValue(value))
{
- // render JSF "styleClass" and "itemStyleClass" attributes as "class"
+ // render Faces "styleClass" and "itemStyleClass" attributes as "class"
String htmlAttrName = attrName.equals(HTML.STYLE_CLASS_ATTR) ? HTML.CLASS_ATTR : attrName;
writer.writeAttribute(htmlAttrName, value, componentProperty);
return true;
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/util/SelectItemsUtils.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/util/SelectItemsUtils.java
index a95d4d43f..f34a2e5ac 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/util/SelectItemsUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/util/SelectItemsUtils.java
@@ -169,9 +169,9 @@ public class SelectItemsUtils
boolean escape = AttributeUtils.getBooleanAttribute(component, ComponentAttrs.ESCAPE_ATTR, false);
//default is to escape
- //In JSF 1.2, when a SelectItem is created by default
+ //In Faces 1.2, when a SelectItem is created by default
//selectItem.isEscape() returns true (this property
- //is not available on JSF 1.1).
+ //is not available on Faces 1.1).
//so, if we found a escape property on the component
//set to true, escape every item, but if not
//check if isEscape() = true first.
diff --git a/impl/src/main/java/org/apache/myfaces/spi/AnnotationProvider.java b/impl/src/main/java/org/apache/myfaces/spi/AnnotationProvider.java
index b2c121294..49bf403ef 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/AnnotationProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/AnnotationProvider.java
@@ -67,7 +67,7 @@ public abstract class AnnotationProvider implements FacesWrapper<AnnotationProvi
/**
* Retrieve a map containing the classes that contains annotations used by jsf implementation at
* startup.
- * <p>The default implementation must comply with JSF 2.0 spec section 11.5.1 Requirements for scanning of
+ * <p>The default implementation must comply with Faces 2.0 spec section 11.5.1 Requirements for scanning of
* classes for annotations.
* </p>
* <p>This method could call getBaseUrls() to obtain a list of URL that could be used to indicate jar files of
@@ -84,7 +84,7 @@ public abstract class AnnotationProvider implements FacesWrapper<AnnotationProvi
/**
* <p>The returned Set<URL> urls are calculated in this way
- * ( see JSF 2.0 spec section 11.4.2 for definitions )
+ * ( see Faces 2.0 spec section 11.4.2 for definitions )
* </p>
* <ol>
* <li>All resources that match either "META-INF/faces-config.xml" or end with ".facesconfig.xml" directly in
diff --git a/impl/src/main/java/org/apache/myfaces/spi/FacesConfigurationMerger.java b/impl/src/main/java/org/apache/myfaces/spi/FacesConfigurationMerger.java
index bba700a7d..6d6f6b0e0 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/FacesConfigurationMerger.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/FacesConfigurationMerger.java
@@ -25,7 +25,7 @@ import jakarta.faces.context.ExternalContext;
/**
* SPI that uses the FacesConfigurationProvider-SPI to get all FacesConfig data
* and then it combines it into one FacesConfigData instance. For this merging
- * process the ordering and sorting rules of the JSF spec must be applied.
+ * process the ordering and sorting rules of the Faces spec must be applied.
*
* With this SPI it is possible to store the result of the complex ordering and
* sorting algorithm in order to skip it if no configuration changes are applied
diff --git a/impl/src/main/java/org/apache/myfaces/spi/FacesConfigurationProvider.java b/impl/src/main/java/org/apache/myfaces/spi/FacesConfigurationProvider.java
index 482e1c4f0..5b0ea6fb7 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/FacesConfigurationProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/FacesConfigurationProvider.java
@@ -25,7 +25,7 @@ import jakarta.faces.context.ExternalContext;
import org.apache.myfaces.config.element.FacesConfig;
/**
- * This interface provide a way to merge and store all JSF config information retrieved
+ * This interface provide a way to merge and store all Faces config information retrieved
* from faces-config files, META-INF/service files and annotations that works as base
* point to initialize MyFaces. The objective is allow server containers to "store" or
* this information, preventing calculate it over and over each time the web application
@@ -50,7 +50,8 @@ public abstract class FacesConfigurationProvider
public abstract FacesConfig getStandardFacesConfig(ExternalContext ectx);
/**
- * Return the FacesConfig object model retrieved from locate all JSF factories from META-INF/services/[factory_key].
+ * Return the FacesConfig object model retrieved from locate all Faces factories from
+ * META-INF/services/[factory_key].
*
* The default implementation uses ServiceProviderFinder facilities to locate this SPI interfaces.
*
@@ -95,7 +96,7 @@ public abstract class FacesConfigurationProvider
/**
* Return the FacesConfig object model retrieved from a folder with a faces flow definition
- * See JSF 2.2 section 11.4.3.3 and section 7.5.1
+ * See Faces 2.2 section 11.4.3.3 and section 7.5.1
*
* @param ectx
* @return
diff --git a/impl/src/main/java/org/apache/myfaces/spi/FactoryFinderProviderFactory.java b/impl/src/main/java/org/apache/myfaces/spi/FactoryFinderProviderFactory.java
index f22214938..966e99d7f 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/FactoryFinderProviderFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/FactoryFinderProviderFactory.java
@@ -44,10 +44,10 @@ import org.apache.myfaces.util.lang.ClassUtils;
* corresponding implementation class is searched for based on the following
* algorithm...."</p>
*
- * <p>In few words, this class allows to find JSF factory classes. The necessary
+ * <p>In few words, this class allows to find Faces factory classes. The necessary
* information to create factory instances is loaded on initialization time,
* but which locations contains such information (for more information see
- * JSF 2.0 spec section 11.4.2) (here the only interest is in jsf factories
+ * Faces 2.0 spec section 11.4.2) (here the only interest is in jsf factories
* initialization information) ?</p>
*
* <ul>
diff --git a/impl/src/main/java/org/apache/myfaces/spi/InjectionProvider.java b/impl/src/main/java/org/apache/myfaces/spi/InjectionProvider.java
index d4dd961ce..c2f120c9f 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/InjectionProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/InjectionProvider.java
@@ -19,8 +19,8 @@
package org.apache.myfaces.spi;
/**
- * Provide an interface to inject JSF artifacts using JavaEE annotations
- * as described in JSF 2.2 spec section 5.4
+ * Provide an interface to inject Faces artifacts using JavaEE annotations
+ * as described in Faces 2.2 spec section 5.4
*
* @author Leonardo Uribe
*/
diff --git a/impl/src/main/java/org/apache/myfaces/spi/ResourceLibraryContractsProvider.java b/impl/src/main/java/org/apache/myfaces/spi/ResourceLibraryContractsProvider.java
index 261da2cc8..0be2c8286 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/ResourceLibraryContractsProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/ResourceLibraryContractsProvider.java
@@ -25,7 +25,7 @@ import jakarta.faces.context.ExternalContext;
/**
* Locate resource library contracts, implementing the behavior described in
- * JSF 2.2 section 11.4.2.1 related to discover the available resource library
+ * Faces 2.2 section 11.4.2.1 related to discover the available resource library
* contracts.
*
* @since 2.0.2
diff --git a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationMergerFactory.java b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationMergerFactory.java
index f9c7e0d2a..0d9f16be3 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationMergerFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationMergerFactory.java
@@ -93,7 +93,7 @@ public class DefaultFacesConfigurationMergerFactory extends FacesConfigurationMe
InvocationTargetException,
PrivilegedActionException
{
- // get all fitting SPI implementations (no need to cache this since it's only called once per JSF-app)
+ // get all fitting SPI implementations (no need to cache this since it's only called once per Faces-app)
List<String> classList = ServiceProviderFinderFactory.getServiceProviderFinder(externalContext)
.getServiceProviderList(FACES_CONFIGURATION_MERGER);
diff --git a/impl/src/main/java/org/apache/myfaces/util/ExternalContextUtils.java b/impl/src/main/java/org/apache/myfaces/util/ExternalContextUtils.java
index 9abb075ed..d37cf756a 100644
--- a/impl/src/main/java/org/apache/myfaces/util/ExternalContextUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/util/ExternalContextUtils.java
@@ -29,10 +29,10 @@ import jakarta.servlet.http.HttpServletResponse;
/**
* This provides some functionality for determining some things about the
- * native request object that is not provided by JSF. This class is useful
+ * native request object that is not provided by Faces. This class is useful
* for use in places where Portlet API's may or may not be present and can
* also provide access to some request-specific items which are not available on
- * the JSF ExternalContext. If portlet API's are not present, this class simply
+ * the Faces ExternalContext. If portlet API's are not present, this class simply
* handles the Servlet Request type.
*/
public final class ExternalContextUtils
diff --git a/impl/src/main/java/org/apache/myfaces/view/HttpServletResponseSwitch.java b/impl/src/main/java/org/apache/myfaces/view/HttpServletResponseSwitch.java
index 1024b1eef..c09a92b14 100644
--- a/impl/src/main/java/org/apache/myfaces/view/HttpServletResponseSwitch.java
+++ b/impl/src/main/java/org/apache/myfaces/view/HttpServletResponseSwitch.java
@@ -28,7 +28,7 @@ import jakarta.servlet.http.HttpServletResponseWrapper;
/**
* Implementation of a switching response wrapper to turn
- * output on and off according to the JSF spec 2.0.
+ * output on and off according to the Faces spec 2.0.
* <p>
* Implemented as HttpServletResponseWrapper,
* so that the switching does not interfere with methods that
diff --git a/impl/src/main/java/org/apache/myfaces/view/ServletResponseSwitch.java b/impl/src/main/java/org/apache/myfaces/view/ServletResponseSwitch.java
index 3d0bbb201..434742a73 100644
--- a/impl/src/main/java/org/apache/myfaces/view/ServletResponseSwitch.java
+++ b/impl/src/main/java/org/apache/myfaces/view/ServletResponseSwitch.java
@@ -27,7 +27,7 @@ import jakarta.servlet.ServletResponseWrapper;
/**
* Implementation of a switching response wrapper to turn
- * output on and off according to the JSF spec 2.0.
+ * output on and off according to the Faces spec 2.0.
* <p>
* Fall-back implementation of HttpServletResponseSwitch
* for non HttpServletResponses.</p>
diff --git a/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageBase.java b/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageBase.java
index b30e75698..36341dcb0 100644
--- a/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageBase.java
+++ b/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageBase.java
@@ -182,7 +182,7 @@ public abstract class ViewDeclarationLanguageBase extends ViewDeclarationLanguag
/**
* Send a source not found to the client. Although it can be considered ok in JSP mode,
* I think it's pretty lame to have this kind of requirement at VDL level considering VDL
- * represents the page --> JSF tree link, not the transport layer required to send a
+ * represents the page --> Faces tree link, not the transport layer required to send a
* SC_NOT_FOUND.
*
* @param context le current FacesContext
diff --git a/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java b/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java
index 6959967c3..3a11866e1 100644
--- a/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java
@@ -27,7 +27,7 @@ import jakarta.faces.view.ViewDeclarationLanguageFactory;
import org.apache.myfaces.view.facelets.FaceletViewDeclarationLanguageStrategy;
/**
- * This is the default VDL factory used as of JSF 2.0, it tries to use Facelet VDL whenever possible.
+ * This is the default VDL factory used as of Faces 2.0, it tries to use Facelet VDL whenever possible.
*
* @author Simon Lessard (latest modification by $Author$)
* @version $Revision$ $Date$
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
index c051bb054..5b6bfb93f 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
@@ -1736,7 +1736,7 @@ public class FaceletViewDeclarationLanguage extends FaceletViewDeclarationLangua
// should that be handled? Or
// is this optimization simply so minor that it should just
// be trimmed altogether?
- // See JSF 2.0 spec section 2.2.6, buildView is called before
+ // See Faces 2.0 spec section 2.2.6, buildView is called before
// Render Response
//if (!isFilledView(context, view))
//{
@@ -1958,7 +1958,7 @@ public class FaceletViewDeclarationLanguage extends FaceletViewDeclarationLangua
List<String> contracts = vdl.calculateResourceLibraryContracts(context, viewId);
context.setResourceLibraryContracts(contracts);
- // JSF 2.2 stateless views
+ // Faces 2.2 stateless views
// We need to check if the incoming view is stateless or not and if that so rebuild it here
// note we cannot do this in PartialStateManagementStrategy because it is only used
// when PSS is enabled, but stateless views can be used without PSS. If the view is stateless,
@@ -2103,11 +2103,11 @@ public class FaceletViewDeclarationLanguage extends FaceletViewDeclarationLangua
String encoding = (String) context.getAttributes().get(PARAM_ENCODING);
// -= Leonardo Uribe =- Add */* to the contentType is a fix done from FaceletViewHandler
- // to make old RI versions work, but since this is for JSF 2.0 it is not necessary that code.
+ // to make old RI versions work, but since this is for Faces 2.0 it is not necessary that code.
ResponseWriter writer = renderKit.createResponseWriter(FaceletsVDLUtils.NullWriter.INSTANCE,
contentType, encoding);
- // Override the JSF provided content type if necessary
+ // Override the Faces provided content type if necessary
contentType = getResponseContentType(context, writer.getContentType());
encoding = getResponseEncoding(context, writer.getCharacterEncoding());
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletsVDLUtils.java b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletsVDLUtils.java
index fc354f4a4..629cff32b 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletsVDLUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletsVDLUtils.java
@@ -28,7 +28,7 @@ import java.util.Comparator;
public class FaceletsVDLUtils
{
/**
- * As specified in JSF 2.2 section 11.4.2.1, note it is different from the
+ * As specified in Faces 2.2 section 11.4.2.1, note it is different from the
* allowed format in xml url-pattern type.
*
* @param path
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/PartialStateManagementStrategy.java b/impl/src/main/java/org/apache/myfaces/view/facelets/PartialStateManagementStrategy.java
index 50538c736..3a5334302 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/PartialStateManagementStrategy.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/PartialStateManagementStrategy.java
@@ -224,7 +224,7 @@ public class PartialStateManagementStrategy extends StateManagementStrategy
boolean skipBuildView = false;
if (state[1] != null)
{
- // Since JSF 2.2, UIViewRoot.restoreViewScopeState() must be called, but
+ // Since Faces 2.2, UIViewRoot.restoreViewScopeState() must be called, but
// to get the state of the root, it is necessary to force calculate the
// id from this location. Remember in this point, PSS is enabled, so the
// code match with the assigment done in
@@ -983,7 +983,7 @@ public class PartialStateManagementStrategy extends StateManagementStrategy
ComponentState componentAddedAfterBuildView
= (ComponentState) target.getAttributes().get(COMPONENT_ADDED_AFTER_BUILD_VIEW);
- //Note if UIViewRoot has this marker, JSF 1.2 like state saving is used.
+ //Note if UIViewRoot has this marker, Faces 1.2 like state saving is used.
if (componentAddedAfterBuildView != null && (target.getParent() != null))
{
if (ComponentState.REMOVE_ADD.equals(componentAddedAfterBuildView))
@@ -1211,7 +1211,7 @@ public class PartialStateManagementStrategy extends StateManagementStrategy
ComponentState componentAddedAfterBuildView
= (ComponentState) target.getAttributes().get(COMPONENT_ADDED_AFTER_BUILD_VIEW);
- //Note if UIViewRoot has this marker, JSF 1.2 like state saving is used.
+ //Note if UIViewRoot has this marker, Faces 1.2 like state saving is used.
if (componentAddedAfterBuildView != null && (target.getParent() != null))
{
//Set this view as not resetable.
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java
index 0d9d9e45b..97031b711 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java
@@ -513,7 +513,7 @@ final class CompilationManager
{
if (log.isLoggable(Level.FINE))
{
- log.fine(attr + " JSF Facelet Compile Directive Found");
+ log.fine(attr + " Faces Facelet Compile Directive Found");
}
String value = attr.getValue();
String namespace;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java
index f6747a664..2b549511d 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java
@@ -120,7 +120,7 @@ public abstract class Compiler
new TagDecorator[this.decorators.size()])));
}
- // JSF 2.2 has always enabled the default tag decorator.
+ // Faces 2.2 has always enabled the default tag decorator.
return new BaseTagDecorator(new DefaultTagDecorator());
}
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/pool/ViewPool.java b/impl/src/main/java/org/apache/myfaces/view/facelets/pool/ViewPool.java
index 47cebf4c8..6297bd850 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/pool/ViewPool.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/pool/ViewPool.java
@@ -28,7 +28,7 @@ import org.apache.myfaces.view.facelets.tag.faces.FaceletState;
* order to be used by MyFaces.
*
* <p>A View Pool is a set of initialized views that are kept ready to use. The idea
- * is reset and reuse views taking advantage of existing JSF 2.0 Partial State
+ * is reset and reuse views taking advantage of existing Faces 2.0 Partial State
* Saving algorithm with some small additions to component's saveState() method.
* </p>
* <p>This technique works by these reasons:
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagHandlerUtils.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagHandlerUtils.java
index 99b4fd7fe..20e07a96c 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagHandlerUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagHandlerUtils.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import jakarta.faces.view.facelets.FaceletHandler;
/**
- * This class was created to gather some code from latest Facelets not existing in latest JSF 2.0 spec.
+ * This class was created to gather some code from latest Facelets not existing in latest Faces 2.0 spec.
* Also, since it was created on the fly while converting, it's highly possible that methods in this class
* should be moved in a more logical location and/or removed.
*
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java
index af6f6804e..b21ff02ab 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java
@@ -179,7 +179,7 @@ public class CompositeComponentResourceTagHandler extends ComponentHandler
{
FaceletCompositionContext mctx = FaceletCompositionContext.getCurrentInstance(ctx);
- // Since JSF 2.2, there are two cases here:
+ // Since Faces 2.2, there are two cases here:
//
// 1. The composite component content is defined as facelet content like usual.
// 2. The composite component content will be defined programatically. That means,
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ActionSourceRule.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ActionSourceRule.java
index 28bfc7e6a..ceed1f411 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ActionSourceRule.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ActionSourceRule.java
@@ -103,7 +103,7 @@ public final class ActionSourceRule extends MetaRule
@Override
public void applyMetadata(FaceletContext ctx, Object instance)
{
- // From JSF 2.0 it is possible to have actionListener method without ActionEvent parameter.
+ // From Faces 2.0 it is possible to have actionListener method without ActionEvent parameter.
// It seems that MethodExpressionActionListener from API contains support for it but there is one big
// problem - one-arg constructor will not preserve the current VariableMapper.
// This is a problem when using facelets and <ui:decorate/> with EL params (see MYFACES-2541 for details).
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ComponentSupport.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ComponentSupport.java
index b8e0a32d0..9c70de7c3 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ComponentSupport.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ComponentSupport.java
@@ -344,7 +344,7 @@ public final class ComponentSupport
}
/**
- * According to JSF 1.2 tag specs, this helper method will use the TagAttribute passed in determining the Locale
+ * According to Faces 1.2 tag specs, this helper method will use the TagAttribute passed in determining the Locale
* intended.
*
* @param ctx
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ComponentTagHandlerDelegate.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ComponentTagHandlerDelegate.java
index 5ef44848e..6dca153a1 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ComponentTagHandlerDelegate.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ComponentTagHandlerDelegate.java
@@ -71,7 +71,7 @@ import org.apache.myfaces.view.facelets.tag.faces.core.FacetHandler;
/**
*
- * Implementation of the tag logic used in the JSF specification.
+ * Implementation of the tag logic used in the Faces specification.
*
* See org.apache.myfaces.view.facelets.tag.faces.ComponentHandler
* @author Leonardo Uribe (latest modification by $Author$)
@@ -165,7 +165,7 @@ public class ComponentTagHandlerDelegate extends TagHandlerDelegate
}
/**
- * Method handles UIComponent tree creation in accordance with the JSF 1.2 spec.
+ * Method handles UIComponent tree creation in accordance with the Faces 1.2 spec.
* <ol>
* <li>First determines this UIComponent's id by calling {@link #getId(FaceletContext) getId(FaceletContext)}.</li>
* <li>Search the parent for an existing UIComponent of the id we just grabbed</li>
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/EditableValueHolderRule.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/EditableValueHolderRule.java
index ac40ba6f4..2d0f2e022 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/EditableValueHolderRule.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/EditableValueHolderRule.java
@@ -70,7 +70,7 @@ public final class EditableValueHolderRule extends MetaRule
@Override
public void applyMetadata(FaceletContext ctx, Object instance)
{
- // From JSF 2.0 it is possible to have valueChangeListener method without ValueChangeEvent parameter.
+ // From Faces 2.0 it is possible to have valueChangeListener method without ValueChangeEvent parameter.
// It seems that MethodExpressionValueChangeListener from API contains support for it but there is one big
// problem - one-arg constructor will not preserve the current VariableMapper.
// This is a problem when using facelets and <ui:decorate/> with EL params (see MYFACES-2541 for details).
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/core/CoreLibrary.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/core/CoreLibrary.java
index 0de77b9d6..40ec06374 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/core/CoreLibrary.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/core/CoreLibrary.java
@@ -38,7 +38,7 @@ import org.apache.myfaces.component.validate.ValidateWholeBeanComponent;
import org.apache.myfaces.view.facelets.tag.AbstractTagLibrary;
/**
- * For Tag details, see JSF Core <a target="_new"
+ * 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>.
*
* @author Jacob Hookom
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/html/DefaultTagDecorator.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/html/DefaultTagDecorator.java
index bf15ecd5b..a65383680 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/html/DefaultTagDecorator.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/html/DefaultTagDecorator.java
@@ -32,7 +32,7 @@ import org.apache.myfaces.view.facelets.tag.faces.PassThroughLibrary;
import org.apache.myfaces.view.facelets.tag.faces.core.CoreLibrary;
/**
- * Default implementation of TagDecorator as described in JSF 2.2 javadoc of
+ * Default implementation of TagDecorator as described in Faces 2.2 javadoc of
* jakarta.faces.view.facelets.TagDecorator
*
* @since 2.2
@@ -302,7 +302,7 @@ public class DefaultTagDecorator implements TagDecorator
{
// should not happen, but let it because org.xml.sax.Attributes considers it
// -= Leonardo Uribe =- after conversation with Frank Caputo, who was the main contributor for
- // this feature in JSF 2.2, he said that if the namespace is empty the intention is pass the
+ // this feature in Faces 2.2, he said that if the namespace is empty the intention is pass the
// attribute to the passthrough attribute map, so there is an error in the spec documentation.
//convertedTagAttributes[j] = tagAttribute;
@@ -317,7 +317,7 @@ public class DefaultTagDecorator implements TagDecorator
// "... If the current attribute's namespace is empty
// let the current attribute be convertedTagAttribute. ..."
// -= Leonardo Uribe =- after conversation with Frank Caputo, who was the main contributor for
- // this feature in JSF 2.2, he said that if the namespace is empty the intention is pass the
+ // this feature in Faces 2.2, he said that if the namespace is empty the intention is pass the
// attribute to the passthrough attribute map, so there is an error in the spec documentation.
//convertedTagAttributes[j] = tagAttribute;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/JstlCoreLibrary.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/JstlCoreLibrary.java
index fb0925b20..ac4d1a105 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/JstlCoreLibrary.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/JstlCoreLibrary.java
@@ -30,9 +30,9 @@ public final class JstlCoreLibrary extends AbstractTagLibrary
public final static String JCP_NAMESPACE = "http://xmlns.jcp.org/jsp/jstl/core";
public final static String SUN_NAMESPACE = "http://java.sun.com/jsp/jstl/core";
- // This namespace was used in the early stages of JSF 2.0 development, but later
+ // This namespace was used in the early stages of Faces 2.0 development, but later
// it was fixed to use the same syntax for jsp. But some applications still
- // uses the old syntax and it is too hard to fix them, so in JSF 2.2 it was
+ // uses the old syntax and it is too hard to fix them, so in Faces 2.2 it was
// decided to add this namespace as an alternative synonym.
public final static String ALTERNATIVE_NAMESPACE = "http://java.sun.com/jstl/core";
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/LegacyJstlCoreLibrary.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/LegacyJstlCoreLibrary.java
index b499471bb..552f77240 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/LegacyJstlCoreLibrary.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/LegacyJstlCoreLibrary.java
@@ -35,9 +35,9 @@ public final class LegacyJstlCoreLibrary extends AbstractTagLibrary
public final static String JCP_NAMESPACE = "http://xmlns.jcp.org/jsp/jstl/core";
public final static String SUN_NAMESPACE = "http://java.sun.com/jsp/jstl/core";
- // This namespace was used in the early stages of JSF 2.0 development, but later
+ // This namespace was used in the early stages of Faces 2.0 development, but later
// it was fixed to use the same syntax for jsp. But some applications still
- // uses the old syntax and it is too hard to fix them, so in JSF 2.2 it was
+ // uses the old syntax and it is too hard to fix them, so in Faces 2.2 it was
// decided to add this namespace as an alternative synonym.
public final static String ALTERNATIVE_NAMESPACE = "http://java.sun.com/jstl/core";
diff --git a/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerImpl.java b/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerImpl.java
index 6470c86ce..3752d2b34 100644
--- a/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerImpl.java
@@ -99,7 +99,7 @@ public class FacesInitializerImpl implements FacesInitializer
private static final byte FACES_INIT_PHASE_POSTDESTROY = 3;
/**
- * Performs all necessary initialization tasks like configuring this JSF
+ * Performs all necessary initialization tasks like configuring this Faces
* application.
*
* @param servletContext The current {@link ServletContext}
@@ -129,7 +129,7 @@ public class FacesInitializerImpl implements FacesInitializer
// by using an ExternalContext. However, that's no problem as long as no
// one tries to call methods depending on either the ServletRequest or
// the ServletResponse.
- // JSF 2.0: FacesInitializer now has some new methods to
+ // Faces 2.0: FacesInitializer now has some new methods to
// use proper startup FacesContext and ExternalContext instances.
FacesContext facesContext = initStartupFacesContext(servletContext);
ExternalContext externalContext = facesContext.getExternalContext();
@@ -369,7 +369,7 @@ public class FacesInitializerImpl implements FacesInitializer
}
/**
- * Configures this JSF application. It's required that every
+ * Configures this Faces application. It's required that every
* FacesInitializer (i.e. every subclass) calls this method during
* initialization.
*
diff --git a/impl/src/main/java/org/apache/myfaces/webapp/MyFacesContainerInitializer.java b/impl/src/main/java/org/apache/myfaces/webapp/MyFacesContainerInitializer.java
index 2e0e9efd4..5bbc8978a 100644
--- a/impl/src/main/java/org/apache/myfaces/webapp/MyFacesContainerInitializer.java
+++ b/impl/src/main/java/org/apache/myfaces/webapp/MyFacesContainerInitializer.java
@@ -60,8 +60,8 @@ import org.apache.myfaces.util.lang.ClassUtils;
/**
* This class is called by any Java EE 6 complaint container at startup.
- * It checks if the current webapp is a JSF-webapp by checking if some of
- * the JSF related annotations are specified in the webapp classpath or if
+ * It checks if the current webapp is a Faces-webapp by checking if some of
+ * the Faces related annotations are specified in the webapp classpath or if
* the faces-config.xml file is present. If so, the listener checks if
* the FacesServlet has already been defined in web.xml and if not, it adds
* the FacesServlet with the mappings (/faces/*, *.jsf, *.faces) dynamically.
@@ -158,7 +158,7 @@ public class MyFacesContainerInitializer implements ServletContainerInitializer
// the FacesServlet is not installed yet - install it
ServletRegistration.Dynamic servlet = servletContext.addServlet(FACES_SERVLET_NAME, FACES_SERVLET_CLASS);
- //try to add typical JSF mappings
+ //try to add typical Faces mappings
String[] mappings = isAutomaticXhtmlMappingDisabled(servletContext) ?
FACES_SERVLET_MAPPINGS : FACES_SERVLET_FULL_MAPPINGS;
Set<String> conflictMappings = servlet.addMapping(mappings);
diff --git a/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionListener.java b/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionListener.java
index 13f7217fa..aa9c9a656 100644
--- a/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionListener.java
+++ b/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionListener.java
@@ -43,7 +43,7 @@ public class MyFacesHttpSessionListener implements HttpSessionListener
@Override
public void sessionDestroyed(HttpSessionEvent event)
{
- // If we don't propagate this event, CDI will do for us but outside JSF control
+ // If we don't propagate this event, CDI will do for us but outside Faces control
// so when @PreDestroy methods are called there will not be an active FacesContext.
// The trick here is ensure clean the affected scopes to avoid duplicates.
// Remember cdi session scope is different from jsf session scope, because in
diff --git a/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java b/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java
index af222dd47..d2fd94951 100755
--- a/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java
+++ b/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java
@@ -24,7 +24,7 @@ import jakarta.servlet.ServletContextListener;
/**
* Initialise the MyFaces system.
* <p>
- * This context listener is registered by the JSP TLD file for the standard JSF "f" components. Normally, servlet
+ * This context listener is registered by the JSP TLD file for the standard Faces "f" components. Normally, servlet
* containers will automatically load and process .tld files at startup time, and therefore register and run this class
* automatically.
* </p><p>
diff --git a/impl/src/test/java/jakarta/faces/application/FacesMessageTest.java b/impl/src/test/java/jakarta/faces/application/FacesMessageTest.java
index 680db6352..3b6aa47be 100644
--- a/impl/src/test/java/jakarta/faces/application/FacesMessageTest.java
+++ b/impl/src/test/java/jakarta/faces/application/FacesMessageTest.java
@@ -184,7 +184,7 @@ public class FacesMessageTest extends TestCase
public void testSeverityValues()
{
- // JSF spec requires this list to be sorted by ordinal
+ // Faces spec requires this list to be sorted by ordinal
for (int i = 0, sz = FacesMessage.VALUES.size(); i < sz; i++)
{
FacesMessage.Severity severity = (Severity) FacesMessage.VALUES.get(i);
diff --git a/impl/src/test/java/jakarta/faces/component/UIOutputPSSTest.java b/impl/src/test/java/jakarta/faces/component/UIOutputPSSTest.java
index 9f76a8c33..2229314e5 100644
--- a/impl/src/test/java/jakarta/faces/component/UIOutputPSSTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UIOutputPSSTest.java
@@ -386,7 +386,7 @@ public class UIOutputPSSTest extends AbstractJsfTestCase
Object state1 = output.saveState(facesContext);
// Transient means no state, but the effect is the converter dissapear
- // (because is transient, and in JSF 1.2/1.1 that was the effect).
+ // (because is transient, and in Faces 1.2/1.1 that was the effect).
Assert.assertNotNull(state1);
UIOutput output2 = new UIOutput();
@@ -412,7 +412,7 @@ public class UIOutputPSSTest extends AbstractJsfTestCase
Object state1 = output.saveState(facesContext);
// Transient means no state, but the effect is the converter dissapear
- // (because is transient, and in JSF 1.2/1.1 that was the effect).
+ // (because is transient, and in Faces 1.2/1.1 that was the effect).
Assert.assertNotNull(state1);
UIOutput output2 = new UIOutput();
diff --git a/impl/src/test/java/jakarta/faces/event/MethodExpressionActionListenerTest.java b/impl/src/test/java/jakarta/faces/event/MethodExpressionActionListenerTest.java
index 36adb1945..61b89cf24 100644
--- a/impl/src/test/java/jakarta/faces/event/MethodExpressionActionListenerTest.java
+++ b/impl/src/test/java/jakarta/faces/event/MethodExpressionActionListenerTest.java
@@ -90,7 +90,7 @@ public class MethodExpressionActionListenerTest extends AbstractJsfTestCase
}
/**
- * Test for case: method with ActionEvent param exists (pre-JSF 2.0 case)
+ * Test for case: method with ActionEvent param exists (pre-Faces 2.0 case)
*/
public void testProcessAction()
{
@@ -107,7 +107,7 @@ public class MethodExpressionActionListenerTest extends AbstractJsfTestCase
}
/**
- * Test for case: method exists but has no ActionEvent param (new possibility in JSF 2.0)
+ * Test for case: method exists but has no ActionEvent param (new possibility in Faces 2.0)
*/
public void testProcessAction2() throws Exception
{
diff --git a/impl/src/test/java/jakarta/faces/event/MethodExpressionValueChangeListenerTest.java b/impl/src/test/java/jakarta/faces/event/MethodExpressionValueChangeListenerTest.java
index 015a1b261..d5e372c3a 100644
--- a/impl/src/test/java/jakarta/faces/event/MethodExpressionValueChangeListenerTest.java
+++ b/impl/src/test/java/jakarta/faces/event/MethodExpressionValueChangeListenerTest.java
@@ -88,7 +88,7 @@ public class MethodExpressionValueChangeListenerTest extends AbstractJsfTestCase
}
/**
- * Test for case: method with ValueChangeEvent param exists (pre-JSF 2.0 case)
+ * Test for case: method with ValueChangeEvent param exists (pre-Faces 2.0 case)
*/
public void testProcessValueChange()
{
@@ -105,7 +105,7 @@ public class MethodExpressionValueChangeListenerTest extends AbstractJsfTestCase
}
/**
- * Test for case: method exists but has no ValueChangeEvent param (new possibility in JSF 2.0)
+ * Test for case: method exists but has no ValueChangeEvent param (new possibility in Faces 2.0)
*/
public void testProcessValueChange2() throws Exception
{
diff --git a/impl/src/test/java/org/apache/myfaces/context/flash/FlashImplTest.java b/impl/src/test/java/org/apache/myfaces/context/flash/FlashImplTest.java
index e3ed4e5b9..3359ae997 100644
--- a/impl/src/test/java/org/apache/myfaces/context/flash/FlashImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/context/flash/FlashImplTest.java
@@ -116,7 +116,7 @@ public class FlashImplTest extends AbstractJsfTestCase
@Test
public void testKeepValueNormalPostback() throws Exception
{
- // simulate JSF lifecycle:
+ // simulate Faces lifecycle:
// note that doPrePhaseActions() only performs tasks on RESTORE_VIEW
// and doPostPhaseActions() only on the last phase.
@@ -125,11 +125,11 @@ public class FlashImplTest extends AbstractJsfTestCase
// this request is a normal GET request, and thus not a postback
((MockFacesContext20) facesContext).setPostback(false);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RENDER_RESPONSE);
_flash.doPostPhaseActions(facesContext);
@@ -141,18 +141,18 @@ public class FlashImplTest extends AbstractJsfTestCase
// this request should be a postback
((MockFacesContext20) facesContext).setPostback(true);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.INVOKE_APPLICATION);
// put the value in the scope an keep() it!
_flash.putNow("flashkey", "flashvalue");
_flash.keep("flashkey");
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RENDER_RESPONSE);
_flash.doPostPhaseActions(facesContext);
@@ -164,11 +164,11 @@ public class FlashImplTest extends AbstractJsfTestCase
// this request should be a postback
((MockFacesContext20) facesContext).setPostback(true);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.INVOKE_APPLICATION);
// _flash.get() will ask the execute FlashMap for the value
@@ -176,7 +176,7 @@ public class FlashImplTest extends AbstractJsfTestCase
// thus it must contain the value from the previous request.
Assert.assertEquals("flashvalue", _flash.get("flashkey"));
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RENDER_RESPONSE);
_flash.doPostPhaseActions(facesContext);
@@ -201,7 +201,7 @@ public class FlashImplTest extends AbstractJsfTestCase
@Test
public void testKeepValuePostRedirectGet() throws Exception
{
- // simulate JSF lifecycle:
+ // simulate Faces lifecycle:
// note that doPrePhaseActions() only performs tasks on RESTORE_VIEW
// and doPostPhaseActions() only on the last phase.
@@ -210,11 +210,11 @@ public class FlashImplTest extends AbstractJsfTestCase
// this request is a normal GET request, and thus not a postback
((MockFacesContext20) facesContext).setPostback(false);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RENDER_RESPONSE);
_flash.doPostPhaseActions(facesContext);
@@ -226,11 +226,11 @@ public class FlashImplTest extends AbstractJsfTestCase
// this request should be a postback
((MockFacesContext20) facesContext).setPostback(true);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.INVOKE_APPLICATION);
// put the value in the scope an keep() it!
@@ -255,7 +255,7 @@ public class FlashImplTest extends AbstractJsfTestCase
// this request is not a postback
((MockFacesContext20) facesContext).setPostback(false);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
// Note that doPrePhaseActions() is called on RESTORE_VIEW even
// though this request is not a postback.
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
@@ -267,7 +267,7 @@ public class FlashImplTest extends AbstractJsfTestCase
+ " thus isRedirect() must be true.",
_flash.isRedirect());
- // simulate JSF lifecycle - JSF will immediately jump to phase 6
+ // simulate Faces lifecycle - Faces will immediately jump to phase 6
facesContext.setCurrentPhaseId(PhaseId.RENDER_RESPONSE);
// check isRedirect();
@@ -290,11 +290,11 @@ public class FlashImplTest extends AbstractJsfTestCase
// this request should be a postback
((MockFacesContext20) facesContext).setPostback(true);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.INVOKE_APPLICATION);
// check isRedirect();
@@ -309,7 +309,7 @@ public class FlashImplTest extends AbstractJsfTestCase
// and not on the previous request's render FlashMap.
Assert.assertNull(_flash.get("flashkey"));
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RENDER_RESPONSE);
_flash.doPostPhaseActions(facesContext);
@@ -329,7 +329,7 @@ public class FlashImplTest extends AbstractJsfTestCase
@Test
public void testKeepMessagesNormalPostback() throws Exception
{
- // simulate JSF lifecycle:
+ // simulate Faces lifecycle:
// note that doPrePhaseActions() only performs tasks on RESTORE_VIEW
// and doPostPhaseActions() only on the last phase.
@@ -338,11 +338,11 @@ public class FlashImplTest extends AbstractJsfTestCase
// this request is a normal GET request, and thus not a postback
((MockFacesContext20) facesContext).setPostback(false);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RENDER_RESPONSE);
_flash.doPostPhaseActions(facesContext);
@@ -354,11 +354,11 @@ public class FlashImplTest extends AbstractJsfTestCase
// this request should be a postback
((MockFacesContext20) facesContext).setPostback(true);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.INVOKE_APPLICATION);
// add FacesMessages to the facesContext
@@ -376,7 +376,7 @@ public class FlashImplTest extends AbstractJsfTestCase
Assert.assertTrue("setKeepMessages(true) was just called, thus isKeepMessages() "
+ "must be true.", _flash.isKeepMessages());
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RENDER_RESPONSE);
_flash.doPostPhaseActions(facesContext);
@@ -391,7 +391,7 @@ public class FlashImplTest extends AbstractJsfTestCase
// now the FacesContext must contain 0 messages (new request, new FacesContext)
Assert.assertEquals(0, facesContext.getMessageList().size());
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
@@ -403,7 +403,7 @@ public class FlashImplTest extends AbstractJsfTestCase
Assert.assertFalse("setKeepMessages(true) was not called on this request, thus "
+ "isKeepMessages() must be false.", _flash.isKeepMessages());
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RENDER_RESPONSE);
_flash.doPostPhaseActions(facesContext);
@@ -418,7 +418,7 @@ public class FlashImplTest extends AbstractJsfTestCase
// now the FacesContext must contain 0 messages (new request, new FacesContext)
Assert.assertEquals(0, facesContext.getMessageList().size());
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
@@ -426,7 +426,7 @@ public class FlashImplTest extends AbstractJsfTestCase
// was not called on the previous request
Assert.assertEquals(0, facesContext.getMessageList().size());
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RENDER_RESPONSE);
_flash.doPostPhaseActions(facesContext);
}
@@ -440,7 +440,7 @@ public class FlashImplTest extends AbstractJsfTestCase
@Test
public void testKeepMessagesPostRedirectGet() throws Exception
{
- // simulate JSF lifecycle:
+ // simulate Faces lifecycle:
// note that doPrePhaseActions() only performs tasks on RESTORE_VIEW
// and doPostPhaseActions() only on the last phase.
@@ -449,11 +449,11 @@ public class FlashImplTest extends AbstractJsfTestCase
// this request is a normal GET request, and thus not a postback
((MockFacesContext20) facesContext).setPostback(false);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RENDER_RESPONSE);
_flash.doPostPhaseActions(facesContext);
@@ -465,11 +465,11 @@ public class FlashImplTest extends AbstractJsfTestCase
// this request should be a postback
((MockFacesContext20) facesContext).setPostback(true);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.INVOKE_APPLICATION);
// add FacesMessages to the facesContext
@@ -507,13 +507,13 @@ public class FlashImplTest extends AbstractJsfTestCase
// now the FacesContext must contain 0 messages (new request, new FacesContext)
Assert.assertEquals(0, facesContext.getMessageList().size());
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
// Note that doPrePhaseActions() is called on RESTORE_VIEW even
// though this request is not a postback.
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
- // simulate JSF lifecycle - JSF will immediately jump to phase 6
+ // simulate Faces lifecycle - Faces will immediately jump to phase 6
facesContext.setCurrentPhaseId(PhaseId.RENDER_RESPONSE);
// now the messages must be here again
@@ -538,18 +538,18 @@ public class FlashImplTest extends AbstractJsfTestCase
// now the FacesContext must contain 0 messages (new request, new FacesContext)
Assert.assertEquals(0, facesContext.getMessageList().size());
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.INVOKE_APPLICATION);
// now the FacesContext must contain 0 messages, because
// setKeepMessages(true) was not called on the GET-request
Assert.assertEquals(0, facesContext.getMessageList().size());
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RENDER_RESPONSE);
_flash.doPostPhaseActions(facesContext);
}
@@ -563,7 +563,7 @@ public class FlashImplTest extends AbstractJsfTestCase
@Test
public void testKeepMessagesPostRedirectGetTwoTimes() throws Exception
{
- // simulate JSF lifecycle:
+ // simulate Faces lifecycle:
// note that doPrePhaseActions() only performs tasks on RESTORE_VIEW
// and doPostPhaseActions() only on the last phase.
@@ -572,11 +572,11 @@ public class FlashImplTest extends AbstractJsfTestCase
// this request is a normal GET request, and thus not a postback
((MockFacesContext20) facesContext).setPostback(false);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RENDER_RESPONSE);
_flash.doPostPhaseActions(facesContext);
@@ -588,11 +588,11 @@ public class FlashImplTest extends AbstractJsfTestCase
// this request should be a postback
((MockFacesContext20) facesContext).setPostback(true);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.INVOKE_APPLICATION);
// add FacesMessages to the facesContext
@@ -631,13 +631,13 @@ public class FlashImplTest extends AbstractJsfTestCase
// now the FacesContext must contain 0 messages (new request, new FacesContext)
Assert.assertEquals(0, facesContext.getMessageList().size());
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
// Note that doPrePhaseActions() is called on RESTORE_VIEW even
// though this request is not a postback.
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
- // simulate JSF lifecycle - JSF will immediately jump to phase 6
+ // simulate Faces lifecycle - Faces will immediately jump to phase 6
facesContext.setCurrentPhaseId(PhaseId.RENDER_RESPONSE);
// now the messages must be here again
@@ -669,11 +669,11 @@ public class FlashImplTest extends AbstractJsfTestCase
// now the FacesContext must contain 0 messages (new request, new FacesContext)
Assert.assertEquals(0, facesContext.getMessageList().size());
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.INVOKE_APPLICATION);
// now the messages must be here again
@@ -681,7 +681,7 @@ public class FlashImplTest extends AbstractJsfTestCase
Assert.assertEquals(Arrays.asList(messageClientId), facesContext.getMessageList("clientId"));
Assert.assertEquals(Arrays.asList(messageNoClientId), facesContext.getMessageList(null));
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RENDER_RESPONSE);
_flash.doPostPhaseActions(facesContext);
@@ -696,18 +696,18 @@ public class FlashImplTest extends AbstractJsfTestCase
// now the FacesContext must contain 0 messages (new request, new FacesContext)
Assert.assertEquals(0, facesContext.getMessageList().size());
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.INVOKE_APPLICATION);
// now the FacesContext must contain 0 messages, because
// setKeepMessages(true) was not called on the previous postback
Assert.assertEquals(0, facesContext.getMessageList().size());
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RENDER_RESPONSE);
_flash.doPostPhaseActions(facesContext);
}
@@ -769,7 +769,7 @@ public class FlashImplTest extends AbstractJsfTestCase
@Test
public void testKeep() throws Exception
{
- // simulate JSF lifecycle:
+ // simulate Faces lifecycle:
// note that doPrePhaseActions() only performs tasks on RESTORE_VIEW
// and doPostPhaseActions() only on the last phase.
@@ -778,11 +778,11 @@ public class FlashImplTest extends AbstractJsfTestCase
// this request is a normal GET request, and thus not a postback
((MockFacesContext20) facesContext).setPostback(false);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RENDER_RESPONSE);
_flash.doPostPhaseActions(facesContext);
@@ -794,11 +794,11 @@ public class FlashImplTest extends AbstractJsfTestCase
// this request should be a postback
((MockFacesContext20) facesContext).setPostback(true);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.INVOKE_APPLICATION);
// put a value into the request FlashMap
@@ -807,7 +807,7 @@ public class FlashImplTest extends AbstractJsfTestCase
// and keep() it
_flash.keep("flashkey");
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RENDER_RESPONSE);
// cleanup flash
@@ -821,17 +821,17 @@ public class FlashImplTest extends AbstractJsfTestCase
// this request should be a postback
((MockFacesContext20) facesContext).setPostback(true);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.INVOKE_APPLICATION);
// the value must be in the executeMap
Assert.assertEquals("flashvalue", _flash.get("flashkey"));
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RENDER_RESPONSE);
// cleanup flash
@@ -845,7 +845,7 @@ public class FlashImplTest extends AbstractJsfTestCase
@Test
public void testNotKeep() throws Exception
{
- // simulate JSF lifecycle:
+ // simulate Faces lifecycle:
// note that doPrePhaseActions() only performs tasks on RESTORE_VIEW
// and doPostPhaseActions() only on RENDER_RESPONSE.
@@ -854,11 +854,11 @@ public class FlashImplTest extends AbstractJsfTestCase
// this request is a normal GET request, and thus not a postback
((MockFacesContext20) facesContext).setPostback(false);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RENDER_RESPONSE);
_flash.doPostPhaseActions(facesContext);
@@ -870,11 +870,11 @@ public class FlashImplTest extends AbstractJsfTestCase
// this request should be a postback
((MockFacesContext20) facesContext).setPostback(true);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.INVOKE_APPLICATION);
// put a value into the request FlashMap
@@ -882,7 +882,7 @@ public class FlashImplTest extends AbstractJsfTestCase
// and do NOT keep it.
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RENDER_RESPONSE);
_flash.doPostPhaseActions(facesContext);
@@ -895,17 +895,17 @@ public class FlashImplTest extends AbstractJsfTestCase
// this request should be a postback
((MockFacesContext20) facesContext).setPostback(true);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.INVOKE_APPLICATION);
// render FlashMap must be empty
Assert.assertNull(_flash.get("flashkey"));
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RENDER_RESPONSE);
// cleanup flash
@@ -919,7 +919,7 @@ public class FlashImplTest extends AbstractJsfTestCase
@Test
public void testMapMethodsUseDifferentMaps() throws Exception
{
- // simulate JSF lifecycle:
+ // simulate Faces lifecycle:
// note that doPrePhaseActions() only performs tasks on RESTORE_VIEW
// and doPostPhaseActions() only on RENDER_RESPONSE.
@@ -928,11 +928,11 @@ public class FlashImplTest extends AbstractJsfTestCase
// this request is a normal GET request, and thus not a postback
((MockFacesContext20) facesContext).setPostback(false);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RENDER_RESPONSE);
_flash.doPostPhaseActions(facesContext);
@@ -944,11 +944,11 @@ public class FlashImplTest extends AbstractJsfTestCase
// this request should be a postback
((MockFacesContext20) facesContext).setPostback(true);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
_flash.doPrePhaseActions(facesContext);
- // simulate JSF lifecycle
+ // simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RENDER_RESPONSE);
// in this configuration put() and get() are executed on different maps
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlClientEventAttributesUtil.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlClientEventAttributesUtil.java
index 574681604..9fd2a73cb 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlClientEventAttributesUtil.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/HtmlClientEventAttributesUtil.java
@@ -68,7 +68,7 @@ public class HtmlClientEventAttributesUtil
}
else
{
- // Note that on JSF 2.3, some components don't need onselect attribute
+ // Note that on Faces 2.3, some components don't need onselect attribute
// Please see https://issues.apache.org/jira/browse/MYFACES-4190
attrs = (HtmlRenderedClientEventAttr[]) org.apache.myfaces.util.lang.ArrayUtils.concat(
generateClientBehaviorEventAttrs(),
diff --git a/impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesTestCase.java b/impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesTestCase.java
index f6c7a12c5..3a22b7bb6 100644
--- a/impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesTestCase.java
@@ -170,7 +170,7 @@ public abstract class AbstractMyFacesTestCase
// Set up Servlet API Objects
setUpServletObjects();
- // Set up JSF API Objects
+ // Set up Faces API Objects
FactoryFinder.releaseFactories();
setUpServletListeners();
@@ -183,7 +183,7 @@ public abstract class AbstractMyFacesTestCase
}
/**
- * Set up the thread context classloader. JSF uses the this classloader
+ * Set up the thread context classloader. Faces uses the this classloader
* in order to find related factory classes and other resources, but in
* some selected cases, the default classloader cannot be properly set.
*
@@ -843,7 +843,7 @@ public abstract class AbstractMyFacesTestCase
catch (Throwable e)
{
- // JSF 2.0: publish the executor's exception (if any).
+ // Faces 2.0: publish the executor's exception (if any).
ExceptionQueuedEventContext context = new ExceptionQueuedEventContext (
facesContext, e, null, PhaseId.RENDER_RESPONSE);
facesContext.getApplication().publishEvent (facesContext, ExceptionQueuedEvent.class, context);
diff --git a/impl/src/test/java/org/apache/myfaces/test/core/mock/MockMyFacesClient.java b/impl/src/test/java/org/apache/myfaces/test/core/mock/MockMyFacesClient.java
index c52e34781..c3790a7bd 100644
--- a/impl/src/test/java/org/apache/myfaces/test/core/mock/MockMyFacesClient.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/mock/MockMyFacesClient.java
@@ -45,7 +45,7 @@ import org.apache.myfaces.test.mock.MockHttpServletResponse;
import org.junit.Assert;
/**
- * Client that keep track and "translate" the commands done in a JSF component.
+ * Client that keep track and "translate" the commands done in a Faces component.
* It simulates the effect of a browser, but without execute any javascript
* or check the html output. If that level of detail is required, use an
* in-container alternative like Arquillian and others. This strategy is designed
diff --git a/impl/src/test/java/org/apache/myfaces/test/core/runner/AbstractJsfTestContainer.java b/impl/src/test/java/org/apache/myfaces/test/core/runner/AbstractJsfTestContainer.java
index 10ecac702..63bd8fadf 100644
--- a/impl/src/test/java/org/apache/myfaces/test/core/runner/AbstractJsfTestContainer.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/runner/AbstractJsfTestContainer.java
@@ -173,7 +173,7 @@ public class AbstractJsfTestContainer
// Set up Servlet API Objects
setUpServletObjects();
- // Set up JSF API Objects
+ // Set up Faces API Objects
FactoryFinder.releaseFactories();
setUpServletListeners();
@@ -186,7 +186,7 @@ public class AbstractJsfTestContainer
}
/**
- * Set up the thread context classloader. JSF uses the this classloader
+ * Set up the thread context classloader. Faces uses the this classloader
* in order to find related factory classes and other resources, but in
* some selected cases, the default classloader cannot be properly set.
*
@@ -918,7 +918,7 @@ public class AbstractJsfTestContainer
catch (Throwable e)
{
- // JSF 2.0: publish the executor's exception (if any).
+ // Faces 2.0: publish the executor's exception (if any).
ExceptionQueuedEventContext context = new ExceptionQueuedEventContext (
facesContext, e, null, PhaseId.RENDER_RESPONSE);
facesContext.getApplication().publishEvent (facesContext, ExceptionQueuedEvent.class, context);
diff --git a/impl/src/test/java/org/apache/myfaces/test/utils/HtmlCheckAttributesUtil.java b/impl/src/test/java/org/apache/myfaces/test/utils/HtmlCheckAttributesUtil.java
index c81a9207a..a91b339f8 100644
--- a/impl/src/test/java/org/apache/myfaces/test/utils/HtmlCheckAttributesUtil.java
+++ b/impl/src/test/java/org/apache/myfaces/test/utils/HtmlCheckAttributesUtil.java
@@ -177,7 +177,7 @@ public class HtmlCheckAttributesUtil
/**
* Generates an array of basic attributes.
- * Note that on JSF 2.3 some components don't need onselect attribute.
+ * Note that on Faces 2.3 some components don't need onselect attribute.
* Please see https://issues.apache.org/jira/browse/MYFACES-4190
* @param isOnSelectNeeded A boolean value to check if onselect attribute is needed.
*/
@@ -221,7 +221,7 @@ public class HtmlCheckAttributesUtil
}
else
{
- // Note that on JSF 2.3, some components don't need onselect attribute
+ // Note that on Faces 2.3, some components don't need onselect attribute
attrs = new HtmlRenderedAttr[] {
//_AccesskeyProperty
new HtmlRenderedAttr("accesskey"),
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/ExceptionTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/ExceptionTestCase.java
index b91ef71ea..c2e4bd2c1 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/ExceptionTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/ExceptionTestCase.java
@@ -268,7 +268,7 @@ public class ExceptionTestCase extends FaceletTestCase
}
catch (Throwable e)
{
- // JSF 2.0: publish the executor's exception (if any).
+ // Faces 2.0: publish the executor's exception (if any).
publishException (e, PhaseId.INVOKE_APPLICATION, facesContext);
}
@@ -405,7 +405,7 @@ public class ExceptionTestCase extends FaceletTestCase
}
catch (Throwable e)
{
- // JSF 2.0: publish the executor's exception (if any).
+ // Faces 2.0: publish the executor's exception (if any).
publishException (e, PhaseId.UPDATE_MODEL_VALUES, facesContext);
}
@@ -465,7 +465,7 @@ public class ExceptionTestCase extends FaceletTestCase
}
catch (Throwable e)
{
- // JSF 2.0: publish the executor's exception (if any).
+ // Faces 2.0: publish the executor's exception (if any).
publishException (e, PhaseId.UPDATE_MODEL_VALUES, facesContext);
}
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/bean/HelloWorld.java b/impl/src/test/java/org/apache/myfaces/view/facelets/bean/HelloWorld.java
index a25cf2967..6bb994bd9 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/bean/HelloWorld.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/bean/HelloWorld.java
@@ -53,7 +53,7 @@ public class HelloWorld {
* Method that is backed to a submit button of a form.
*/
public String send(){
- //do real logic, return a string which will be used for the navigation system of JSF
+ //do real logic, return a string which will be used for the navigation system of Faces
return "success";
}
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/HTML5FaceletsProcessingTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/HTML5FaceletsProcessingTestCase.java
index 0e2e2a9e4..984e9e5e2 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/HTML5FaceletsProcessingTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/compiler/HTML5FaceletsProcessingTestCase.java
@@ -82,7 +82,7 @@ public class HTML5FaceletsProcessingTestCase extends FaceletTestCase {
{
super.setUpExternalContext();
- // In JSF 2.2 xhtml default is html5
+ // In Faces 2.2 xhtml default is html5
/*FaceletsProcessing item = new FaceletsProcessing();
item.setFileExtension(".xhtml");
item.setProcessAs(FaceletsProcessing.PROCESS_AS_HTML5);
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/localized/LocalizedCompositeComponentTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/localized/LocalizedCompositeComponentTestCase.java
index 0d75ad7d6..7391a3372 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/localized/LocalizedCompositeComponentTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/composite/localized/LocalizedCompositeComponentTestCase.java
@@ -25,7 +25,7 @@ import org.junit.Test;
/**
* Check if a composite component can be localized following the rules
- * of JSF 2.0 Resource Handler API that are used for css, javascript
+ * of Faces 2.0 Resource Handler API that are used for css, javascript
* and other resources.
*
* @author Leonardo Uribe