Merge pull request #151 from shadogray/master

Wildfly-31 wildfly-build-managed - BeansXmlUtil.discovery-mode=all - mostly working
apache · Feb 26, 2024 · 9593635 · 9593635
2 parents e38afd9 + 110ddd8
commit 9593635
Show file tree

Hide file tree

Showing 93 changed files with 458 additions and 203 deletions.
diff --git a/...a/org/apache/deltaspike/test/core/api/config/injectable/InjectableConfigPropertyTest.java b/...a/org/apache/deltaspike/test/core/api/config/injectable/InjectableConfigPropertyTest.java
@@ -34,7 +34,6 @@
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Assert;
@@ -46,6 +45,7 @@
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
+import static org.apache.deltaspike.test.utils.BeansXmlUtil.BEANS_XML_ALL;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -69,12 +69,12 @@ public static WebArchive deploy()
                 .addPackage(ServerEndpointPojoWithCt.class.getPackage())
                 .addPackage(NumberConfiguredBean.class.getPackage())
                 .addAsManifestResource(FileUtils.getFileForURL(fileUrl.toString()))
-                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+                .addAsManifestResource(BEANS_XML_ALL, "beans.xml");
 
         return ShrinkWrap.create(WebArchive.class, "beanProvider.war")
                 .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive())
                 .addAsLibraries(testJar)
-                .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+                .addAsWebInfResource(BEANS_XML_ALL, "beans.xml");
     }
 
     @ConfigProperty(name = "myapp.some.server", cacheFor = 2, cacheUnit = TimeUnit.SECONDS)

diff --git a/...rg/apache/deltaspike/test/core/api/config/propertyconfigsource/ConfigPropertyWARTest.java b/...rg/apache/deltaspike/test/core/api/config/propertyconfigsource/ConfigPropertyWARTest.java
@@ -24,12 +24,13 @@
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import static org.apache.deltaspike.test.utils.BeansXmlUtil.BEANS_XML_ALL;
+
 @RunWith(Arquillian.class)
 @Category(WebProfileCategory.class)
 public class ConfigPropertyWARTest extends BaseTestConfigProperty
@@ -45,7 +46,7 @@ public static WebArchive deployEar()
                 .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive())
                 .addPackage(ConfigPropertyWARTest.class.getPackage())
                 .addAsResource(CONFIG_FILE_NAME)
-                .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
+                .addAsWebInfResource(BEANS_XML_ALL, "beans.xml")
                 .addAsWebInfResource(new StringAsset(PROPERTIES),
                         "classes/META-INF/apache-deltaspike.properties");
 

diff --git a/...org/apache/deltaspike/test/core/api/config/propertyconfigsource/FileConfigSourceTest.java b/...org/apache/deltaspike/test/core/api/config/propertyconfigsource/FileConfigSourceTest.java
@@ -29,14 +29,15 @@
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import static org.apache.deltaspike.test.utils.BeansXmlUtil.BEANS_XML_ALL;
+
 /**
  * Test for picking up a file system based config
  */
@@ -49,12 +50,12 @@ public static WebArchive deploy()
     {
         JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "FileConfigSourceTest.jar")
             .addClasses(FileConfigSourceTest.class, FileSystemConfig.class)
-            .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+            .addAsManifestResource(BEANS_XML_ALL, "beans.xml");
 
         return ShrinkWrap.create(WebArchive.class, "beanProvider.war")
             .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive())
             .addAsLibraries(testJar)
-            .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+            .addAsWebInfResource(BEANS_XML_ALL, "beans.xml");
     }
 
 

diff --git a/...apache/deltaspike/test/core/api/config/propertyconfigsource/PropertyConfigSourceTest.java b/...apache/deltaspike/test/core/api/config/propertyconfigsource/PropertyConfigSourceTest.java
@@ -24,14 +24,15 @@
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.Assert;
 import org.junit.Test;
 
+import static org.apache.deltaspike.test.utils.BeansXmlUtil.BEANS_XML_ALL;
+
 @RunWith(Arquillian.class)
 @Category(SeCategory.class) //X TODO this is only SeCategory as there is currently an Arq problem with properties!
 public class PropertyConfigSourceTest
@@ -51,12 +52,12 @@ public static WebArchive deploy()
                 .addAsResource(CONFIG_FILE_NAME)
                 .addAsResource(BOOTCONFIG_FILE_NAME)
                 .addAsResource(NOT_PICKED_UP_CONFIG_FILE_NAME)
-                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+                .addAsManifestResource(BEANS_XML_ALL, "beans.xml");
 
         return ShrinkWrap.create(WebArchive.class, "beanProvider.war")
                 .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive())
                 .addAsLibraries(testJar)
-                .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+                .addAsWebInfResource(BEANS_XML_ALL, "beans.xml");
     }
 
 

diff --git a/...rg/apache/deltaspike/test/core/api/exclude/ExcludeTestProjectStageWarFileDevelopment.java b/...rg/apache/deltaspike/test/core/api/exclude/ExcludeTestProjectStageWarFileDevelopment.java
@@ -25,14 +25,14 @@
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.runner.RunWith;
 
+import static org.apache.deltaspike.test.utils.BeansXmlUtil.BEANS_XML_ALL;
+
 /**
  * Tests for {@link org.apache.deltaspike.core.api.exclude.Exclude}
  */
@@ -53,14 +53,14 @@ public static WebArchive deploy()
 
         JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "excludeTestProjectStageDevelopmentTest.jar")
                 .addPackage(ExcludeTestProjectStageWarFileDevelopment.class.getPackage())
-                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
+                .addAsManifestResource(BEANS_XML_ALL, "beans.xml")
                 .addAsResource(new StringAsset("org.apache.deltaspike.ProjectStage = Development"),
                     "apache-deltaspike.properties"); // when deployed on some remote container
 
         return ShrinkWrap.create(WebArchive.class, archiveName + ".war")
                 .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive())
                 .addAsLibraries(testJar)
-                .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+                .addAsWebInfResource(BEANS_XML_ALL, "beans.xml");
     }
 
     @AfterClass

diff --git a/...re/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeWarFileTest.java b/...re/impl/src/test/java/org/apache/deltaspike/test/core/api/exclude/ExcludeWarFileTest.java
@@ -18,6 +18,7 @@
  */
 package org.apache.deltaspike.test.core.api.exclude;
 
+import jakarta.enterprise.inject.spi.Extension;
 import org.apache.deltaspike.core.api.projectstage.ProjectStage;
 import org.apache.deltaspike.core.impl.exclude.extension.ExcludeExtension;
 import org.apache.deltaspike.core.util.ProjectStageProducer;
@@ -27,19 +28,19 @@
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.AfterClass;
 import org.junit.runner.RunWith;
 
-import jakarta.enterprise.inject.spi.Extension;
 import java.io.IOException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 
+import static org.apache.deltaspike.test.utils.BeansXmlUtil.BEANS_XML_ALL;
+
 /**
  * Tests for {@link org.apache.deltaspike.core.api.exclude.Exclude}
  */
@@ -63,12 +64,12 @@ public static WebArchive deploy() throws IOException
                 .addPackage(TestClassDeactivator.class.getPackage())
                 .addAsManifestResource(new StringAsset(getConfigContent()),
                     "apache-deltaspike.properties") // when deployed on some remote container;
-                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+                .addAsManifestResource(BEANS_XML_ALL, "beans.xml");
 
         return ShrinkWrap.create(WebArchive.class, archiveName + ".war")
                 .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive())
                 .addAsLibraries(testJar)
-                .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
+                .addAsWebInfResource(BEANS_XML_ALL, "beans.xml")
                 .addAsServiceProvider(Extension.class, ExcludeExtension.class);
     }
 

diff --git a/...pl/src/test/java/org/apache/deltaspike/test/core/api/exclude/uc001/EntityExcludeTest.java b/...pl/src/test/java/org/apache/deltaspike/test/core/api/exclude/uc001/EntityExcludeTest.java
@@ -25,7 +25,6 @@
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -34,6 +33,8 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import static org.apache.deltaspike.test.utils.BeansXmlUtil.BEANS_XML_ALL;
+
 @RunWith(Arquillian.class)
 public class EntityExcludeTest
 {
@@ -48,14 +49,14 @@ public static WebArchive deploy()
 
         JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, archiveName + ".jar")
                 .addPackage(EntityExcludeTest.class.getPackage())
-                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
+                .addAsManifestResource(BEANS_XML_ALL, "beans.xml")
                 .addAsResource(new StringAsset("org.apache.deltaspike.ProjectStage = Development"),
                     "apache-deltaspike.properties"); // when deployed on some remote container;
 
         return ShrinkWrap.create(WebArchive.class, archiveName + ".war")
                 .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive())
                 .addAsLibraries(testJar)
-                .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+                .addAsWebInfResource(BEANS_XML_ALL, "beans.xml");
     }
 
     @AfterClass

diff --git a/...re/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java b/...re/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java
@@ -33,7 +33,6 @@
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Assert;
@@ -42,6 +41,8 @@
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import static org.apache.deltaspike.test.utils.BeansXmlUtil.BEANS_XML_ALL;
+
 /**
  * Tests for {@link MessageContext}
  */
@@ -66,13 +67,13 @@ public static WebArchive deploy()
         final JavaArchive testJar = ShrinkWrap
                 .create(JavaArchive.class, "messageContextTest.jar")
                 .addPackage(MessageContextTest.class.getPackage())
-                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+                .addAsManifestResource(BEANS_XML_ALL, "beans.xml");
 
         return ShrinkWrap
                 .create(WebArchive.class, "messageContextTest.war")
                 .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive())
                 .addAsLibraries(testJar)
-                .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
+                .addAsWebInfResource(BEANS_XML_ALL, "beans.xml")
                 .addAsServiceProvider(Extension.class,
                         MessageBundleExtension.class);
     }

diff --git a/...rc/test/java/org/apache/deltaspike/test/core/api/message/MessageFormattedMessageTest.java b/...rc/test/java/org/apache/deltaspike/test/core/api/message/MessageFormattedMessageTest.java
@@ -29,14 +29,14 @@
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.Asset;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import static org.apache.deltaspike.test.utils.BeansXmlUtil.BEANS_XML_ALL;
 import static org.junit.Assert.assertEquals;
 
 /**
@@ -72,7 +72,7 @@ public static WebArchive deploy()
                 .create(WebArchive.class, "messageFormattedMessageTest.war")
                 .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive())
                 .addAsLibraries(testJar)
-                .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
+                .addAsWebInfResource(BEANS_XML_ALL, "beans.xml")
                 .addAsServiceProvider(Extension.class,
                         MessageBundleExtension.class);
     }

diff --git a/...pike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageTest.java b/...pike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageTest.java
@@ -24,7 +24,6 @@
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Test;
@@ -34,6 +33,7 @@
 import jakarta.enterprise.inject.spi.Extension;
 import jakarta.inject.Inject;
 
+import static org.apache.deltaspike.test.utils.BeansXmlUtil.BEANS_XML_ALL;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
@@ -57,13 +57,13 @@ public static WebArchive deploy()
         JavaArchive testJar = ShrinkWrap
                 .create(JavaArchive.class, "messageTest.jar")
                 .addPackage(MessageTest.class.getPackage())
-                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+                .addAsManifestResource(BEANS_XML_ALL, "beans.xml");
 
         return ShrinkWrap
                 .create(WebArchive.class, "messageTest.war")
                 .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive())
                 .addAsLibraries(testJar)
-                .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
+                .addAsWebInfResource(BEANS_XML_ALL, "beans.xml")
                 .addAsServiceProvider(Extension.class,
                         MessageBundleExtension.class);
     }

diff --git a/...e/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MinimalMessagesTest.java b/...e/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MinimalMessagesTest.java
@@ -25,7 +25,6 @@
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Filters;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Assert;
@@ -35,6 +34,8 @@
 import jakarta.enterprise.inject.spi.Extension;
 import jakarta.inject.Inject;
 
+import static org.apache.deltaspike.test.utils.BeansXmlUtil.BEANS_XML_ALL;
+
 /**
  * Tests for type-safe messages without {@link org.apache.deltaspike.core.api.message.MessageTemplate}
  */
@@ -61,15 +62,15 @@ public static WebArchive deploy()
                 .create(JavaArchive.class, "minimalMessageTest.jar")
                 .addPackages(false, Filters.exclude(MessageContextTest.class),
                         MinimalMessagesTest.class.getPackage())
-                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+                .addAsManifestResource(BEANS_XML_ALL, "beans.xml");
 
         return ShrinkWrap
                 .create(WebArchive.class, "minimalMessageTest.war")
                 .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive())
                 .addAsLibraries(testJar)
                 .addAsResource("customMinimalMessage_en.properties")
                 .addAsResource("org/apache/deltaspike/test/core/api/message/MinimalMessages_en.properties")
-                .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
+                .addAsWebInfResource(BEANS_XML_ALL, "beans.xml")
                 .addAsServiceProvider(Extension.class,
                         MessageBundleExtension.class);
     }

diff --git a/...ore/impl/src/test/java/org/apache/deltaspike/test/core/api/message/SimpleMessageTest.java b/...ore/impl/src/test/java/org/apache/deltaspike/test/core/api/message/SimpleMessageTest.java
@@ -26,7 +26,6 @@
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Test;
@@ -36,6 +35,7 @@
 import jakarta.enterprise.inject.spi.Extension;
 import jakarta.inject.Inject;
 
+import static org.apache.deltaspike.test.utils.BeansXmlUtil.BEANS_XML_ALL;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
@@ -66,13 +66,13 @@ public static WebArchive deploy()
         JavaArchive testJar = ShrinkWrap
                 .create(JavaArchive.class, "simpleMessageTest.jar")
                 .addPackage(SimpleMessageTest.class.getPackage())
-                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+                .addAsManifestResource(BEANS_XML_ALL, "beans.xml");
 
         return ShrinkWrap
                 .create(WebArchive.class, "simpleMessageTest.war")
                 .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive())
                 .addAsLibraries(testJar)
-                .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
+                .addAsWebInfResource(BEANS_XML_ALL, "beans.xml")
                 .addAsServiceProvider(Extension.class,
                         MessageBundleExtension.class);
     }