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 2023/02/22 22:16:36 UTC
[myfaces] branch main updated: MYFACES-4571: 4.0 substitute tag url in native mode (#533)
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 ba7886c3c MYFACES-4571: 4.0 substitute tag url in native mode (#533)
ba7886c3c is described below
commit ba7886c3ce7c10b5f53dcefa26d1d2867b2c7f83
Author: Melloware <me...@gmail.com>
AuthorDate: Wed Feb 22 17:16:30 2023 -0500
MYFACES-4571: 4.0 substitute tag url in native mode (#533)
* MYFACES-4571: 4.0 substitute tag url in native mode
* Added jakarta.validation.groups.Default
* Better Java class handling
* Added JstlFunction
* MYFACES-4571: 4.0 substitute tag url in native mode
---
.../quarkus/deployment/MyFacesProcessor.java | 168 ++++++++++-----------
.../runtime/graal/SubstituteFaceletSourceTag.java | 51 +++++++
2 files changed, 131 insertions(+), 88 deletions(-)
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 d70e5c4ba..89c855e45 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
@@ -19,108 +19,78 @@
package org.apache.myfaces.core.extensions.quarkus.deployment;
import java.io.IOException;
-import java.util.Optional;
-
-import jakarta.faces.application.ProjectStage;
-import jakarta.faces.component.FacesComponent;
-import jakarta.faces.component.behavior.FacesBehavior;
-import jakarta.faces.convert.FacesConverter;
-import jakarta.faces.flow.FlowScoped;
-import jakarta.faces.flow.builder.FlowDefinition;
-import jakarta.faces.model.FacesDataModel;
-import jakarta.faces.render.FacesBehaviorRenderer;
-import jakarta.faces.render.FacesRenderer;
-import jakarta.faces.validator.FacesValidator;
-import jakarta.faces.view.ViewScoped;
-import jakarta.faces.view.facelets.FaceletHandler;
-import jakarta.faces.webapp.FacesServlet;
-
-import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
-import org.apache.myfaces.cdi.FacesScoped;
-import org.apache.myfaces.cdi.FacesApplicationArtifactHolder;
-import org.apache.myfaces.cdi.FacesArtifactProducer;
-import org.apache.myfaces.cdi.config.FacesConfigBeanHolder;
-import org.apache.myfaces.cdi.model.FacesDataModelManager;
-import org.apache.myfaces.cdi.view.ViewTransientScoped;
-import org.apache.myfaces.config.webparameters.MyfacesConfig;
-import org.apache.myfaces.config.annotation.CdiAnnotationProviderExtension;
-import org.apache.myfaces.config.element.NamedEvent;
-import org.apache.myfaces.core.extensions.quarkus.runtime.exception.QuarkusExceptionHandlerFactory;
-import org.apache.myfaces.el.resolver.LambdaBeanELResolver;
-import org.apache.myfaces.view.facelets.tag.LambdaMetadataTargetImpl;
-import org.apache.myfaces.webapp.StartupServletContextListener;
-import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.ConfigProvider;
-import org.jboss.jandex.AnnotationInstance;
-import org.jboss.jandex.AnnotationValue;
-import org.jboss.jandex.DotName;
-
-import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
-import io.quarkus.arc.deployment.BeanDefiningAnnotationBuildItem;
-import io.quarkus.arc.deployment.BeanRegistrationPhaseBuildItem;
-import io.quarkus.arc.deployment.ContextRegistrationPhaseBuildItem;
-import io.quarkus.deployment.annotations.BuildProducer;
-import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Record;
-import io.quarkus.deployment.builditem.AdditionalApplicationArchiveMarkerBuildItem;
-import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
-import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBundleBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.NativeImageConfigBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import org.apache.myfaces.core.extensions.quarkus.runtime.MyFacesRecorder;
-import org.apache.myfaces.core.extensions.quarkus.runtime.QuarkusFacesInitializer;
-import org.apache.myfaces.core.extensions.quarkus.runtime.scopes.QuarkusFacesScopeContext;
-import org.apache.myfaces.core.extensions.quarkus.runtime.scopes.QuarkusFlowScopedContext;
-import org.apache.myfaces.core.extensions.quarkus.runtime.scopes.QuarkusViewScopeContext;
-import org.apache.myfaces.core.extensions.quarkus.runtime.scopes.QuarkusViewTransientScopeContext;
-import org.apache.myfaces.core.extensions.quarkus.runtime.spi.QuarkusInjectionProvider;
-import io.quarkus.runtime.LaunchMode;
-import io.quarkus.runtime.configuration.ConfigUtils;
-import io.quarkus.undertow.deployment.ListenerBuildItem;
-import io.quarkus.undertow.deployment.ServletBuildItem;
-import io.quarkus.undertow.deployment.ServletInitParamBuildItem;
-import io.quarkus.undertow.deployment.WebMetadataBuildItem;
-
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Optional;
import java.util.stream.Collectors;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+
import jakarta.el.ELResolver;
import jakarta.enterprise.inject.Produces;
import jakarta.faces.FactoryFinder;
import jakarta.faces.application.Application;
-import jakarta.faces.component.UIComponent;
+import jakarta.faces.application.ProjectStage;
+import jakarta.faces.component.FacesComponent;
import jakarta.faces.component.StateHolder;
+import jakarta.faces.component.UIComponent;
import jakarta.faces.component.behavior.Behavior;
+import jakarta.faces.component.behavior.FacesBehavior;
import jakarta.faces.context.FacesContext;
import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.FacesConverter;
import jakarta.faces.event.ExceptionQueuedEventContext;
import jakarta.faces.event.SystemEvent;
+import jakarta.faces.flow.FlowScoped;
+import jakarta.faces.flow.builder.FlowDefinition;
+import jakarta.faces.model.FacesDataModel;
import jakarta.faces.render.ClientBehaviorRenderer;
+import jakarta.faces.render.FacesBehaviorRenderer;
+import jakarta.faces.render.FacesRenderer;
import jakarta.faces.render.Renderer;
+import jakarta.faces.validator.FacesValidator;
import jakarta.faces.validator.Validator;
+import jakarta.faces.view.ViewScoped;
import jakarta.faces.view.facelets.ComponentHandler;
import jakarta.faces.view.facelets.ConverterHandler;
+import jakarta.faces.view.facelets.FaceletHandler;
import jakarta.faces.view.facelets.MetaRuleset;
import jakarta.faces.view.facelets.TagHandler;
import jakarta.faces.view.facelets.ValidatorHandler;
+import jakarta.faces.webapp.FacesServlet;
import jakarta.inject.Named;
import jakarta.servlet.MultipartConfigElement;
-import javax.xml.parsers.DocumentBuilderFactory;
+
import org.apache.el.ExpressionFactoryImpl;
import org.apache.myfaces.application.ApplicationImplEventManager;
import org.apache.myfaces.application.viewstate.StateUtils;
+import org.apache.myfaces.cdi.FacesApplicationArtifactHolder;
+import org.apache.myfaces.cdi.FacesArtifactProducer;
+import org.apache.myfaces.cdi.FacesScoped;
+import org.apache.myfaces.cdi.config.FacesConfigBeanHolder;
+import org.apache.myfaces.cdi.model.FacesDataModelManager;
import org.apache.myfaces.cdi.util.BeanEntry;
import org.apache.myfaces.cdi.view.ViewScopeContextualStorageHolder;
import org.apache.myfaces.cdi.view.ViewScopeEventListenerBridge;
+import org.apache.myfaces.cdi.view.ViewTransientScoped;
import org.apache.myfaces.config.FacesConfigurator;
+import org.apache.myfaces.config.annotation.CdiAnnotationProviderExtension;
+import org.apache.myfaces.config.element.NamedEvent;
+import org.apache.myfaces.config.webparameters.MyfacesConfig;
import org.apache.myfaces.core.api.shared.lang.PropertyDescriptorUtils;
+import org.apache.myfaces.core.extensions.quarkus.runtime.MyFacesRecorder;
+import org.apache.myfaces.core.extensions.quarkus.runtime.QuarkusFacesInitializer;
+import org.apache.myfaces.core.extensions.quarkus.runtime.exception.QuarkusExceptionHandlerFactory;
+import org.apache.myfaces.core.extensions.quarkus.runtime.scopes.QuarkusFacesScopeContext;
+import org.apache.myfaces.core.extensions.quarkus.runtime.scopes.QuarkusFlowScopedContext;
+import org.apache.myfaces.core.extensions.quarkus.runtime.scopes.QuarkusViewScopeContext;
+import org.apache.myfaces.core.extensions.quarkus.runtime.scopes.QuarkusViewTransientScopeContext;
import org.apache.myfaces.core.extensions.quarkus.runtime.spi.QuarkusFactoryFinderProvider;
+import org.apache.myfaces.core.extensions.quarkus.runtime.spi.QuarkusInjectionProvider;
import org.apache.myfaces.el.DefaultELResolverBuilder;
+import org.apache.myfaces.el.resolver.LambdaBeanELResolver;
import org.apache.myfaces.flow.cdi.FlowScopeContextualStorageHolder;
import org.apache.myfaces.push.cdi.WebsocketChannelTokenBuilder;
import org.apache.myfaces.push.cdi.WebsocketScopeManager;
@@ -133,18 +103,49 @@ import org.apache.myfaces.util.lang.ClassUtils;
import org.apache.myfaces.view.ViewScopeProxyMap;
import org.apache.myfaces.view.facelets.compiler.SAXCompiler;
import org.apache.myfaces.view.facelets.compiler.TagLibraryConfig;
+import org.apache.myfaces.view.facelets.tag.LambdaMetadataTargetImpl;
import org.apache.myfaces.view.facelets.tag.MethodRule;
import org.apache.myfaces.view.facelets.tag.faces.ComponentSupport;
+import org.apache.myfaces.view.facelets.tag.jstl.fn.JstlFunction;
import org.apache.myfaces.webapp.FacesInitializerImpl;
import org.apache.myfaces.webapp.MyFacesContainerInitializer;
+import org.apache.myfaces.webapp.StartupServletContextListener;
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.jboss.jandex.AnnotationInstance;
import org.jboss.jandex.AnnotationTarget;
+import org.jboss.jandex.AnnotationValue;
import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
import org.jboss.jandex.FieldInfo;
import org.jboss.jandex.MethodInfo;
import org.jboss.jandex.Type;
import org.jboss.metadata.web.spec.ServletMetaData;
import org.jboss.metadata.web.spec.WebMetaData;
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.arc.deployment.BeanDefiningAnnotationBuildItem;
+import io.quarkus.arc.deployment.BeanRegistrationPhaseBuildItem;
+import io.quarkus.arc.deployment.ContextRegistrationPhaseBuildItem;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.AdditionalApplicationArchiveMarkerBuildItem;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageConfigBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBundleBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
+import io.quarkus.runtime.LaunchMode;
+import io.quarkus.runtime.configuration.ConfigUtils;
+import io.quarkus.undertow.deployment.ListenerBuildItem;
+import io.quarkus.undertow.deployment.ServletBuildItem;
+import io.quarkus.undertow.deployment.ServletInitParamBuildItem;
+import io.quarkus.undertow.deployment.WebMetadataBuildItem;
+
class MyFacesProcessor
{
@@ -469,7 +470,8 @@ class MyFacesProcessor
classNames.addAll(Arrays.asList(
"jakarta.faces.component._DeltaStateHelper",
- "jakarta.faces.component._DeltaStateHelper$InternalMap"));
+ "jakarta.faces.component._DeltaStateHelper$InternalMap",
+ "jakarta.validation.groups.Default"));
classes.addAll(Arrays.asList(ApplicationImplEventManager.class,
DefaultWebConfigProviderFactory.class,
@@ -500,26 +502,14 @@ class MyFacesProcessor
List<Class<?>> classes = new ArrayList<>();
classNames.add("jakarta.faces._FactoryFinderProviderFactory");
- classNames.add(java.util.Set.class.getName());
- classNames.add(java.util.List.class.getName());
- classNames.add(java.util.Collection.class.getName());
+ classNames.addAll(collectImplementors(combinedIndex, java.util.Collection.class.getName()));
+ classNames.addAll(collectImplementors(combinedIndex, java.time.temporal.TemporalAccessor.class.getName()));
+ classNames.addAll(collectSubclasses(combinedIndex, java.lang.Number.class.getName()));
classNames.add(java.util.Date.class.getName());
classNames.add(java.util.Calendar.class.getName());
- classNames.add(java.time.LocalTime.class.getName());
- classNames.add(java.time.LocalDate.class.getName());
- classNames.add(java.time.LocalDateTime.class.getName());
- classNames.add(java.time.OffsetDateTime.class.getName());
- classNames.add(java.time.ZonedDateTime.class.getName());
- classNames.add(java.math.BigDecimal.class.getName());
- classNames.add(java.math.BigInteger.class.getName());
classNames.add(java.lang.Iterable.class.getName());
classNames.add(java.lang.Throwable.class.getName());
- classNames.add(java.lang.Integer.class.getName());
- classNames.add(java.lang.Long.class.getName());
- classNames.add(java.lang.Byte.class.getName());
- classNames.add(java.lang.Double.class.getName());
classNames.add(java.lang.String.class.getName());
- classNames.add(java.lang.Number.class.getName());
classNames.addAll(collectSubclasses(combinedIndex, TagHandler.class.getName()));
classNames.addAll(collectSubclasses(combinedIndex, ConverterHandler.class.getName()));
@@ -540,14 +530,16 @@ class MyFacesProcessor
io.undertow.servlet.spec.HttpServletResponseImpl.class,
io.undertow.servlet.spec.HttpSessionImpl.class));
- classes.addAll(Arrays.asList(ClassUtils.class,
- FactoryFinderProviderFactory.class,
+ classes.addAll(Arrays.asList(
+ BeanEntry.class,
+ ClassUtils.class,
ComponentSupport.class,
- QuarkusFactoryFinderProvider.class,
DefaultELResolverBuilder.class,
- FacesInitializerImpl.class,
ExternalContextUtils.class,
- BeanEntry.class));
+ FacesInitializerImpl.class,
+ FactoryFinderProviderFactory.class,
+ JstlFunction.class,
+ QuarkusFactoryFinderProvider.class));
reflectiveClass.produce(
new ReflectiveClassBuildItem(true, false, classNames.toArray(new String[classNames.size()])));
diff --git a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/graal/SubstituteFaceletSourceTag.java b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/graal/SubstituteFaceletSourceTag.java
new file mode 100644
index 000000000..cbb19fa1b
--- /dev/null
+++ b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/graal/SubstituteFaceletSourceTag.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.core.extensions.quarkus.runtime.graal;
+
+import org.apache.myfaces.config.impl.element.facelets.FaceletSourceTagImpl;
+
+import com.oracle.svm.core.annotate.Alias;
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
+
+@TargetClass(FaceletSourceTagImpl.class)
+public final class SubstituteFaceletSourceTag
+{
+
+ @Alias private String source;
+
+ @Substitute
+ public String getSource()
+ {
+ // we never want jar:file:/project/quarkus-runner.jar!/META-INF/resources/tags/custom.xhtml
+ // it must always be resource:/META-INF/resources/tags/custom.xhtml in native mode
+ if (!source.contains("!/"))
+ {
+ return source;
+ }
+ String resource = source.split("!")[1];
+ if (!resource.startsWith("/META-INF"))
+ {
+ resource = "/META-INF" + resource;
+ }
+ resource = "resource:" + resource;
+ return resource;
+ }
+
+}