MYFACES-4427: 5.0 Quarkus UberJar add META-INF/myfaces-metadata.xml (#…

…789)
apache · Oct 29, 2024 · b887261 · b887261
1 parent a332e03
commit b887261
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/...ain/java/org/apache/myfaces/core/extensions/quarkus/deployment/FacesUberJarProcessor.java b/...ain/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 @@ void uberJarXmlFiles(BuildProducer<GeneratedResourceBuildItem> generatedResource
     {
         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);
         }