diff --git a/impl/src/main/java/com/sun/faces/config/configpopulator/MojarraRuntimePopulator.java b/impl/src/main/java/com/sun/faces/config/configpopulator/MojarraRuntimePopulator.java index ab5a176790..16da5b2e94 100644 --- a/impl/src/main/java/com/sun/faces/config/configpopulator/MojarraRuntimePopulator.java +++ b/impl/src/main/java/com/sun/faces/config/configpopulator/MojarraRuntimePopulator.java @@ -1,10 +1,10 @@ package com.sun.faces.config.configpopulator; +import jakarta.faces.application.ApplicationConfigurationPopulator; + import org.w3c.dom.Document; import org.w3c.dom.Element; -import jakarta.faces.application.ApplicationConfigurationPopulator; - public final class MojarraRuntimePopulator extends ApplicationConfigurationPopulator { @Override public void populateApplicationConfiguration(Document toPopulate) { @@ -12,6 +12,11 @@ public void populateApplicationConfiguration(Document toPopulate) { Element faces_configElement = toPopulate.getDocumentElement(); { Element factoryElement = toPopulate.createElementNS(ns, "factory"); + { + Element faces_servlet_factoryElement = toPopulate.createElementNS(ns, "faces-servlet-factory"); + faces_servlet_factoryElement.appendChild(toPopulate.createTextNode("com.sun.faces.webapp.FacesServletFactoryImpl")); + factoryElement.appendChild(faces_servlet_factoryElement); + } { Element application_factoryElement = toPopulate.createElementNS(ns, "application-factory"); application_factoryElement.appendChild(toPopulate.createTextNode("com.sun.faces.application.ApplicationFactoryImpl")); diff --git a/impl/src/main/java/com/sun/faces/config/processor/FactoryConfigProcessor.java b/impl/src/main/java/com/sun/faces/config/processor/FactoryConfigProcessor.java index ab39eb9e68..e2f420465d 100644 --- a/impl/src/main/java/com/sun/faces/config/processor/FactoryConfigProcessor.java +++ b/impl/src/main/java/com/sun/faces/config/processor/FactoryConfigProcessor.java @@ -28,6 +28,10 @@ import java.util.logging.Level; import java.util.logging.Logger; +import jakarta.faces.FactoryFinder; +import jakarta.faces.context.FacesContext; +import jakarta.servlet.ServletContext; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -39,10 +43,6 @@ import com.sun.faces.context.InjectionFacesContextFactory; import com.sun.faces.util.FacesLogger; -import jakarta.faces.FactoryFinder; -import jakarta.faces.context.FacesContext; -import jakarta.servlet.ServletContext; - /** *
* This ConfigProcessor
handles all elements defined under /faces-config/factory
.
@@ -57,6 +57,11 @@ public class FactoryConfigProcessor extends AbstractConfigProcessor {
*/
private static final String FACTORY = "factory";
+ /**
+ * faces-config/factory/faces-servlet-factory
+ */
+ private static final String FACES_SERVLET_FACTORY = "faces-servlet-factory";
+
/**
* /faces-config/factory/application-factory
*/
@@ -135,7 +140,7 @@ public class FactoryConfigProcessor extends AbstractConfigProcessor {
/**
* Array of Factory names for post-configuration validation.
*/
- private final List