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 2024/10/29 13:49:07 UTC

(myfaces) branch 4.0.x updated: MYFACES-4427: 4.0 Quarkus UberJar add META-INF/myfaces-metadata.xml (#790)

This is an automated email from the ASF dual-hosted git repository.

melloware pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/4.0.x by this push:
     new 4e132ec53 MYFACES-4427: 4.0 Quarkus UberJar add META-INF/myfaces-metadata.xml (#790)
4e132ec53 is described below

commit 4e132ec53d4a6a6234b7764a685ead14bb188d83
Author: Melloware <me...@gmail.com>
AuthorDate: Tue Oct 29 09:49:02 2024 -0400

    MYFACES-4427: 4.0 Quarkus UberJar add META-INF/myfaces-metadata.xml (#790)
---
 .../quarkus/deployment/FacesUberJarProcessor.java    | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/FacesUberJarProcessor.java b/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/FacesUberJarProcessor.java
index fb7a6a3f4..25801af3d 100644
--- a/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/FacesUberJarProcessor.java
+++ b/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/FacesUberJarProcessor.java
@@ -63,20 +63,19 @@ public class FacesUberJarProcessor
     void uberJarServiceLoaders(BuildProducer<UberJarMergedResourceBuildItem> producer)
     {
         List<String> serviceFiles = List.of(
-                "myfaces-metadata.xml",
-                "services/jakarta.el.ExpressionFactory",
-                "services/jakarta.enterprise.inject.spi.Extension",
-                "services/jakarta.json.spi.JsonProvider",
-                "services/jakarta.servlet.ServletContainerInitializer",
-                "services/jakarta.websocket.ContainerProvider",
-                "services/jakarta.websocket.server.ServerEndpointConfig$Configurator",
-                "services/org.apache.myfaces.spi.AnnotationProvider",
-                "services/org.apache.myfaces.spi.InjectionProvider"
+                "jakarta.el.ExpressionFactory",
+                "jakarta.enterprise.inject.spi.Extension",
+                "jakarta.json.spi.JsonProvider",
+                "jakarta.servlet.ServletContainerInitializer",
+                "jakarta.websocket.ContainerProvider",
+                "jakarta.websocket.server.ServerEndpointConfig$Configurator",
+                "org.apache.myfaces.spi.AnnotationProvider",
+                "org.apache.myfaces.spi.InjectionProvider"
         );
 
         for (String serviceFile : serviceFiles)
         {
-            producer.produce(new UberJarMergedResourceBuildItem("META-INF/" + serviceFile));
+            producer.produce(new UberJarMergedResourceBuildItem("META-INF/services/" + serviceFile));
         }
     }
 
@@ -93,6 +92,7 @@ public class FacesUberJarProcessor
     {
         if (packageConfig.jar().type() == UBER_JAR)
         {
+            mergeAndGenerateResource("META-INF/myfaces-metadata.xml", generatedResourcesProducer);
             mergeAndGenerateResource("META-INF/web-fragment.xml", generatedResourcesProducer);
             mergeAndGenerateResource("META-INF/faces-config.xml", generatedResourcesProducer);
         }