(tomee) branch TOMEE-4343 updated: WIP

[rzo1]

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

rzo1 pushed a commit to branch TOMEE-4343
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/TOMEE-4343 by this push:
     new c329272882 WIP
c329272882 is described below

commit c3292728823af2d9b71e7fc9539ea9a7a03e2ae2
Author: Richard Zowalla <r...@apache.org>
AuthorDate: Tue Jun 4 13:48:40 2024 +0200

    WIP
---
 .../tck/opentelemetry/ArquillianExtension.java          |  2 ++
 ...rquillianExtension.java => DeploymentProcessor.java} | 17 ++++++++++++-----
 .../org.eclipse.microprofile.config.spi.ConfigSource    |  1 -
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git 
a/tck/microprofile-tck/opentelemetry/src/test/java/org/apache/tomee/microprofile/tck/opentelemetry/ArquillianExtension.java
 
b/tck/microprofile-tck/opentelemetry/src/test/java/org/apache/tomee/microprofile/tck/opentelemetry/ArquillianExtension.java
index a720289ab1..252f2ae290 100644
--- 
a/tck/microprofile-tck/opentelemetry/src/test/java/org/apache/tomee/microprofile/tck/opentelemetry/ArquillianExtension.java
+++ 
b/tck/microprofile-tck/opentelemetry/src/test/java/org/apache/tomee/microprofile/tck/opentelemetry/ArquillianExtension.java
@@ -16,11 +16,13 @@
  */
 package org.apache.tomee.microprofile.tck.opentelemetry;
 
+import 
org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor;
 import org.jboss.arquillian.core.spi.LoadableExtension;
 
 public class ArquillianExtension implements LoadableExtension {
     @Override
     public void register(ExtensionBuilder extensionBuilder) {
+        extensionBuilder.service(ApplicationArchiveProcessor.class, 
DeploymentProcessor.class);
         extensionBuilder.observer(ArquillianLifecycle.class);
     }
 }
\ No newline at end of file
diff --git 
a/tck/microprofile-tck/opentelemetry/src/test/java/org/apache/tomee/microprofile/tck/opentelemetry/ArquillianExtension.java
 
b/tck/microprofile-tck/opentelemetry/src/test/java/org/apache/tomee/microprofile/tck/opentelemetry/DeploymentProcessor.java
similarity index 58%
copy from 
tck/microprofile-tck/opentelemetry/src/test/java/org/apache/tomee/microprofile/tck/opentelemetry/ArquillianExtension.java
copy to 
tck/microprofile-tck/opentelemetry/src/test/java/org/apache/tomee/microprofile/tck/opentelemetry/DeploymentProcessor.java
index a720289ab1..030123772e 100644
--- 
a/tck/microprofile-tck/opentelemetry/src/test/java/org/apache/tomee/microprofile/tck/opentelemetry/ArquillianExtension.java
+++ 
b/tck/microprofile-tck/opentelemetry/src/test/java/org/apache/tomee/microprofile/tck/opentelemetry/DeploymentProcessor.java
@@ -16,11 +16,18 @@
  */
 package org.apache.tomee.microprofile.tck.opentelemetry;
 
-import org.jboss.arquillian.core.spi.LoadableExtension;
+import org.eclipse.microprofile.config.spi.ConfigSource;
+import 
org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor;
+import org.jboss.arquillian.test.spi.TestClass;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 
-public class ArquillianExtension implements LoadableExtension {
+public class DeploymentProcessor implements ApplicationArchiveProcessor {
     @Override
-    public void register(ExtensionBuilder extensionBuilder) {
-        extensionBuilder.observer(ArquillianLifecycle.class);
+    public void process(Archive<?> archive, TestClass testClass) {
+        if (archive instanceof WebArchive war) {
+            war.addAsServiceProvider(ConfigSource.class, 
TestConfigSource.class);
+            war.addClass(TestConfigSource.class);
+        }
     }
-}
\ No newline at end of file
+}
diff --git 
a/tck/microprofile-tck/opentelemetry/src/test/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSource
 
b/tck/microprofile-tck/opentelemetry/src/test/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSource
deleted file mode 100644
index bf19742c90..0000000000
--- 
a/tck/microprofile-tck/opentelemetry/src/test/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSource
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.tomee.microprofile.tck.opentelemetry.TestConfigSource
\ No newline at end of file