commit b4bb621b88f2cbcf5d7be6f46a62ad94d684be9c
author Thomas Andraschko <tandraschko@apache.org> Mon Mar 02 12:55:47 2020 +0100
committer Thomas Andraschko <tandraschko@apache.org> Mon Mar 02 12:55:47 2020 +0100
tree 1538d9ba7aed3c48deef7ae6cfc7e025059ac426
parent ac76f52761b79d5455926b79fe321e5bde5ebe79

refactored

extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/MyFacesProcessor.java

diff --git a/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/MyFacesProcessor.java b/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/MyFacesProcessor.java
index 1d29f5e..70596ee 100644
--- a/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/MyFacesProcessor.java
+++ b/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/MyFacesProcessor.java
@@ -18,7 +18,6 @@
  */
 package org.apache.myfaces.core.extensions.quarkus.deployment;
 
-import com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl;
 import com.sun.org.apache.xpath.internal.functions.FuncLocalPart;
 import com.sun.org.apache.xpath.internal.functions.FuncNot;
 import java.io.IOException;
@@ -117,6 +116,7 @@
 import javax.faces.view.facelets.TagHandler;
 import javax.faces.view.facelets.ValidatorHandler;
 import javax.inject.Named;
+import javax.xml.parsers.DocumentBuilderFactory;
 import org.apache.el.ExpressionFactoryImpl;
 import org.apache.myfaces.application.viewstate.StateUtils;
 import org.apache.myfaces.cdi.util.BeanEntry;
@@ -421,6 +421,11 @@
         classNames.addAll(collectSubclasses(combinedIndex, FacesContext.class.getName()));
         classNames.addAll(collectSubclasses(combinedIndex, Application.class.getName()));
 
+        // Web.xml parsing
+        classNames.addAll(collectSubclasses(combinedIndex, DocumentBuilderFactory.class.getName()));
+        classNames.add(FuncLocalPart.class.getName());
+        classNames.add(FuncNot.class.getName());
+
         for (String factory : FACTORIES)
         {
             classNames.addAll(collectSubclasses(combinedIndex, factory));
@@ -434,9 +439,6 @@
         classes.addAll(Arrays.asList(
                 DefaultWebConfigProviderFactory.class,
                 ErrorPageWriter.class,
-                DocumentBuilderFactoryImpl.class,
-                FuncLocalPart.class,
-                FuncNot.class,
                 MyFacesContainerInitializer.class,
                 RestoreViewSupport.class,
                 ExceptionQueuedEventContext.class,
@@ -463,6 +465,8 @@
         List<String> classNames = new ArrayList<>();
         List<Class<?>> classes = new ArrayList<>();
         
+        classNames.add("javax.faces._FactoryFinderProviderFactory");
+        
         classNames.addAll(collectSubclasses(combinedIndex, TagHandler.class.getName()));
         classNames.addAll(collectSubclasses(combinedIndex, ConverterHandler.class.getName()));
         classNames.addAll(collectSubclasses(combinedIndex, ComponentHandler.class.getName()));
@@ -471,8 +475,6 @@
         classNames.addAll(collectSubclasses(combinedIndex, ELResolver.class.getName()));
         classNames.addAll(collectSubclasses(combinedIndex, MethodRule.class.getName()));
         classNames.addAll(collectSubclasses(combinedIndex, MetaRuleset.class.getName()));
-        classNames.addAll(Arrays.asList(
-                "javax.faces._FactoryFinderProviderFactory"));
 
         classNames.addAll(collectImplementors(combinedIndex, Converter.class.getName()));
         classNames.addAll(collectImplementors(combinedIndex, Validator.class.getName()));