diff --git a/boms/standard-test-expansion/pom.xml b/boms/standard-test-expansion/pom.xml index d54882e0ca64..5df037a5d67b 100644 --- a/boms/standard-test-expansion/pom.xml +++ b/boms/standard-test-expansion/pom.xml @@ -19,6 +19,13 @@ + + ${ee.maven.groupId} + wildfly-standard-test-bom + ${ee.maven.version} + pom + import + com.github.tomakehurst diff --git a/boms/standard-test/pom.xml b/boms/standard-test/pom.xml index f3dc55e3b493..b58963e5d0a4 100644 --- a/boms/standard-test/pom.xml +++ b/boms/standard-test/pom.xml @@ -47,40 +47,6 @@ test - - junit junit @@ -298,22 +264,6 @@ test - - org.springframework.kafka - spring-kafka-test - ${version.org.springframework.kafka} - test - - - - org.apache.kafka - * - - - org.syslog4j syslog4j @@ -403,15 +353,15 @@ - xom - xom - ${version.xom} - - - * - * - - + org.wildfly.glow + wildfly-glow-core + ${version.org.wildfly.glow} + + + + org.wildfly.glow + wildfly-glow-maven-resolver + ${version.org.wildfly.glow} diff --git a/clustering/context/src/main/java/org/wildfly/clustering/context/DefaultExecutorService.java b/clustering/context/src/main/java/org/wildfly/clustering/context/DefaultExecutorService.java index 66ccd19f5a1f..1d19ad4df40c 100644 --- a/clustering/context/src/main/java/org/wildfly/clustering/context/DefaultExecutorService.java +++ b/clustering/context/src/main/java/org/wildfly/clustering/context/DefaultExecutorService.java @@ -51,6 +51,7 @@ public List run(ExecutorService executor) { }; public DefaultExecutorService(Class targetClass, Function factory) { - super(factory.apply(new DefaultThreadFactory(targetClass)), DefaultContextualizerFactory.INSTANCE.createContextualizer(targetClass)); + // Use thread group of current thread + super(factory.apply(new DefaultThreadFactory(targetClass, Thread.currentThread()::getThreadGroup)), DefaultContextualizerFactory.INSTANCE.createContextualizer(targetClass)); } } diff --git a/clustering/context/src/main/java/org/wildfly/clustering/context/DefaultThreadFactory.java b/clustering/context/src/main/java/org/wildfly/clustering/context/DefaultThreadFactory.java index d27f38ba76e6..4b72c1777f60 100644 --- a/clustering/context/src/main/java/org/wildfly/clustering/context/DefaultThreadFactory.java +++ b/clustering/context/src/main/java/org/wildfly/clustering/context/DefaultThreadFactory.java @@ -23,6 +23,7 @@ package org.wildfly.clustering.context; import java.util.concurrent.ThreadFactory; +import java.util.function.Supplier; import org.jboss.threads.JBossThreadFactory; import org.wildfly.security.ParametricPrivilegedAction; @@ -34,24 +35,33 @@ */ public class DefaultThreadFactory extends ContextualThreadFactory { - private enum ThreadPoolFactory implements ParametricPrivilegedAction> { + private enum ThreadPoolFactory implements ParametricPrivilegedAction> { INSTANCE; @Override - public ThreadFactory run(Class targetClass) { - return new JBossThreadFactory(new ThreadGroup(targetClass.getSimpleName()), Boolean.FALSE, null, "%G - %t", null, null); + public ThreadFactory run(Supplier group) { + return new JBossThreadFactory(group.get(), Boolean.FALSE, null, "%G - %t", null, null); } } public DefaultThreadFactory(Class targetClass) { - this(WildFlySecurityManager.doUnchecked(targetClass, ThreadPoolFactory.INSTANCE), targetClass); + this(targetClass, new Supplier<>() { + @Override + public ThreadGroup get() { + return new ThreadGroup(targetClass.getSimpleName()); + } + }); + } + + DefaultThreadFactory(Class targetClass, Supplier group) { + this(WildFlySecurityManager.doUnchecked(group, ThreadPoolFactory.INSTANCE), targetClass); } public DefaultThreadFactory(ThreadFactory factory) { this(factory, factory.getClass()); } - public DefaultThreadFactory(ThreadFactory factory, Class targetClass) { + private DefaultThreadFactory(ThreadFactory factory, Class targetClass) { super(factory, WildFlySecurityManager.getClassLoaderPrivileged(targetClass), ContextClassLoaderReference.INSTANCE); } } diff --git a/clustering/ee/cache/src/main/java/org/wildfly/clustering/ee/cache/scheduler/LocalScheduler.java b/clustering/ee/cache/src/main/java/org/wildfly/clustering/ee/cache/scheduler/LocalScheduler.java index 039f52dd08df..98172daa3687 100644 --- a/clustering/ee/cache/src/main/java/org/wildfly/clustering/ee/cache/scheduler/LocalScheduler.java +++ b/clustering/ee/cache/src/main/java/org/wildfly/clustering/ee/cache/scheduler/LocalScheduler.java @@ -31,6 +31,7 @@ import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.function.Predicate; import java.util.stream.Stream; @@ -45,6 +46,7 @@ * @author Paul Ferraro */ public class LocalScheduler implements Scheduler, Runnable { + private static final ThreadFactory THREAD_FACTORY = new DefaultThreadFactory(LocalScheduler.class); private final ScheduledExecutorService executor; private final ScheduledEntries entries; @@ -54,7 +56,7 @@ public class LocalScheduler implements Scheduler, Runnable { private volatile Map.Entry, Future> futureEntry = null; public LocalScheduler(ScheduledEntries entries, Predicate task, Duration closeTimeout) { - ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(1, new DefaultThreadFactory(this.getClass())); + ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(1, THREAD_FACTORY); executor.setKeepAliveTime(1L, TimeUnit.MINUTES); executor.allowCoreThreadTimeOut(true); executor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false); diff --git a/clustering/ee/infinispan/src/main/java/org/wildfly/clustering/ee/infinispan/scheduler/SchedulerTopologyChangeListener.java b/clustering/ee/infinispan/src/main/java/org/wildfly/clustering/ee/infinispan/scheduler/SchedulerTopologyChangeListener.java index fe67255ccc9d..fda969083eba 100644 --- a/clustering/ee/infinispan/src/main/java/org/wildfly/clustering/ee/infinispan/scheduler/SchedulerTopologyChangeListener.java +++ b/clustering/ee/infinispan/src/main/java/org/wildfly/clustering/ee/infinispan/scheduler/SchedulerTopologyChangeListener.java @@ -30,6 +30,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiConsumer; @@ -57,9 +58,10 @@ */ @Listener public class SchedulerTopologyChangeListener, V> implements ListenerRegistrar { + private static final ThreadFactory THREAD_FACTORY = new DefaultThreadFactory(SchedulerTopologyChangeListener.class); private final Cache cache; - private final ExecutorService executor = Executors.newSingleThreadExecutor(new DefaultThreadFactory(SchedulerTopologyChangeListener.class)); + private final ExecutorService executor = Executors.newSingleThreadExecutor(THREAD_FACTORY); private final AtomicReference> scheduleTaskFuture = new AtomicReference<>(); private final Consumer cancelTask; private final BiConsumer scheduleTask; diff --git a/clustering/ejb/infinispan/src/main/java/org/wildfly/clustering/ejb/infinispan/timer/TimerScheduler.java b/clustering/ejb/infinispan/src/main/java/org/wildfly/clustering/ejb/infinispan/timer/TimerScheduler.java index fb9f849552f7..16d545c3849f 100644 --- a/clustering/ejb/infinispan/src/main/java/org/wildfly/clustering/ejb/infinispan/timer/TimerScheduler.java +++ b/clustering/ejb/infinispan/src/main/java/org/wildfly/clustering/ejb/infinispan/timer/TimerScheduler.java @@ -31,6 +31,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.ThreadFactory; import java.util.function.Consumer; import java.util.function.Predicate; import java.util.function.Supplier; @@ -55,11 +56,12 @@ * @author Paul Ferraro */ public class TimerScheduler extends AbstractCacheEntryScheduler { + private static final ThreadFactory THREAD_FACTORY = new DefaultThreadFactory(TimerScheduler.class); private final TimerFactory factory; public TimerScheduler(TimerFactory factory, TimerManager manager, Supplier locality, Duration closeTimeout, TimerRegistry registry) { - this(factory, manager, locality, closeTimeout, registry, new SortedScheduledEntries<>(), Executors.newSingleThreadExecutor(new DefaultThreadFactory(TimerScheduler.class))); + this(factory, manager, locality, closeTimeout, registry, new SortedScheduledEntries<>(), Executors.newSingleThreadExecutor(THREAD_FACTORY)); } private TimerScheduler(TimerFactory factory, TimerManager manager, Supplier locality, Duration closeTimeout, TimerRegistry registry, ScheduledEntries entries, ExecutorService executor) { diff --git a/clustering/infinispan/embedded/spi/src/main/java/org/wildfly/clustering/infinispan/affinity/impl/DefaultKeyAffinityService.java b/clustering/infinispan/embedded/spi/src/main/java/org/wildfly/clustering/infinispan/affinity/impl/DefaultKeyAffinityService.java index 8f8b92e79039..81ac41cda8c3 100644 --- a/clustering/infinispan/embedded/spi/src/main/java/org/wildfly/clustering/infinispan/affinity/impl/DefaultKeyAffinityService.java +++ b/clustering/infinispan/embedded/spi/src/main/java/org/wildfly/clustering/infinispan/affinity/impl/DefaultKeyAffinityService.java @@ -37,6 +37,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Predicate; @@ -75,6 +76,7 @@ public class DefaultKeyAffinityService implements KeyAffinityService, Supp static final int DEFAULT_QUEUE_SIZE = 100; private static final Logger LOGGER = Logger.getLogger(DefaultKeyAffinityService.class); + private static final ThreadFactory THREAD_FACTORY = new DefaultThreadFactory(DefaultKeyAffinityService.class); private final Cache cache; private final KeyGenerator generator; @@ -139,7 +141,7 @@ public boolean isStarted() { @Override public void start() { - this.executor = Executors.newCachedThreadPool(new DefaultThreadFactory(this.getClass())); + this.executor = Executors.newCachedThreadPool(THREAD_FACTORY); this.accept(this.cache.getAdvancedCache().getDistributionManager().getCacheTopology().getWriteConsistentHash()); this.cache.addListener(this); } diff --git a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/executors/DefaultNonBlockingThreadFactory.java b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/executors/DefaultNonBlockingThreadFactory.java index c25a3ac5e84a..92fc84f68c0e 100644 --- a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/executors/DefaultNonBlockingThreadFactory.java +++ b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/executors/DefaultNonBlockingThreadFactory.java @@ -33,15 +33,7 @@ */ public class DefaultNonBlockingThreadFactory extends DefaultThreadFactory implements NonBlockingResource { - public DefaultNonBlockingThreadFactory(Class targetClass) { - super(targetClass); - } - public DefaultNonBlockingThreadFactory(ThreadFactory factory) { super(factory); } - - public DefaultNonBlockingThreadFactory(ThreadFactory factory, Class targetClass) { - super(factory, targetClass); - } } \ No newline at end of file diff --git a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/remote/ClientThreadPoolServiceConfigurator.java b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/remote/ClientThreadPoolServiceConfigurator.java index bd2ef6c50ed1..726759a5cd6b 100644 --- a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/remote/ClientThreadPoolServiceConfigurator.java +++ b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/remote/ClientThreadPoolServiceConfigurator.java @@ -53,6 +53,7 @@ * @author Radoslav Husar */ public class ClientThreadPoolServiceConfigurator extends ComponentServiceConfigurator { + private static final ThreadFactory THREAD_FACTORY = new DaemonThreadFactory(DefaultAsyncExecutorFactory.THREAD_NAME); private final ThreadPoolDefinition definition; @@ -75,7 +76,7 @@ public ServiceConfigurator configure(OperationContext context, ModelNode model) @Override public ExecutorService getExecutor(Properties property) { BlockingQueue queue = queueLength == 0 ? new SynchronousQueue<>() : new LinkedBlockingQueue<>(queueLength); - ThreadFactory factory = new DefaultThreadFactory(new DaemonThreadFactory(DefaultAsyncExecutorFactory.THREAD_NAME)); + ThreadFactory factory = new DefaultThreadFactory(THREAD_FACTORY); if (nonBlocking) { factory = new DefaultNonBlockingThreadFactory(factory); } diff --git a/clustering/server/infinispan/src/main/java/org/wildfly/clustering/server/infinispan/dispatcher/ChannelCommandDispatcherFactory.java b/clustering/server/infinispan/src/main/java/org/wildfly/clustering/server/infinispan/dispatcher/ChannelCommandDispatcherFactory.java index 649315720600..8f1868ddc0b2 100644 --- a/clustering/server/infinispan/src/main/java/org/wildfly/clustering/server/infinispan/dispatcher/ChannelCommandDispatcherFactory.java +++ b/clustering/server/infinispan/src/main/java/org/wildfly/clustering/server/infinispan/dispatcher/ChannelCommandDispatcherFactory.java @@ -33,6 +33,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; @@ -85,10 +86,11 @@ public class ChannelCommandDispatcherFactory implements AutoCloseableCommandDisp static final Optional NO_SUCH_SERVICE = Optional.of(NoSuchService.INSTANCE); static final ExceptionSupplier NO_SUCH_SERVICE_SUPPLIER = Functions.constantExceptionSupplier(NoSuchService.INSTANCE); + private static final ThreadFactory THREAD_FACTORY = new DefaultThreadFactory(ChannelCommandDispatcherFactory.class); private final ConcurrentMap members = new ConcurrentHashMap<>(); private final Map> contexts = new ConcurrentHashMap<>(); - private final ExecutorService executorService = Executors.newCachedThreadPool(new DefaultThreadFactory(this.getClass())); + private final ExecutorService executorService = Executors.newCachedThreadPool(THREAD_FACTORY); private final ServiceExecutor executor = new StampedLockServiceExecutor(); private final Map listeners = new ConcurrentHashMap<>(); private final AtomicReference view = new AtomicReference<>(); diff --git a/clustering/web/hotrod/src/main/java/org/wildfly/clustering/web/hotrod/session/HotRodSessionFactory.java b/clustering/web/hotrod/src/main/java/org/wildfly/clustering/web/hotrod/session/HotRodSessionFactory.java index fac36582fa3b..fab3686b835d 100644 --- a/clustering/web/hotrod/src/main/java/org/wildfly/clustering/web/hotrod/session/HotRodSessionFactory.java +++ b/clustering/web/hotrod/src/main/java/org/wildfly/clustering/web/hotrod/session/HotRodSessionFactory.java @@ -28,6 +28,7 @@ import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; @@ -66,6 +67,7 @@ */ @ClientListener public class HotRodSessionFactory extends CompositeSessionFactory implements Registrar> { + private static final ThreadFactory THREAD_FACTORY = new DefaultThreadFactory(HotRodSessionFactory.class); private final RemoteCache> creationMetaDataCache; private final RemoteCache accessMetaDataCache; @@ -90,7 +92,7 @@ public HotRodSessionFactory(HotRodSessionFactoryConfiguration config, SessionMet this.attributesRemover = attributesFactory; this.creationMetaDataCache = config.getCache(); this.accessMetaDataCache= config.getCache(); - this.executor = Executors.newFixedThreadPool(config.getExpirationThreadPoolSize(), new DefaultThreadFactory(this.getClass())); + this.executor = Executors.newFixedThreadPool(config.getExpirationThreadPoolSize(), THREAD_FACTORY); this.creationMetaDataCache.addClientListener(this); this.nearCacheEnabled = this.creationMetaDataCache.getRemoteCacheContainer().getConfiguration().remoteCaches().get(this.creationMetaDataCache.getName()).nearCacheMode().enabled(); } diff --git a/connector/pom.xml b/connector/pom.xml index 07816bb7945a..eee1aeb99da6 100644 --- a/connector/pom.xml +++ b/connector/pom.xml @@ -285,6 +285,11 @@ provided + + com.google.guava + guava + test + junit junit diff --git a/docs/src/main/asciidoc/_admin-guide/Management_Clients.adoc b/docs/src/main/asciidoc/_admin-guide/Management_Clients.adoc index 365e4d857759..b1c77faef07e 100644 --- a/docs/src/main/asciidoc/_admin-guide/Management_Clients.adoc +++ b/docs/src/main/asciidoc/_admin-guide/Management_Clients.adoc @@ -127,18 +127,6 @@ include::Default_HTTP_Interface_Security.adoc[leveloffset=+1] include::Default_Native_Interface_Security.adoc[leveloffset=+1] - -[[command-line-interface]] -== Command Line Interface - -The Command Line Interface (CLI) is a management tool for a managed -domain or standalone server. It allows a user to connect to the domain -controller or a standalone server and execute management operations -available through the de-typed management model. - -Details on how to use the CLI can be found in the -<>. - [[configuration-files]] == Configuration Files diff --git a/docs/src/main/asciidoc/_admin-guide/management-tasks/JVM_settings.adoc b/docs/src/main/asciidoc/_admin-guide/management-tasks/JVM_settings.adoc index b3ac552d22e9..47c07702f63f 100644 --- a/docs/src/main/asciidoc/_admin-guide/management-tasks/JVM_settings.adoc +++ b/docs/src/main/asciidoc/_admin-guide/management-tasks/JVM_settings.adoc @@ -113,6 +113,12 @@ This ability is useful when you need to configure JVM settings without specifyin } ---- +=== Other server properties that can be resolved as JVM options on domain mode + +In addition to the aforementioned server properties, the Host Controller can resolve the following `jboss.server-xyz` properties as JVM options: + +* jboss.server.name + == Standalone Server diff --git a/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/embedded-activemq.xml b/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/embedded-activemq.xml index 807a10174c89..645e890315b9 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/embedded-activemq.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/embedded-activemq.xml @@ -84,8 +84,4 @@ - - - - diff --git a/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/remoting.xml b/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/remoting.xml index 51b46df98808..c089f92fc6d7 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/remoting.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/remoting.xml @@ -1,10 +1,7 @@ - - - - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/unsecured-basic-profile.xml b/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/unsecured-basic-profile.xml index eea5337623df..f104db56d124 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/unsecured-basic-profile.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/unsecured-basic-profile.xml @@ -1,14 +1,6 @@ - - - - - - - - @@ -19,9 +11,8 @@ - - - + + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/bean-validation/layer-spec.xml b/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/bean-validation/layer-spec.xml index bfffcc52a19a..282fa2262456 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/bean-validation/layer-spec.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/bean-validation/layer-spec.xml @@ -1,7 +1,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/cdi/layer-spec.xml b/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/cdi/layer-spec.xml index b407784d16d7..b8417df711bd 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/cdi/layer-spec.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/cdi/layer-spec.xml @@ -1,7 +1,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/datasources/layer-spec.xml b/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/datasources/layer-spec.xml index 97d5100c3af2..d8e9c00434b0 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/datasources/layer-spec.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/datasources/layer-spec.xml @@ -1,7 +1,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/ee-security/layer-spec.xml b/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/ee-security/layer-spec.xml index faafc5cf8414..c860780ca1f5 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/ee-security/layer-spec.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/ee-security/layer-spec.xml @@ -1,7 +1,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/embedded-activemq/layer-spec.xml b/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/embedded-activemq/layer-spec.xml index 8e38aac5904c..b90f647024da 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/embedded-activemq/layer-spec.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/embedded-activemq/layer-spec.xml @@ -19,4 +19,5 @@ - \ No newline at end of file + + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/h2-datasource/layer-spec.xml b/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/h2-datasource/layer-spec.xml index 8f623817f2de..acbdab9bd043 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/h2-datasource/layer-spec.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/h2-datasource/layer-spec.xml @@ -4,7 +4,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/jaxrs/layer-spec.xml b/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/jaxrs/layer-spec.xml index 60b12757d8fb..dbd31c13295b 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/jaxrs/layer-spec.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/jaxrs/layer-spec.xml @@ -1,7 +1,8 @@ - + + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/jpa/layer-spec.xml b/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/jpa/layer-spec.xml index 3249b61f59ae..cec0a71704ca 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/jpa/layer-spec.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/jpa/layer-spec.xml @@ -1,9 +1,9 @@ - + - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/jsonp/layer-spec.xml b/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/jsonp/layer-spec.xml index ae8516842cda..f6c35a49c1d9 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/jsonp/layer-spec.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/jsonp/layer-spec.xml @@ -1,7 +1,11 @@ - + + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/servlet/layer-spec.xml b/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/servlet/layer-spec.xml index e535af4ece4e..9c15c007d839 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/servlet/layer-spec.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/servlet/layer-spec.xml @@ -1,9 +1,9 @@ - + - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/webservices/layer-spec.xml b/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/webservices/layer-spec.xml index 65d6c26c8446..b03e256d3021 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/webservices/layer-spec.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/layers/standalone/webservices/layer-spec.xml @@ -1,8 +1,8 @@ - - + + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/jakarta/enterprise/api/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/jakarta/enterprise/api/main/module.xml index d452f1f5f698..3ad049fb0445 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/jakarta/enterprise/api/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/jakarta/enterprise/api/main/module.xml @@ -30,7 +30,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/jakarta/faces/api/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/jakarta/faces/api/main/module.xml index d43b7c9b3dda..14ccb90f0491 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/jakarta/faces/api/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/jakarta/faces/api/main/module.xml @@ -65,7 +65,7 @@ - - + + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/jakarta/faces/impl/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/jakarta/faces/impl/main/module.xml index a338ee812464..9c5bf99dc50c 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/jakarta/faces/impl/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/jakarta/faces/impl/main/module.xml @@ -48,7 +48,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/jakarta/servlet/jsp/api/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/jakarta/servlet/jsp/api/main/module.xml index aedcc499a21f..fdf8004c34a4 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/jakarta/servlet/jsp/api/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/jakarta/servlet/jsp/api/main/module.xml @@ -31,6 +31,6 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/impl/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/impl/main/module.xml index 4dad7e6a62f3..dafa79b0e181 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/impl/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/impl/main/module.xml @@ -81,7 +81,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/main/module.xml index 5d51742c54be..dc458562b9c7 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/main/module.xml @@ -51,7 +51,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/services-sts/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/services-sts/main/module.xml index a00008709e05..d7953cc3f24d 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/services-sts/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/services-sts/main/module.xml @@ -59,7 +59,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/ws-security/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/ws-security/main/module.xml index ed788e4e9841..a03c89e20ca7 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/ws-security/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/cxf/ws-security/main/module.xml @@ -30,7 +30,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/santuario/xmlsec/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/santuario/xmlsec/main/module.xml index c4c34f27de76..646e6586ae79 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/santuario/xmlsec/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/santuario/xmlsec/main/module.xml @@ -40,7 +40,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/ws/security/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/ws/security/main/module.xml index 6aa83e791403..bfa8abaaabcc 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/ws/security/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/apache/ws/security/main/module.xml @@ -37,7 +37,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/jipijapa-hibernate6/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/jipijapa-hibernate6/main/module.xml index c3b41509106d..a9490b0f3fea 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/jipijapa-hibernate6/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/jipijapa-hibernate6/main/module.xml @@ -46,7 +46,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/main/module.xml index 336e0dc91018..7c606ec441fe 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/main/module.xml @@ -46,7 +46,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/search/engine/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/search/engine/main/module.xml index 4581c986cd8d..39756b2ae8c5 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/search/engine/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/search/engine/main/module.xml @@ -33,7 +33,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/search/jipijapa-hibernatesearch/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/search/jipijapa-hibernatesearch/main/module.xml index f1579cf92b29..8f0cf1581e50 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/search/jipijapa-hibernatesearch/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/search/jipijapa-hibernatesearch/main/module.xml @@ -34,7 +34,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/search/mapper/orm/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/search/mapper/orm/main/module.xml index d99085ecb9f7..53e494d01d32 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/search/mapper/orm/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/search/mapper/orm/main/module.xml @@ -35,7 +35,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/search/mapper/pojo/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/search/mapper/pojo/main/module.xml index 55278bc7bb64..ef971bdc7f6c 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/search/mapper/pojo/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/search/mapper/pojo/main/module.xml @@ -30,7 +30,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/validator/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/validator/main/module.xml index 32e32da711f3..420118236c19 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/validator/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/hibernate/validator/main/module.xml @@ -36,7 +36,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/infinispan/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/infinispan/main/module.xml index a21b0ce175b5..03bde92b0884 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/infinispan/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/infinispan/main/module.xml @@ -41,7 +41,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/connector/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/connector/main/module.xml index 897a3f1514d0..2520c9f4a11c 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/connector/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/connector/main/module.xml @@ -63,7 +63,7 @@ - + @@ -81,7 +81,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/ee/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/ee/main/module.xml index 14530058a10a..477c42b1735c 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/ee/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/ee/main/module.xml @@ -44,7 +44,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/ejb3/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/ejb3/main/module.xml index 377ec5164168..049ff44f09d8 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/ejb3/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/ejb3/main/module.xml @@ -87,7 +87,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/jaxrs/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/jaxrs/main/module.xml index ee4a7c1de9d4..f09f9a1d2b0b 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/jaxrs/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/jaxrs/main/module.xml @@ -51,7 +51,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/main/module.xml index fd2e06bbc419..4a62aeaf2f6b 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/main/module.xml @@ -59,7 +59,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/spi/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/spi/main/module.xml index 3b1cc9127f5b..64391fd124b7 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/spi/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/spi/main/module.xml @@ -36,7 +36,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/jsf/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/jsf/main/module.xml index f0e208034128..65cb07e70a3e 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/jsf/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/jsf/main/module.xml @@ -46,7 +46,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/mail/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/mail/main/module.xml index 9043a99b9841..f0ab96f31ccd 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/mail/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/mail/main/module.xml @@ -45,7 +45,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/sar/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/sar/main/module.xml index bfc338d21c60..50fe8e202875 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/sar/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/sar/main/module.xml @@ -53,9 +53,5 @@ - - diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/transactions/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/transactions/main/module.xml index 186f436ffd05..3eee557ec649 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/transactions/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/transactions/main/module.xml @@ -55,7 +55,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/main/module.xml index a6ee2aca4cdf..e9bed355ad78 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/main/module.xml @@ -44,7 +44,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/server/integration/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/server/integration/main/module.xml index 56ee732c77ec..aa1312f99fbf 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/server/integration/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/server/integration/main/module.xml @@ -32,7 +32,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/weld/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/weld/main/module.xml index ae7b80b10f1f..3133f43764b9 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/weld/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/weld/main/module.xml @@ -57,8 +57,8 @@ - - + + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/xts/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/xts/main/module.xml index df0860ffd11b..c78f27b84051 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/xts/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/as/xts/main/module.xml @@ -54,7 +54,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/jaxbintros/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/jaxbintros/main/module.xml index dce38cc7e2dc..3020bc66b7f8 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/jaxbintros/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/jaxbintros/main/module.xml @@ -34,7 +34,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-atom-provider/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-atom-provider/main/module.xml index ffcd75908f67..fdc75bdc2823 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-atom-provider/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-atom-provider/main/module.xml @@ -29,7 +29,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxb-provider/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxb-provider/main/module.xml index ae6c3eccfd3a..399f96d73dcd 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxb-provider/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxb-provider/main/module.xml @@ -29,7 +29,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/weld/core/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/weld/core/main/module.xml index 2892cef7e173..f1a8cf5b8aed 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/weld/core/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/weld/core/main/module.xml @@ -44,7 +44,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-client/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-client/main/module.xml index a90cb07c598b..7a520b0eb3c0 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-client/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-client/main/module.xml @@ -39,7 +39,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/datasources-agroal/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/datasources-agroal/main/module.xml index 9752b8b69a51..942d545f7494 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/datasources-agroal/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/datasources-agroal/main/module.xml @@ -42,7 +42,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/ee-security/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/ee-security/main/module.xml index 89736aede78a..de33217f675f 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/ee-security/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/ee-security/main/module.xml @@ -47,6 +47,6 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/messaging-activemq/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/messaging-activemq/main/module.xml index 3be7b87b52c9..493bf25f09d8 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/messaging-activemq/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/messaging-activemq/main/module.xml @@ -81,7 +81,7 @@ - + @@ -89,8 +89,6 @@ - - diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/rts/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/rts/main/module.xml index d155cd4a6af7..cd75d43d4d49 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/rts/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/rts/main/module.xml @@ -49,7 +49,7 @@ - + diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/undertow/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/undertow/main/module.xml index 136ecc7f5284..dfef0383750e 100644 --- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/undertow/main/module.xml +++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/undertow/main/module.xml @@ -52,7 +52,7 @@ - + diff --git a/ee-feature-pack/layer-metadata-tests/pom.xml b/ee-feature-pack/layer-metadata-tests/pom.xml new file mode 100644 index 000000000000..f0d319bd7fb4 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/pom.xml @@ -0,0 +1,274 @@ + + + + + + 4.0.0 + + + org.wildfly + wildfly-ee-feature-pack-parent + + 30.0.0.Beta1-SNAPSHOT + + + wildfly-ee-galleon-pack-layer-tests + + WildFly: EE Full Galleon Pack Layer Tests + Tests for the layer metadata rules + jar + + + + ${ee.maven.groupId} + wildfly-ee-galleon-pack + zip + test + + + + ${ee.maven.groupId} + wildfly-clustering-singleton-api + test + + + + org.jboss.spec.jakarta.xml.ws + jboss-jakarta-xml-ws-api_4.0_spec + test + + + jakarta.batch + jakarta.batch-api + test + + + jakarta.annotation + jakarta.annotation-api + test + + + jakarta.authentication + jakarta.authentication-api + test + + + jakarta.authorization + jakarta.authorization-api + test + + + jakarta.ejb + jakarta.ejb-api + test + + + jakarta.enterprise + jakarta.enterprise.cdi-api + test + + + jakarta.enterprise.concurrent + jakarta.enterprise.concurrent-api + test + + + jakarta.inject + jakarta.inject-api + test + + + jakarta.faces + jakarta.faces-api + test + + + jakarta.jms + jakarta.jms-api + test + + + jakarta.json + jakarta.json-api + test + + + jakarta.json.bind + jakarta.json.bind-api + test + + + jakarta.mail + jakarta.mail-api + test + + + jakarta.persistence + jakarta.persistence-api + test + + + jakarta.security.enterprise + jakarta.security.enterprise-api + test + + + jakarta.servlet + jakarta.servlet-api + test + + + jakarta.transaction + jakarta.transaction-api + test + + + jakarta.validation + jakarta.validation-api + test + + + jakarta.websocket + jakarta.websocket-api + test + + + jakarta.websocket + jakarta.websocket-client-api + test + + + + jakarta.ws.rs + jakarta.ws.rs-api + test + + + jakarta.xml.bind + jakarta.xml.bind-api + test + + + junit + junit + test + + + org.jboss.logmanager + jboss-logmanager + test + + + org.jboss.shrinkwrap + shrinkwrap-impl-base + test + + + org.jboss.shrinkwrap + shrinkwrap-api + test + + + org.hibernate.search + hibernate-search-engine + test + + + org.hibernate.search + hibernate-search-mapper-pojo-base + test + + + org.wildfly.glow + wildfly-glow-core + test + + + org.wildfly.glow + wildfly-glow-maven-resolver + test + + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + ban-bad-dependencies + none + + + + + org.apache.maven.plugins + maven-resources-plugin + + + copy-provisioning-xml + validate + + copy-resources + + + ${project.build.testOutputDirectory}/glow/${project.version} + + + ${project.basedir}/src/test/resources/glow/latest + true + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${settings.localRepository} + + + + + + + src/test/resources + + glow/latest/* + + true + + + + diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/AbstractLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/AbstractLayerMetaDataTestCase.java new file mode 100644 index 000000000000..b5efd830299d --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/AbstractLayerMetaDataTestCase.java @@ -0,0 +1,302 @@ +package org.wildfly.ee.feature.pack.layer.tests; + +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.container.ClassContainer; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.wildfly.glow.Arguments; +import org.wildfly.glow.GlowMessageWriter; +import org.wildfly.glow.GlowSession; +import org.wildfly.glow.ScanArguments; +import org.wildfly.glow.ScanResults; +import org.wildfly.glow.maven.MavenResolver; + +import java.io.IOException; +import java.nio.file.FileVisitResult; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.attribute.BasicFileAttributes; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.Stack; +import java.util.function.BiConsumer; +import java.util.function.Consumer; +import java.util.stream.Collectors; + +public class AbstractLayerMetaDataTestCase { + + private static String URL_PROPERTY = "wildfly-glow-galleon-feature-packs-url"; + protected static Path ARCHIVES_PATH = Paths.get("target/glow-archives"); + + private boolean checkMethodCalled; + + @BeforeClass + public static void prepareArchivesDirectory() throws Exception { + Path glowXmlPath = Path.of("target/test-classes/glow"); + System.setProperty(URL_PROPERTY, glowXmlPath.toUri().toString()); + if (Files.exists(ARCHIVES_PATH)) { + deleteArchivesDirectory(); + } + Files.createDirectories(ARCHIVES_PATH); + } + + @Before + public void before() { + checkMethodCalled = false; + } + + @After + public void after() { + Assert.assertTrue(checkMethodCalled); + } + + protected static String createXmlElementWithContent(String content, String... path) { + StringBuilder sb = new StringBuilder(); + Stack stack = new Stack<>(); + for (String element : path) { + sb.append("<" + element + ">"); + stack.push(element); + } + if (content != null) { + sb.append(content); + } + while (!stack.empty()) { + sb.append(""); + } + return sb.toString(); + } + + + protected Set checkLayersForArchive(Path archivePath, String...expectedLayers) { + return checkLayersForArchive(archivePath, null, expectedLayers); + } + + protected Set checkLayersForArchive(Path archivePath, ExpectedLayers expectedLayers) { + return checkLayersForArchive(archivePath, null, expectedLayers); + } + + protected Set checkLayersForArchive(Path archivePath, Consumer argumentsAugmenter, String...expectedLayers) { + return checkLayersForArchive(archivePath, argumentsAugmenter, new ExpectedLayers(expectedLayers)); + } + + protected Set checkLayersForArchive(Path archivePath, Consumer argumentsAugmenter, ExpectedLayers expectedLayers) { + checkMethodCalled = true; + try { + checkMethodCalled = true; + ScanArguments.Builder argumentsBuilder = Arguments.scanBuilder().setBinaries(Collections.singletonList(archivePath)); + if (argumentsAugmenter != null) { + argumentsAugmenter.accept(argumentsBuilder); + } + Arguments arguments = argumentsBuilder.build(); + ScanResults scanResults = GlowSession.scan(MavenResolver.newMavenResolver(), arguments, GlowMessageWriter.DEFAULT); + + Set foundLayers = scanResults.getDiscoveredLayers().stream().map(l -> l.getName()).collect(Collectors.toSet()); + Set foundDecorators = scanResults.getDecorators().stream().map(l -> l.getName()).collect(Collectors.toSet()); + + checkLayers(expectedLayers.getExpectedFoundLayers(), foundLayers); + checkLayers(expectedLayers.getExpectedDecorators(), foundDecorators); + + return foundLayers; + } catch (Exception e) { + if (e instanceof RuntimeException) throw (RuntimeException)e; + throw new RuntimeException(e); + } + } + + + private void checkLayers(Set expectedLayers, Set foundLayers) { + //foundLayers.removeAll(standardExpectedLayers); + + Assert.assertEquals("\nExpected:\n" + expectedLayers + "\nActual:\n" + foundLayers, + expectedLayers.size(), foundLayers.size()); + + for (String expectedLayer : expectedLayers) { + Assert.assertTrue(expectedLayer + ": " + foundLayers, foundLayers.contains(expectedLayer)); + } + } + + protected ArchiveBuilder createArchiveBuilder(ArchiveType type) { + return new ArchiveBuilder("test-" + System.currentTimeMillis() + "." + type.suffix, type); + } + + protected ArchiveBuilder createArchiveBuilder(String name, ArchiveType type) { + return new ArchiveBuilder(name, type); + } + + private static void deleteArchivesDirectory() throws IOException { + if (Files.exists(ARCHIVES_PATH)) { + Files.walkFileTree(ARCHIVES_PATH, new SimpleFileVisitor<>() { + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { + Files.delete(file); + return FileVisitResult.CONTINUE; + } + + @Override + public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException { + Files.delete(dir); + return FileVisitResult.CONTINUE; + } + }); + } + } + + public class ArchiveBuilder { + private final String name; + private final ArchiveType type; + private Map xmlContents = new HashMap<>(); + private Set webInfClassesMetaInfXmls = new HashSet<>(); + private List> classes = new ArrayList<>(); + + private ArchiveBuilder(String name, ArchiveType type) { + this.name = name; + this.type = type; + } + + public ArchiveBuilder addXml(String name, String contents) { + return addXml(name, contents, false); + } + + public ArchiveBuilder addXml(String name, String contents, boolean webInfClassesMetaInf) { + if (webInfClassesMetaInf) { + if (type != ArchiveType.WAR) { + throw new IllegalStateException("Can only specify webInfClassesMetaInf for wars"); + } + webInfClassesMetaInfXmls.add(name); + } + xmlContents.put(name, contents); + return this; + } + + public ArchiveBuilder addClasses(Class... classes) { + this.classes.addAll(Arrays.asList(classes)); + return this; + } + + public Path build() { + if (type == ArchiveType.WAR) { + WebArchive war = ShrinkWrap.create(WebArchive.class, name); + addXmlContents((name, xml) -> { + if (webInfClassesMetaInfXmls.contains(name)) { + name = "classes/META-INF/" + name; + } + war.addAsWebInfResource(xml, name); + }); + addClasses(war); + return export(war); + } else if (type == ArchiveType.JAR || type == ArchiveType.RAR || type == ArchiveType.SAR) { + JavaArchive jar = ShrinkWrap.create(JavaArchive.class, name); + addXmlContents((name, xml) -> jar.addAsManifestResource(xml, name)); + addClasses(jar); + return export(jar); + } + + // TODO handle other archive types as needed + + return null; + } + + private void addXmlContents(BiConsumer consumer) { + for (Map.Entry xml : xmlContents.entrySet()) { + consumer.accept(xml.getKey(), new StringAsset(xml.getValue())); + } + } + + private void addClasses(ClassContainer classContainer) { + for (Class clazz : classes) { + classContainer.addClass(clazz); + } + } + + private Path export(Archive archive) { + //System.out.println(archive.toString(true)); + ZipExporter zipExporter = archive.as(ZipExporter.class); + Path path = ARCHIVES_PATH.resolve(name); + zipExporter.exportTo(path.toFile()); + return path; + } + } + + public enum ArchiveType { + WAR("war"), + JAR("jar"), + RAR("rar"), + SAR("sar"); + + private final String suffix; + + ArchiveType(String suffix) { + this.suffix = suffix; + } + } + + + public class ExpectedLayers { + private Set layers = new HashSet<>(); + private Set decoratorLayers = new HashSet<>(); + private Set excludedLayers = new HashSet<>(); + + public ExpectedLayers() { + } + + public ExpectedLayers(String layer) { + addLayer(layer); + } + + public ExpectedLayers(String... layers) { + this.layers.addAll(Arrays.asList(layers)); + } + + public ExpectedLayers(String layer, String decorator) { + addLayerAndDecorator(layer, decorator); + } + + public ExpectedLayers addLayer(String layer) { + this.layers.add(layer); + return this; + } + + public ExpectedLayers addLayerAndDecorator(String layer, String decorator) { + layers.add(layer); + decoratorLayers.add(decorator); + return this; + } + + public ExpectedLayers addDecorator(String decorator) { + decoratorLayers.add(decorator); + return this; + } + + public ExpectedLayers excludedLayers(String...excludedDecorators) { + excludedLayers.addAll(Arrays.asList(excludedDecorators)); + return this; + } + + private Set getExpectedFoundLayers() { + return layers; + } + + private Set getExpectedDecorators() { + Set decorators = new HashSet<>(); + for (String decorator : decoratorLayers) { + decorators.add(decorator); + } + return decorators; + } + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/batch/jberet/BatchClassFromApiPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/batch/jberet/BatchClassFromApiPackageUsage.java new file mode 100644 index 000000000000..977b8b7f503f --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/batch/jberet/BatchClassFromApiPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.batch.jberet; + +import jakarta.batch.api.Decider; + +public class BatchClassFromApiPackageUsage { + Decider decider; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/batch/jberet/BatchClassInApiChunkListenerPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/batch/jberet/BatchClassInApiChunkListenerPackageUsage.java new file mode 100644 index 000000000000..94679f97d1b0 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/batch/jberet/BatchClassInApiChunkListenerPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.batch.jberet; + +import jakarta.batch.api.chunk.listener.AbstractChunkListener; + +public class BatchClassInApiChunkListenerPackageUsage { + AbstractChunkListener abstractChunkListener; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/batch/jberet/BatchClassInApiChunkPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/batch/jberet/BatchClassInApiChunkPackageUsage.java new file mode 100644 index 000000000000..4e701381acf7 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/batch/jberet/BatchClassInApiChunkPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.batch.jberet; + +import jakarta.batch.api.chunk.ItemReader; + +public class BatchClassInApiChunkPackageUsage { + ItemReader itemReader; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/batch/jberet/BatchClassInApiListenerPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/batch/jberet/BatchClassInApiListenerPackageUsage.java new file mode 100644 index 000000000000..fbd8ae226424 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/batch/jberet/BatchClassInApiListenerPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.batch.jberet; + +import jakarta.batch.api.listener.AbstractJobListener; + +public class BatchClassInApiListenerPackageUsage { + AbstractJobListener abstractJobListener; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/batch/jberet/BatchClassInApiPartitionPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/batch/jberet/BatchClassInApiPartitionPackageUsage.java new file mode 100644 index 000000000000..f3214b3b46f7 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/batch/jberet/BatchClassInApiPartitionPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.batch.jberet; + +import jakarta.batch.api.partition.AbstractPartitionAnalyzer; + +public class BatchClassInApiPartitionPackageUsage { + AbstractPartitionAnalyzer abstractPartitionAnalyzer; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/batch/jberet/BatchJBeretLayerTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/batch/jberet/BatchJBeretLayerTestCase.java new file mode 100644 index 000000000000..1b3d1f77f5f9 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/batch/jberet/BatchJBeretLayerTestCase.java @@ -0,0 +1,64 @@ +package org.wildfly.ee.feature.pack.layer.tests.batch.jberet; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Files; +import java.nio.file.Path; + +import static org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase.ArchiveType.WAR; + +public class BatchJBeretLayerTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testBatchJBeretDetectedFileInWar() throws Exception { + // Not sure how to add an empty folder with shrinkwrap so do this manually + Path p = ARCHIVES_PATH.resolve("batch-jberet-file.war"); + Files.createDirectories(p.resolve("WEB-INF/classes/META-INF/batch-jobs")); + checkLayersForArchive(p); + } + + @Test + public void testBatchJBeretClassInRootPackage() { + Path p = createArchiveBuilder(WAR) + .addClasses(BatchClassFromApiPackageUsage.class) + .build(); + checkLayersForArchive(p); + } + + @Test + public void testBatchJBeretClassInChunkPackage() { + Path p = createArchiveBuilder(WAR) + .addClasses(BatchClassInApiChunkPackageUsage.class) + .build(); + checkLayersForArchive(p); + } + + @Test + public void testBatchJBeretInChunkListenerPackage() { + Path p = createArchiveBuilder(WAR) + .addClasses(BatchClassInApiChunkListenerPackageUsage.class) + .build(); + checkLayersForArchive(p); + } + + @Test + public void testBatchJBeretInListenerPackage() { + Path p = createArchiveBuilder(WAR) + .addClasses(BatchClassInApiListenerPackageUsage.class) + .build(); + checkLayersForArchive(p); + } + + @Test + public void testBatchJBeretInPartitionPackage() { + Path p = createArchiveBuilder(WAR) + .addClasses(BatchClassInApiPartitionPackageUsage.class) + .build(); + checkLayersForArchive(p); + } + + private void checkLayersForArchive(Path p) { + checkLayersForArchive(p, new ExpectedLayers("batch-jberet", "batch-jberet")); + } + +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationAnnotationInConstraintValidationPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationAnnotationInConstraintValidationPackageUsage.java new file mode 100644 index 000000000000..be6af4401964 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationAnnotationInConstraintValidationPackageUsage.java @@ -0,0 +1,8 @@ +package org.wildfly.ee.feature.pack.layer.tests.bean.validation; + +import jakarta.validation.constraintvalidation.SupportedValidationTarget; +import jakarta.validation.constraintvalidation.ValidationTarget; + +@SupportedValidationTarget(ValidationTarget.ANNOTATED_ELEMENT) +public class BeanValidationAnnotationInConstraintValidationPackageUsage { +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationAnnotationInConstraintsPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationAnnotationInConstraintsPackageUsage.java new file mode 100644 index 000000000000..028d79880fef --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationAnnotationInConstraintsPackageUsage.java @@ -0,0 +1,8 @@ +package org.wildfly.ee.feature.pack.layer.tests.bean.validation; + +import jakarta.validation.constraints.Email; + +public class BeanValidationAnnotationInConstraintsPackageUsage { + @Email + String email; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationAnnotationInGroupsPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationAnnotationInGroupsPackageUsage.java new file mode 100644 index 000000000000..e92b106654d2 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationAnnotationInGroupsPackageUsage.java @@ -0,0 +1,8 @@ +package org.wildfly.ee.feature.pack.layer.tests.bean.validation; + +import jakarta.validation.groups.ConvertGroup; + +public class BeanValidationAnnotationInGroupsPackageUsage { + @ConvertGroup(to=BeanValidationAnnotationInGroupsPackageUsage.class) + String convertGroup; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationAnnotationInRootPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationAnnotationInRootPackageUsage.java new file mode 100644 index 000000000000..934628793566 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationAnnotationInRootPackageUsage.java @@ -0,0 +1,8 @@ +package org.wildfly.ee.feature.pack.layer.tests.bean.validation; + +import jakarta.validation.constraints.Email; + +public class BeanValidationAnnotationInRootPackageUsage { + @Email + String s; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationAnnotationInValueExtractionPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationAnnotationInValueExtractionPackageUsage.java new file mode 100644 index 000000000000..f63643f53240 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationAnnotationInValueExtractionPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.bean.validation; + +import jakarta.validation.valueextraction.ExtractedValue; + +public class BeanValidationAnnotationInValueExtractionPackageUsage { + ExtractedValue extractedValue; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationAnnotatonInExecutablePackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationAnnotatonInExecutablePackageUsage.java new file mode 100644 index 000000000000..a38a2d91b987 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationAnnotatonInExecutablePackageUsage.java @@ -0,0 +1,10 @@ +package org.wildfly.ee.feature.pack.layer.tests.bean.validation; + +import jakarta.validation.executable.ValidateOnExecution; + +public class BeanValidationAnnotatonInExecutablePackageUsage { + @ValidateOnExecution + BeanValidationAnnotatonInExecutablePackageUsage() { + + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationClassInBootstrapPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationClassInBootstrapPackageUsage.java new file mode 100644 index 000000000000..bb1e4fece2f0 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationClassInBootstrapPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.bean.validation; + +import jakarta.validation.bootstrap.GenericBootstrap; + +public class BeanValidationClassInBootstrapPackageUsage { + GenericBootstrap genericBootstrap; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationClassInConstraintValidationPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationClassInConstraintValidationPackageUsage.java new file mode 100644 index 000000000000..8d3290ee44a7 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationClassInConstraintValidationPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.bean.validation; + +import jakarta.validation.constraintvalidation.ValidationTarget; + +public class BeanValidationClassInConstraintValidationPackageUsage { + ValidationTarget validationTarget; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationClassInExecutablePackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationClassInExecutablePackageUsage.java new file mode 100644 index 000000000000..39fdd0ed86de --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationClassInExecutablePackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.bean.validation; + +import jakarta.validation.executable.ExecutableType; + +public class BeanValidationClassInExecutablePackageUsage { + ExecutableType executableType; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationClassInGroupsPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationClassInGroupsPackageUsage.java new file mode 100644 index 000000000000..1bf3074403db --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationClassInGroupsPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.bean.validation; + +import jakarta.validation.groups.Default; + +public class BeanValidationClassInGroupsPackageUsage { + Default aDefault; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationClassInMetadataPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationClassInMetadataPackageUsage.java new file mode 100644 index 000000000000..2f4afe2cf0e5 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationClassInMetadataPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.bean.validation; + +import jakarta.validation.metadata.BeanDescriptor; + +public class BeanValidationClassInMetadataPackageUsage { + BeanDescriptor beanDescriptor; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationClassInRootPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationClassInRootPackageUsage.java new file mode 100644 index 000000000000..1005b17623c6 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationClassInRootPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.bean.validation; + +import jakarta.validation.Configuration; + +public class BeanValidationClassInRootPackageUsage { + Configuration configuration; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationClassInSpiPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationClassInSpiPackageUsage.java new file mode 100644 index 000000000000..1291c110c8b1 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationClassInSpiPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.bean.validation; + +import jakarta.validation.spi.BootstrapState; + +public class BeanValidationClassInSpiPackageUsage { + BootstrapState bootstrapState; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationClassInValueExtractionPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationClassInValueExtractionPackageUsage.java new file mode 100644 index 000000000000..6e41f05c42b5 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationClassInValueExtractionPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.bean.validation; + +import jakarta.validation.valueextraction.ValueExtractor; + +public class BeanValidationClassInValueExtractionPackageUsage { + ValueExtractor valueExtractor; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationLayerTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationLayerTestCase.java new file mode 100644 index 000000000000..fe16ee781d78 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/bean/validation/BeanValidationLayerTestCase.java @@ -0,0 +1,89 @@ +package org.wildfly.ee.feature.pack.layer.tests.bean.validation; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +import static org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase.ArchiveType.WAR; + +public class BeanValidationLayerTestCase extends AbstractLayerMetaDataTestCase { + + @Test + public void testBeanValidationAnnotationInRootPackageUsage() { + testClass(BeanValidationAnnotationInRootPackageUsage.class); + } + + @Test + public void testBeanValidationAnnotationInConstraintValidationPackageUsage() { + testClass(BeanValidationAnnotationInConstraintValidationPackageUsage.class); + } + + @Test + public void testBeanValidationAnnotationInConstraintsPackageUsage() { + testClass(BeanValidationAnnotationInConstraintsPackageUsage.class); + } + + @Test + public void testBeanValidationAnnotationInGroupsPackageUsage() { + testClass(BeanValidationAnnotationInGroupsPackageUsage.class); + } + + @Test + public void testBeanValidationAnnotationInValueExtractionPackageUsage() { + testClass(BeanValidationAnnotationInValueExtractionPackageUsage.class); + } + + @Test + public void testBeanValidationAnnotatonInExecutablePackageUsage() { + testClass(BeanValidationAnnotatonInExecutablePackageUsage.class); + } + + @Test + public void testBeanValidationClassInRootPackageUsage() { + testClass(BeanValidationClassInRootPackageUsage.class); + } + + @Test + public void testBeanValidationClassInBootstrapPackageUsage() { + testClass(BeanValidationClassInBootstrapPackageUsage.class); + } + + @Test + public void testBeanValidationClassInConstraintValidationPackageUsage() { + testClass(BeanValidationClassInConstraintValidationPackageUsage.class); + } + + @Test + public void testBeanValidationClassInExecutablePackageUsage() { + testClass(BeanValidationClassInExecutablePackageUsage.class); + } + + @Test + public void testBeanValidationClassInGroupsPackageUsage() { + testClass(BeanValidationClassInGroupsPackageUsage.class); + } + + @Test + public void testBeanValidationClassInMetadataPackageUsage() { + testClass(BeanValidationClassInMetadataPackageUsage.class); + } + + @Test + public void testBeanValidationClassInSpiPackageUsage() { + testClass(BeanValidationClassInSpiPackageUsage.class); + } + + @Test + public void testBeanValidationClassInValueExtractionPackageUsage() { + testClass(BeanValidationClassInValueExtractionPackageUsage.class); + } + + private void testClass(Class clazz) { + Path p = createArchiveBuilder(WAR) + .addClasses(clazz) + .build(); + // bean-validation is a dependency of the ee-core-profile-server so it doesn't show up as a decorator + checkLayersForArchive(p, "bean-validation"); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/cdi/CdiEnterpriseContextClass.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/cdi/CdiEnterpriseContextClass.java new file mode 100644 index 000000000000..760503798cb3 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/cdi/CdiEnterpriseContextClass.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.cdi; + +import jakarta.enterprise.context.ApplicationScoped; + +@ApplicationScoped +public class CdiEnterpriseContextClass { +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/cdi/CdiInjectClass.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/cdi/CdiInjectClass.java new file mode 100644 index 000000000000..fe4aed58a1fc --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/cdi/CdiInjectClass.java @@ -0,0 +1,8 @@ +package org.wildfly.ee.feature.pack.layer.tests.cdi; + +import jakarta.inject.Inject; + +public class CdiInjectClass { + @Inject + String s; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/cdi/CdiLayerTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/cdi/CdiLayerTestCase.java new file mode 100644 index 000000000000..575d42aa0894 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/cdi/CdiLayerTestCase.java @@ -0,0 +1,52 @@ +package org.wildfly.ee.feature.pack.layer.tests.cdi; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +import static org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase.ArchiveType.JAR; +import static org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase.ArchiveType.WAR; + +public class CdiLayerTestCase extends AbstractLayerMetaDataTestCase { + + @Test + public void testCdiDetectedFileInWar() { + Path p = createArchiveBuilder(WAR) + .addXml("beans.xml", "") + .build(); + checkLayersForArchive(p); + } + + @Test + public void testCdiDetectedFileInJar() { + Path p = createArchiveBuilder(JAR) + .addXml("beans.xml", "") + .build(); + checkLayersForArchive(p); + } + + @Test + public void testInjectPackage() { + Path p = createArchiveBuilder(WAR) + .addClasses(CdiInjectClass.class) + .build(); + checkLayersForArchive(p); + } + + @Test + public void testEnterpriseContext() { + //This is in a sub-package of jakarta.enterprise.context + Path p = createArchiveBuilder(WAR) + .addClasses(CdiEnterpriseContextClass.class) + .build(); + // cdi is a dependency of the ee-core-profile-server so it doesn't show up as a decorator + checkLayersForArchive(p); + } + + private void checkLayersForArchive(Path p) { + // cdi is a dependency of the ee-core-profile-server so it doesn't show up as a decorator + checkLayersForArchive(p, "cdi"); + } + +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/datasources/DatasourcesLayerMetadataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/datasources/DatasourcesLayerMetadataTestCase.java new file mode 100644 index 000000000000..269ac44b9cb2 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/datasources/DatasourcesLayerMetadataTestCase.java @@ -0,0 +1,28 @@ +package org.wildfly.ee.feature.pack.layer.tests.datasources; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class DatasourcesLayerMetadataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testJavaSqlUsageDetected() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(JavaSqlUsage.class) + .build(); + checkLayersForArchive(p); + } + + @Test + public void testJavaxSqlUsageDetected() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(JavaxSqlUsage.class) + .build(); + checkLayersForArchive(p); + } + + private void checkLayersForArchive(Path p) { + checkLayersForArchive(p, new ExpectedLayers("datasources", "datasources")); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/datasources/JavaSqlUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/datasources/JavaSqlUsage.java new file mode 100644 index 000000000000..6ad22d16127a --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/datasources/JavaSqlUsage.java @@ -0,0 +1,11 @@ +package org.wildfly.ee.feature.pack.layer.tests.datasources; + +import java.sql.Connection; + +public class JavaSqlUsage { + Connection connection; + // Usage from the method doesn't trigger the rule. It seems to need to be a field + //public void useConnection() { + // Connection connection = null; + //} +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/datasources/JavaxSqlUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/datasources/JavaxSqlUsage.java new file mode 100644 index 000000000000..da9be1272203 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/datasources/JavaxSqlUsage.java @@ -0,0 +1,11 @@ +package org.wildfly.ee.feature.pack.layer.tests.datasources; + +import javax.sql.CommonDataSource; + +public class JavaxSqlUsage { + CommonDataSource commonDataSource; + // Usage from the method doesn't trigger the rule. It seems to need to be a field + //public void useCommonDatasource() { + // CommonDataSource commonDataSource = null; + //} +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/concurrency/EeConcurrencyClassUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/concurrency/EeConcurrencyClassUsage.java new file mode 100644 index 000000000000..6f94532a4940 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/concurrency/EeConcurrencyClassUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.concurrency; + +import jakarta.enterprise.concurrent.ManagedThreadFactory; + +public class EeConcurrencyClassUsage { + ManagedThreadFactory managedThreadFactory; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/concurrency/EeConcurrencyLayerMetadataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/concurrency/EeConcurrencyLayerMetadataTestCase.java new file mode 100644 index 000000000000..b8358dc018bc --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/concurrency/EeConcurrencyLayerMetadataTestCase.java @@ -0,0 +1,17 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.concurrency; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class EeConcurrencyLayerMetadataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testEeConcurrencyUsageDetected() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(EeConcurrencyClassUsage.class) + .build(); + checkLayersForArchive(p, new ExpectedLayers("ee-concurrency", "ee-concurrency")); + } + +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/EeIntegrationLayerMetadataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/EeIntegrationLayerMetadataTestCase.java new file mode 100644 index 000000000000..7353d30b5a99 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/EeIntegrationLayerMetadataTestCase.java @@ -0,0 +1,73 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.integration; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class EeIntegrationLayerMetadataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testJakartaAnnotationSecurityPackageAnnotationUsage() throws Exception { + testWarWithClass(JakartaAnnotationSecurityPackageAnnotationUsage.class); + } + + @Test + public void testJakartaAnnotationSqlPackageAnnotationUsage() throws Exception { + testWarWithClass(JakartaAnnotationSqlPackageAnnotationUsage.class); + } + + @Test + public void testJakartaAnnotationPackageAnnotationUsage() throws Exception { + testWarWithClass(JakartaAnnotationPackageAnnotationUsage.class); + } + + @Test + public void testJakartaXmlBindAnnotationAdaptersPackageAnnotationUsage() { + testWarWithClass(JakartaXmlBindAnnotationAdaptersPackageAnnotationUsage.class); + } + + @Test + public void testJakartaXmlBindAnnotationPackageAnnotationUsage() { + testWarWithClass(JakartaXmlBindAnnotationPackageAnnotationUsage.class); + } + + + @Test + public void testJakartaXmlBindRootPackageClassUsage() { + testWarWithClass(JakartaXmlBindRootPackageClassUsage.class); + } + + @Test + public void testJakartaXmlAnnotationPackageClassUsage() { + testWarWithClass(JakartaXmlAnnotationPackageClassUsage.class); + } + + @Test + public void testJakartaXmlAnnotationAdaptersPackageClassUsage() { + testWarWithClass(JakartaXmlAnnotationAdaptersPackageClassUsage.class); + } + + @Test + public void testJakartaXmlBindAttachmentPackageClassUsage() { + testWarWithClass(JakartaXmlBindAttachmentPackageClassUsage.class); + } + + @Test + public void testJakartaXmlBindHelpersPackageClassUsage() { + // jakarta.xml.bind.helpers.AbstractMarshallerImpl + testWarWithClass(JakartaXmlBindHelpersPackageClassUsage.class); + } + + @Test + public void testJakartaXmlBindUtilPackageClassUsage() { + testWarWithClass(JakartaXmlBindUtilPackageClassUsage.class); + } + + private void testWarWithClass(Class clazz) { + Path p= createArchiveBuilder(ArchiveType.WAR) + .addClasses(clazz) + .build(); + // ee-integration is a dependency of the ee-core-profile-server so it doesn't show up as a decorator + checkLayersForArchive(p, "ee-integration"); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaAnnotationPackageAnnotationUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaAnnotationPackageAnnotationUsage.java new file mode 100644 index 000000000000..c78cabd50ef1 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaAnnotationPackageAnnotationUsage.java @@ -0,0 +1,12 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.integration; + +import jakarta.annotation.PostConstruct; + + +public class JakartaAnnotationPackageAnnotationUsage { + + @PostConstruct + public void pc() { + + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaAnnotationSecurityPackageAnnotationUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaAnnotationSecurityPackageAnnotationUsage.java new file mode 100644 index 000000000000..df4987376d0e --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaAnnotationSecurityPackageAnnotationUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.integration; + +import jakarta.annotation.security.DeclareRoles; + +@DeclareRoles({"x"}) +public class JakartaAnnotationSecurityPackageAnnotationUsage { +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaAnnotationSqlPackageAnnotationUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaAnnotationSqlPackageAnnotationUsage.java new file mode 100644 index 000000000000..6a40f70f1305 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaAnnotationSqlPackageAnnotationUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.integration; + +import jakarta.annotation.sql.DataSourceDefinition; + +@DataSourceDefinition(name = "x", className = "X") +public class JakartaAnnotationSqlPackageAnnotationUsage { +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaXmlAnnotationAdaptersPackageClassUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaXmlAnnotationAdaptersPackageClassUsage.java new file mode 100644 index 000000000000..44ff65e1863f --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaXmlAnnotationAdaptersPackageClassUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.integration; + +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; + +public class JakartaXmlAnnotationAdaptersPackageClassUsage { + CollapsedStringAdapter collapsedStringAdapter; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaXmlAnnotationPackageClassUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaXmlAnnotationPackageClassUsage.java new file mode 100644 index 000000000000..1e4aa4d988b2 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaXmlAnnotationPackageClassUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.integration; + +import jakarta.xml.bind.annotation.DomHandler; + +public class JakartaXmlAnnotationPackageClassUsage { + DomHandler domHandler; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaXmlBindAnnotationAdaptersPackageAnnotationUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaXmlBindAnnotationAdaptersPackageAnnotationUsage.java new file mode 100644 index 000000000000..d1369fcbbedb --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaXmlBindAnnotationAdaptersPackageAnnotationUsage.java @@ -0,0 +1,8 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.integration; + +import jakarta.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +@XmlJavaTypeAdapter(XmlAdapter.class) +public class JakartaXmlBindAnnotationAdaptersPackageAnnotationUsage { +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaXmlBindAnnotationPackageAnnotationUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaXmlBindAnnotationPackageAnnotationUsage.java new file mode 100644 index 000000000000..3fb8c0450f67 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaXmlBindAnnotationPackageAnnotationUsage.java @@ -0,0 +1,8 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.integration; + +import jakarta.xml.bind.annotation.XmlElement; + +public class JakartaXmlBindAnnotationPackageAnnotationUsage { + @XmlElement + String x; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaXmlBindAttachmentPackageClassUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaXmlBindAttachmentPackageClassUsage.java new file mode 100644 index 000000000000..1239cbca2762 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaXmlBindAttachmentPackageClassUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.integration; + +import jakarta.xml.bind.attachment.AttachmentMarshaller; + +public class JakartaXmlBindAttachmentPackageClassUsage { + AttachmentMarshaller attachmentMarshaller; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaXmlBindHelpersPackageClassUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaXmlBindHelpersPackageClassUsage.java new file mode 100644 index 000000000000..753e08196c3d --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaXmlBindHelpersPackageClassUsage.java @@ -0,0 +1,9 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.integration; + +import jakarta.xml.bind.helpers.AbstractMarshallerImpl; + +public class JakartaXmlBindHelpersPackageClassUsage { + public void setMarshaller(AbstractMarshallerImpl impl) { + + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaXmlBindRootPackageClassUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaXmlBindRootPackageClassUsage.java new file mode 100644 index 000000000000..cdb847740723 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaXmlBindRootPackageClassUsage.java @@ -0,0 +1,9 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.integration; + +import jakarta.xml.bind.DatatypeConverter; + +public class JakartaXmlBindRootPackageClassUsage { + public DatatypeConverter getConverter() { + return null; + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaXmlBindUtilPackageClassUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaXmlBindUtilPackageClassUsage.java new file mode 100644 index 000000000000..a34f3affbefc --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/integration/JakartaXmlBindUtilPackageClassUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.integration; + +import jakarta.xml.bind.util.JAXBResult; + +public class JakartaXmlBindUtilPackageClassUsage { + JAXBResult jaxbResult; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/EeSecurityLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/EeSecurityLayerMetaDataTestCase.java new file mode 100644 index 000000000000..fb90bab30cbb --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/EeSecurityLayerMetaDataTestCase.java @@ -0,0 +1,93 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.security; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class EeSecurityLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + ////////////////////////////////////////////////////////////////////// + // jakarta.security.enterprise-api annotations/classes + + @Test + public void testSecurityEnterpriseRootPackageClass() { + addClassAndCheck(SecurityEnterpriseRootPackageClassUsage.class); + } + + @Test + public void testSecurityEnterpriseHttpPackageAnnotation() { + addClassAndCheck(SecurityEnterpriseHttpPackageAnnotationUsage.class); + } + + @Test public void testSecurityEnterpriseHttpPackageClass() { + addClassAndCheck(SecurityEnterpriseHttpPackageClassUsage.class); + } + + @Test + public void testSecurityEnterpriseHttpOpenIdPackageAnnotation() { + addClassAndCheck(SecurityEnterpriseHttpOpenIdPackageAnnotationUsage.class); + } + + @Test + public void testSecurityEnterpriseHttpOpenIdPackageClass() { + addClassAndCheck(SecurityEnterpriseHttpOpenIdPackageClassUsage.class); + } + + @Test + public void testSecurityEnterpriseCredentialPackageClass() { + addClassAndCheck(SecurityEnterpriseCredentialPackageClassUsage.class); + } + + @Test + public void testSecurityEnterpriseIdentityStoreAnnotation() { + addClassAndCheck(SecurityEnterpriseIdentityStoreAnnotationUsage.class); + } + + @Test + public void testSecurityEnterpriseIdentityStoreClass() { + addClassAndCheck(SecurityEnterpriseIdentityStoreClassUsage.class); + } + + @Test + public void testSecurityEnterpriseIdentityStoreOpenIdClass() { + addClassAndCheck(SecurityEnterpriseIdentityStoreOpenIdClassUsage.class); + } + + ////////////////////////////////////////////////////////////////////// + // jakarta-authentication-api classes + + @Test + public void testSecurityAuthMessageRootPackageClass() { + addClassAndCheck(SecurityAuthMessageRootPackageClassUsage.class); + } + + @Test + public void testSecurityAuthMessageCallbackPackageClass() { + addClassAndCheck(SecurityAuthMessageCallbackPackageClassUsage.class); + } + + @Test + public void testSecurityAuthMessageConfigPackageClass() { + addClassAndCheck(SecurityAuthMessageConfigPackageClassUsage.class); + } + + @Test + public void testSecurityAuthMessageModulePackageClass() { + addClassAndCheck(SecurityAuthMessageModulePackageClassUsage.class); + } + + ////////////////////////////////////////////////////////////////////// + // jakarta-authorization-api classes + @Test + public void testSecurityJaccClass() { + addClassAndCheck(SecurityJaccClassUsage.class); + } + + private void addClassAndCheck(Class clazz) { + Path p = + createArchiveBuilder(ArchiveType.WAR) + .addClasses(clazz) + .build(); + checkLayersForArchive(p, new ExpectedLayers("ee-security", "ee-security")); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityAuthMessageCallbackPackageClassUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityAuthMessageCallbackPackageClassUsage.java new file mode 100644 index 000000000000..ff447fe95e5c --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityAuthMessageCallbackPackageClassUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.security; + +import jakarta.security.auth.message.callback.CallerPrincipalCallback; + +public class SecurityAuthMessageCallbackPackageClassUsage { + CallerPrincipalCallback callerPrincipalCallback; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityAuthMessageConfigPackageClassUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityAuthMessageConfigPackageClassUsage.java new file mode 100644 index 000000000000..fe0b30c8d820 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityAuthMessageConfigPackageClassUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.security; + +import jakarta.security.auth.message.config.AuthConfig; + +public class SecurityAuthMessageConfigPackageClassUsage { + AuthConfig authConfig; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityAuthMessageModulePackageClassUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityAuthMessageModulePackageClassUsage.java new file mode 100644 index 000000000000..196ae0dd2230 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityAuthMessageModulePackageClassUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.security; + +import jakarta.security.auth.message.module.ClientAuthModule; + +public class SecurityAuthMessageModulePackageClassUsage { + ClientAuthModule clientAuthModule; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityAuthMessageRootPackageClassUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityAuthMessageRootPackageClassUsage.java new file mode 100644 index 000000000000..9b1fb38b3d3d --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityAuthMessageRootPackageClassUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.security; + +import jakarta.security.auth.message.ClientAuth; + +public class SecurityAuthMessageRootPackageClassUsage { + ClientAuth clientAuth; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseCredentialPackageClassUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseCredentialPackageClassUsage.java new file mode 100644 index 000000000000..d045f6266e36 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseCredentialPackageClassUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.security; + +import jakarta.security.enterprise.credential.AbstractClearableCredential; + +public class SecurityEnterpriseCredentialPackageClassUsage { + AbstractClearableCredential abstractClearableCredential; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseHttpOpenIdPackageAnnotationUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseHttpOpenIdPackageAnnotationUsage.java new file mode 100644 index 000000000000..8ce27404d484 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseHttpOpenIdPackageAnnotationUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.security; + +import jakarta.security.enterprise.authentication.mechanism.http.openid.ClaimsDefinition; + +@ClaimsDefinition +public class SecurityEnterpriseHttpOpenIdPackageAnnotationUsage { +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseHttpOpenIdPackageClassUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseHttpOpenIdPackageClassUsage.java new file mode 100644 index 000000000000..a564b274ec44 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseHttpOpenIdPackageClassUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.security; + +import jakarta.security.enterprise.authentication.mechanism.http.openid.OpenIdConstant; + +public class SecurityEnterpriseHttpOpenIdPackageClassUsage { + OpenIdConstant openIdConstant; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseHttpPackageAnnotationUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseHttpPackageAnnotationUsage.java new file mode 100644 index 000000000000..6de16c5bf01b --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseHttpPackageAnnotationUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.security; + +import jakarta.security.enterprise.authentication.mechanism.http.LoginToContinue; + +@LoginToContinue +public class SecurityEnterpriseHttpPackageAnnotationUsage { +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseHttpPackageClassUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseHttpPackageClassUsage.java new file mode 100644 index 000000000000..e626f7524b80 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseHttpPackageClassUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.security; + +import jakarta.security.enterprise.authentication.mechanism.http.HttpAuthenticationMechanism; + +public class SecurityEnterpriseHttpPackageClassUsage { + HttpAuthenticationMechanism httpAuthenticationMechanism; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseIdentityStoreAnnotationUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseIdentityStoreAnnotationUsage.java new file mode 100644 index 000000000000..4c001445055c --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseIdentityStoreAnnotationUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.security; + +import jakarta.security.enterprise.identitystore.DatabaseIdentityStoreDefinition; + +@DatabaseIdentityStoreDefinition +public class SecurityEnterpriseIdentityStoreAnnotationUsage { +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseIdentityStoreClassUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseIdentityStoreClassUsage.java new file mode 100644 index 000000000000..c0e36953fe99 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseIdentityStoreClassUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.security; + +import jakarta.security.enterprise.identitystore.CredentialValidationResult; + +public class SecurityEnterpriseIdentityStoreClassUsage { + CredentialValidationResult credentialValidationResult; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseIdentityStoreOpenIdClassUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseIdentityStoreOpenIdClassUsage.java new file mode 100644 index 000000000000..eb39c769612d --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseIdentityStoreOpenIdClassUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.security; + +import jakarta.security.enterprise.identitystore.openid.AccessToken; + +public class SecurityEnterpriseIdentityStoreOpenIdClassUsage { + AccessToken accessToken; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseRootPackageClassUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseRootPackageClassUsage.java new file mode 100644 index 000000000000..a9df25f51a66 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityEnterpriseRootPackageClassUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.security; + +import jakarta.security.enterprise.CallerPrincipal; + +public class SecurityEnterpriseRootPackageClassUsage { + CallerPrincipal principal; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityJaccClassUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityJaccClassUsage.java new file mode 100644 index 000000000000..9fe06c22dbb7 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ee/security/SecurityJaccClassUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.ee.security; + +import jakarta.security.jacc.PolicyConfiguration; + +public class SecurityJaccClassUsage { + PolicyConfiguration pc; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/EjbLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/EjbLayerMetaDataTestCase.java new file mode 100644 index 000000000000..fcf243ee14ee --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/EjbLayerMetaDataTestCase.java @@ -0,0 +1,36 @@ +package org.wildfly.ee.feature.pack.layer.tests.ejb; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class EjbLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testMessageDrivenAnnotation() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(MessageDrivenAnnotationUsage.class) + .build(); + checkLayersForArchive(p); + } + + @Test + public void testRemoteAnnotation() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(RemoteAnnotationUsage.class) + .build(); + checkLayersForArchive(p); + } + + @Test + public void testMessageDrivenContextClass() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(MessageDrivenContextClassUsage.class) + .build(); + checkLayersForArchive(p); + } + + public void checkLayersForArchive(Path p) { + checkLayersForArchive(p, new ExpectedLayers("ejb", "ejb")); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/MessageDrivenAnnotationUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/MessageDrivenAnnotationUsage.java new file mode 100644 index 000000000000..c08224f3720d --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/MessageDrivenAnnotationUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.ejb; + +import jakarta.ejb.MessageDriven; + +@MessageDriven +public class MessageDrivenAnnotationUsage { +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/MessageDrivenContextClassUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/MessageDrivenContextClassUsage.java new file mode 100644 index 000000000000..d2db945be85a --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/MessageDrivenContextClassUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.ejb; + +import jakarta.ejb.MessageDrivenContext; + +public class MessageDrivenContextClassUsage { + MessageDrivenContext context; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/RemoteAnnotationUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/RemoteAnnotationUsage.java new file mode 100644 index 000000000000..554106bfc6b6 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/RemoteAnnotationUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.ejb; + +import jakarta.ejb.Remote; + +@Remote +public class RemoteAnnotationUsage { +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/cache/EJBDistCacheHaProfileMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/cache/EJBDistCacheHaProfileMetaDataTestCase.java new file mode 100644 index 000000000000..c1c884f7ea04 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/cache/EJBDistCacheHaProfileMetaDataTestCase.java @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2023, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * + */ + +package org.wildfly.ee.feature.pack.layer.tests.ejb.cache; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; +import org.wildfly.ee.feature.pack.layer.tests.ejb.MessageDrivenAnnotationUsage; + +import java.nio.file.Path; +import java.util.Collections; + +public class EJBDistCacheHaProfileMetaDataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testMessageDrivenAnnotationHaProfile() { + // The tests in the parent package test standard profile + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(MessageDrivenAnnotationUsage.class) + .build(); + checkLayersForArchive(p, + builder -> builder.setExecutionProfiles(Collections.singleton("ha")), + new ExpectedLayers("ejb", "ejb") + .addDecorator("ejb-dist-cache") + .excludedLayers("ejb-local-cache")); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/lite/EjbLiteAnnotationUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/lite/EjbLiteAnnotationUsage.java new file mode 100644 index 000000000000..752df77e67d3 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/lite/EjbLiteAnnotationUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.ejb.lite; + +import jakarta.ejb.Stateless; + +@Stateless +public class EjbLiteAnnotationUsage { +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/lite/EjbLiteClassUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/lite/EjbLiteClassUsage.java new file mode 100644 index 000000000000..9ee91908b0d0 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/lite/EjbLiteClassUsage.java @@ -0,0 +1,9 @@ +package org.wildfly.ee.feature.pack.layer.tests.ejb.lite; + +import jakarta.ejb.SessionBean; +import jakarta.ejb.Stateless; + +@Stateless +public class EjbLiteClassUsage { + SessionBean sessionBean; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/lite/EjbLiteLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/lite/EjbLiteLayerMetaDataTestCase.java new file mode 100644 index 000000000000..95d286fda28c --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/lite/EjbLiteLayerMetaDataTestCase.java @@ -0,0 +1,29 @@ +package org.wildfly.ee.feature.pack.layer.tests.ejb.lite; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class EjbLiteLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + + @Test + public void testEjbLiteAnnotationUsage() { + Path p = createArchiveBuilder(ArchiveType.JAR) + .addClasses(EjbLiteAnnotationUsage.class) + .build(); + checkLayersForArchive(p); + } + + @Test + public void testEjbLiteClassUsage() { + Path p = createArchiveBuilder(ArchiveType.JAR) + .addClasses(EjbLiteClassUsage.class) + .build(); + checkLayersForArchive(p); + } + + private void checkLayersForArchive(Path p) { + checkLayersForArchive(p,new ExpectedLayers("ejb-lite", "ejb-lite")); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/lite/cache/EJBLiteDistCacheHaProfileMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/lite/cache/EJBLiteDistCacheHaProfileMetaDataTestCase.java new file mode 100644 index 000000000000..d95cdfe949ee --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/ejb/lite/cache/EJBLiteDistCacheHaProfileMetaDataTestCase.java @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2023, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * + */ + +package org.wildfly.ee.feature.pack.layer.tests.ejb.lite.cache; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; +import org.wildfly.ee.feature.pack.layer.tests.ejb.lite.EjbLiteAnnotationUsage; + +import java.nio.file.Path; +import java.util.Collections; + +public class EJBLiteDistCacheHaProfileMetaDataTestCase extends AbstractLayerMetaDataTestCase { + + @Test + public void testAnnotationHaProfile() { + // The tests in the parent package test standard profile + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(EjbLiteAnnotationUsage.class) + .build(); + checkLayersForArchive(p, + builder -> builder.setExecutionProfiles(Collections.singleton("ha")), + new ExpectedLayers("ejb-lite", "ejb-lite") + .addDecorator("ejb-dist-cache") + .excludedLayers("ejb-local-cache")); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/elytron/oidc/client/ElytronOidcClientLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/elytron/oidc/client/ElytronOidcClientLayerMetaDataTestCase.java new file mode 100644 index 000000000000..ed19fd426e07 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/elytron/oidc/client/ElytronOidcClientLayerMetaDataTestCase.java @@ -0,0 +1,17 @@ +package org.wildfly.ee.feature.pack.layer.tests.elytron.oidc.client; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class ElytronOidcClientLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testXmlAuthMethod() { + String xml = createXmlElementWithContent("OIDC", "web-app", "login-config", "auth-method"); + Path p = createArchiveBuilder(ArchiveType.WAR) + .addXml("web.xml", xml) + .build(); + checkLayersForArchive(p, new ExpectedLayers("elytron-oidc-client", "elytron-oidc-client")); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/embedded/activemq/EmbeddedActiveMqLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/embedded/activemq/EmbeddedActiveMqLayerMetaDataTestCase.java new file mode 100644 index 000000000000..6374f413cc0f --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/embedded/activemq/EmbeddedActiveMqLayerMetaDataTestCase.java @@ -0,0 +1,34 @@ +package org.wildfly.ee.feature.pack.layer.tests.embedded.activemq; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class EmbeddedActiveMqLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testJmsDestinationsInJmxXmlInWar() { + String xml = createXml(); + Path p = createArchiveBuilder(ArchiveType.WAR) + .addXml("test-jms.xml", xml) + .build(); + checkLayersForArchive(p); + } + + @Test + public void testJmsDestinationsInJmxXmlInJar() { + String xml = createXml(); + Path p = createArchiveBuilder(ArchiveType.JAR) + .addXml("test-jms.xml", xml) + .build(); + checkLayersForArchive(p); + } + + private void checkLayersForArchive(Path p) { + checkLayersForArchive(p, new ExpectedLayers("embedded-activemq", "embedded-activemq")); + } + + private String createXml() { + return createXmlElementWithContent(null, "messaging-deployment", "server", "jms-destinations"); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/h2/datasource/H2DatasourceLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/h2/datasource/H2DatasourceLayerMetaDataTestCase.java new file mode 100644 index 000000000000..f40fdff60d14 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/h2/datasource/H2DatasourceLayerMetaDataTestCase.java @@ -0,0 +1,33 @@ +package org.wildfly.ee.feature.pack.layer.tests.h2.datasource; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class H2DatasourceLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testPersistenceXmlEntryInWebInfClasesMetaInf() { + String xml = createXmlElementWithContent("java:jboss/datasources/ExampleDS", "persistence", "persistence-unit", "jta-data-source"); + Path p = createArchiveBuilder(ArchiveType.WAR) + .addXml("persistence.xml", xml, true) + .build(); + checkLayersForArchive(p); + } + + @Test + public void testPersistenceXmlEntryInMetaInf() { + String xml = createXmlElementWithContent("java:jboss/datasources/ExampleDS", "persistence", "persistence-unit", "jta-data-source"); + Path p = createArchiveBuilder(ArchiveType.JAR) + .addXml("persistence.xml", xml) + .build(); + checkLayersForArchive(p); + } + + private void checkLayersForArchive(Path p) { + checkLayersForArchive(p, + new ExpectedLayers("h2-datasource", "h2-datasource") + .addLayerAndDecorator("jpa", "jpa")); + + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/h2/driver/H2DriverLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/h2/driver/H2DriverLayerMetaDataTestCase.java new file mode 100644 index 000000000000..60d4497f7814 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/h2/driver/H2DriverLayerMetaDataTestCase.java @@ -0,0 +1,53 @@ +package org.wildfly.ee.feature.pack.layer.tests.h2.driver; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class H2DriverLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testH2DriverNonXaInWar() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addXml("test-ds.xml", nonXaXml()) + .build(); + checkLayersForArchive(p); + } + + @Test + public void testH2DriverNonXaInJar() { + Path p = createArchiveBuilder(ArchiveType.JAR) + .addXml("test-ds.xml", nonXaXml()) + .build(); + checkLayersForArchive(p); + } + + @Test + public void testH2DriverXaInWar() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addXml("test-ds.xml", xaXml()) + .build(); + checkLayersForArchive(p); + + } + + @Test + public void testH2DriverXaInJar() { + Path p = createArchiveBuilder(ArchiveType.JAR) + .addXml("test-ds.xml", xaXml()) + .build(); + checkLayersForArchive(p); + } + + private void checkLayersForArchive(Path p) { + checkLayersForArchive(p, new ExpectedLayers("h2-driver", "h2-driver")); + } + + private String nonXaXml() { + return createXmlElementWithContent("h2", "datasources", "datasource", "driver"); + } + + private String xaXml() { + return createXmlElementWithContent("h2", "datasources", "xa-datasource", "driver"); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/hibernate/search/HibernateSearchLayerTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/hibernate/search/HibernateSearchLayerTestCase.java new file mode 100644 index 000000000000..655d5559c013 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/hibernate/search/HibernateSearchLayerTestCase.java @@ -0,0 +1,20 @@ +package org.wildfly.ee.feature.pack.layer.tests.hibernate.search; + +import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +import static org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase.ArchiveType.JAR; + +@Indexed +public class HibernateSearchLayerTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testHibernateSearchDetected() { + Path p = createArchiveBuilder(JAR) + .addClasses(this.getClass()) + .build(); + checkLayersForArchive(p, new ExpectedLayers("hibernate-search", "hibernate-search")); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jaxrs/JaxrsCorePackageAnnotationUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jaxrs/JaxrsCorePackageAnnotationUsage.java new file mode 100644 index 000000000000..0e8d7aa111de --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jaxrs/JaxrsCorePackageAnnotationUsage.java @@ -0,0 +1,9 @@ +package org.wildfly.ee.feature.pack.layer.tests.jaxrs; + + +import jakarta.ws.rs.core.Context; + +public class JaxrsCorePackageAnnotationUsage { + @Context + String s; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jaxrs/JaxrsCorePackageClassUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jaxrs/JaxrsCorePackageClassUsage.java new file mode 100644 index 000000000000..0130f7b4d183 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jaxrs/JaxrsCorePackageClassUsage.java @@ -0,0 +1,4 @@ +package org.wildfly.ee.feature.pack.layer.tests.jaxrs; + +public class JaxrsCorePackageClassUsage extends jakarta.ws.rs.core.Application { +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jaxrs/JaxrsLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jaxrs/JaxrsLayerMetaDataTestCase.java new file mode 100644 index 000000000000..ac390015582c --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jaxrs/JaxrsLayerMetaDataTestCase.java @@ -0,0 +1,49 @@ +package org.wildfly.ee.feature.pack.layer.tests.jaxrs; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class JaxrsLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testJaxrsAnnotationFromRootPackage() { + testOneClassInWar(JaxrsRootPackageAnnotationUsage.class); + } + + @Test + public void testJaxrsClassFromRootPackage() { + testOneClassInWar(JaxrsRootPackageClassUsage.class); + } + + @Test + public void testJaxrsAnnotationFromCorePackage() { + testOneClassInWar(JaxrsCorePackageAnnotationUsage.class); + } + + @Test + public void testJaxrsClassFromCorePackage() { + testOneClassInWar(JaxrsCorePackageClassUsage.class); + } + + @Test + public void testApplicationInWebXml() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addXml( + "web.xml", + createXmlElementWithContent("jakarta.ws.rs.core.Application", "web-app", "servlet", "servlet-class")) + .build(); + checkLayersForArchive(p, + new ExpectedLayers("jaxrs", "jaxrs") + // servlet is a dependency of the ee-core-profile-server so it doesn't show up as a decorator + .addLayer("servlet")); + } + + private void testOneClassInWar(Class clazz) { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(clazz) + .build(); + checkLayersForArchive(p, new ExpectedLayers("jaxrs", "jaxrs")); + } + +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jaxrs/JaxrsRootPackageAnnotationUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jaxrs/JaxrsRootPackageAnnotationUsage.java new file mode 100644 index 000000000000..aa203a7c8c48 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jaxrs/JaxrsRootPackageAnnotationUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.jaxrs; + +import jakarta.ws.rs.ApplicationPath; + +@ApplicationPath("") +public class JaxrsRootPackageAnnotationUsage { +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jaxrs/JaxrsRootPackageClassUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jaxrs/JaxrsRootPackageClassUsage.java new file mode 100644 index 000000000000..ba00ed272fe6 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jaxrs/JaxrsRootPackageClassUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.jaxrs; + +import jakarta.ws.rs.BadRequestException; + +public class JaxrsRootPackageClassUsage { + BadRequestException badRequestException; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jpa/JpaAnnotationFromRootPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jpa/JpaAnnotationFromRootPackageUsage.java new file mode 100644 index 000000000000..29d9a32476cd --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jpa/JpaAnnotationFromRootPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.jpa; + +import jakarta.persistence.Entity; + +@Entity +public class JpaAnnotationFromRootPackageUsage { +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jpa/JpaClassFromCriteriaPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jpa/JpaClassFromCriteriaPackageUsage.java new file mode 100644 index 000000000000..e5888338af7f --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jpa/JpaClassFromCriteriaPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.jpa; + +import jakarta.persistence.criteria.JoinType; + +public class JpaClassFromCriteriaPackageUsage { + JoinType type; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jpa/JpaClassFromRootPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jpa/JpaClassFromRootPackageUsage.java new file mode 100644 index 000000000000..a174a0f73b50 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jpa/JpaClassFromRootPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.jpa; + +import jakarta.persistence.DiscriminatorType; + +public class JpaClassFromRootPackageUsage { + DiscriminatorType type; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jpa/JpaLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jpa/JpaLayerMetaDataTestCase.java new file mode 100644 index 000000000000..5e21fdc45c01 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jpa/JpaLayerMetaDataTestCase.java @@ -0,0 +1,55 @@ +package org.wildfly.ee.feature.pack.layer.tests.jpa; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class JpaLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testMetaInfPersistenceXml() { + Path p = createArchiveBuilder(ArchiveType.JAR) + .addXml("persistence.xml", "") + .build(); + checkLayersForArchive(p); + } + + @Test + public void testWebInfClassesMetaInfPersistenceXml() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addXml("persistence.xml", "", true) + .build(); + checkLayersForArchive(p); + } + + + @Test + public void testAnnotationFromRootPackage() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(JpaAnnotationFromRootPackageUsage.class) + .build(); + checkLayersForArchive(p); + } + + + @Test + public void testClassFromRootPackage() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(JpaClassFromRootPackageUsage.class) + .build(); + checkLayersForArchive(p); + } + + + @Test + public void testClassFromCriteriaPackage() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(JpaClassFromCriteriaPackageUsage.class) + .build(); + checkLayersForArchive(p); + } + + private void checkLayersForArchive(Path p) { + checkLayersForArchive(p, new ExpectedLayers("jpa", "jpa")); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jpa/distributed/JpaDistributedHaProfileMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jpa/distributed/JpaDistributedHaProfileMetaDataTestCase.java new file mode 100644 index 000000000000..4fb9e97899bc --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jpa/distributed/JpaDistributedHaProfileMetaDataTestCase.java @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2023, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + * + */ + +package org.wildfly.ee.feature.pack.layer.tests.jpa.distributed; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; +import org.wildfly.ee.feature.pack.layer.tests.jpa.JpaClassFromCriteriaPackageUsage; + +import java.nio.file.Path; +import java.util.Collections; + +public class JpaDistributedHaProfileMetaDataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testClassFromCriteriaPackage() { + // The test in the parent package covers the standard profile + Path p = createArchiveBuilder(AbstractLayerMetaDataTestCase.ArchiveType.WAR) + .addClasses(JpaClassFromCriteriaPackageUsage.class) + .build(); + checkLayersForArchive(p, + builder -> builder.setExecutionProfiles(Collections.singleton("ha")), + new AbstractLayerMetaDataTestCase.ExpectedLayers("jpa", "jpa-distributed") + .excludedLayers("jpa")); + } + +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsf/JsfAnnotationUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsf/JsfAnnotationUsage.java new file mode 100644 index 000000000000..3f212f6088d0 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsf/JsfAnnotationUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.jsf; + +import jakarta.faces.annotation.View; + +@View +public class JsfAnnotationUsage { +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsf/JsfClassFromNestedPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsf/JsfClassFromNestedPackageUsage.java new file mode 100644 index 000000000000..83cc2716141b --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsf/JsfClassFromNestedPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.jsf; + +import jakarta.faces.lifecycle.Lifecycle; + +public class JsfClassFromNestedPackageUsage { + Lifecycle lifecycle; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsf/JsfClassFromRootPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsf/JsfClassFromRootPackageUsage.java new file mode 100644 index 000000000000..6d240e2b95c8 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsf/JsfClassFromRootPackageUsage.java @@ -0,0 +1,10 @@ +package org.wildfly.ee.feature.pack.layer.tests.jsf; + +import jakarta.faces.FacesWrapper; + +public class JsfClassFromRootPackageUsage implements FacesWrapper { + @Override + public String getWrapped() { + return null; + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsf/JsfLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsf/JsfLayerMetaDataTestCase.java new file mode 100644 index 000000000000..a62b85372421 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsf/JsfLayerMetaDataTestCase.java @@ -0,0 +1,57 @@ +package org.wildfly.ee.feature.pack.layer.tests.jsf; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class JsfLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testFacesServletInWebXml() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addXml( + "web.xml", + createXmlElementWithContent("jakarta.faces.webapp.FacesServlet", "web-app", "servlet", "servlet-class")) + .build(); + checkLayersForArchive(p, + new ExpectedLayers("jsf", "jsf") + // servlet is a dependency of the ee-core-profile-server so it doesn't show up as a decorator + .addLayer("servlet")); + } + + @Test + public void testFacesConfigXml() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addXml("faces-config.xml", "") + .build(); + checkLayersForArchive(p); + } + + @Test + public void testAnnotation() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(JsfAnnotationUsage.class) + .build(); + checkLayersForArchive(p); + } + + @Test + public void testClassFromRootPackage() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(JsfClassFromRootPackageUsage.class) + .build(); + checkLayersForArchive(p); + } + + @Test + public void testClassFromNestedPackage() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(JsfClassFromNestedPackageUsage.class) + .build(); + checkLayersForArchive(p); + } + + private void checkLayersForArchive(Path p) { + checkLayersForArchive(p, new ExpectedLayers("jsf", "jsf")); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonb/JsonbAnnotationUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonb/JsonbAnnotationUsage.java new file mode 100644 index 000000000000..840c82151cf6 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonb/JsonbAnnotationUsage.java @@ -0,0 +1,9 @@ +package org.wildfly.ee.feature.pack.layer.tests.jsonb; + +import jakarta.json.bind.annotation.JsonbTransient; + + +public class JsonbAnnotationUsage { + @JsonbTransient + String s; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonb/JsonbClassFromAdapterPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonb/JsonbClassFromAdapterPackageUsage.java new file mode 100644 index 000000000000..44ac42af3913 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonb/JsonbClassFromAdapterPackageUsage.java @@ -0,0 +1,13 @@ +package org.wildfly.ee.feature.pack.layer.tests.jsonb; + +public class JsonbClassFromAdapterPackageUsage implements jakarta.json.bind.adapter.JsonbAdapter { + @Override + public String adaptToJson(String s) throws Exception { + return null; + } + + @Override + public String adaptFromJson(String s) throws Exception { + return null; + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonb/JsonbClassFromConfigPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonb/JsonbClassFromConfigPackageUsage.java new file mode 100644 index 000000000000..79e2e6aa1555 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonb/JsonbClassFromConfigPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.jsonb; + +import jakarta.json.bind.config.BinaryDataStrategy; + +public class JsonbClassFromConfigPackageUsage { + BinaryDataStrategy binaryDataStrategy; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonb/JsonbClassFromRootPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonb/JsonbClassFromRootPackageUsage.java new file mode 100644 index 000000000000..5c9ce69bb62b --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonb/JsonbClassFromRootPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.jsonb; + +import jakarta.json.bind.Jsonb; + +public class JsonbClassFromRootPackageUsage { + Jsonb jsonb; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonb/JsonbClassFromSerializerPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonb/JsonbClassFromSerializerPackageUsage.java new file mode 100644 index 000000000000..1c9aced582f5 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonb/JsonbClassFromSerializerPackageUsage.java @@ -0,0 +1,8 @@ +package org.wildfly.ee.feature.pack.layer.tests.jsonb; + + +import jakarta.json.bind.serializer.JsonbDeserializer; + +public class JsonbClassFromSerializerPackageUsage { + JsonbDeserializer deserializer; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonb/JsonbLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonb/JsonbLayerMetaDataTestCase.java new file mode 100644 index 000000000000..6f629cdc530e --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonb/JsonbLayerMetaDataTestCase.java @@ -0,0 +1,52 @@ +package org.wildfly.ee.feature.pack.layer.tests.jsonb; + +import org.junit.Assert; +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; +import java.util.Set; + +public class JsonbLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testAnnotationUsage() { + testSingleClassWar(JsonbAnnotationUsage.class); + } + + @Test + public void testClassFromRootPackageUsage() { + testSingleClassWar(JsonbClassFromRootPackageUsage.class); + } + + @Test + public void testClassFromAdapterPackageUsage() { + testSingleClassWar(JsonbClassFromAdapterPackageUsage.class); + } + + @Test + public void testClassFromConfigPackageUsage() { + testSingleClassWar(JsonbClassFromConfigPackageUsage.class); + } + + @Test + public void testClassFromSerializerPackageUsage() { + testSingleClassWar(JsonbClassFromSerializerPackageUsage.class); + } + + private void testSingleClassWar(Class clazz) { + Path p = createArchiveBuilder(ArchiveType.JAR) + .addClasses(clazz) + .build(); + checkLayersForArchiveDontContainJsonp(p); + } + + private void checkLayersForArchiveDontContainJsonp(Path p) { + // Some extra checks here, since jsonp has the jakarta.json package + // while jsonb uses jakarta.json.bind. We want to make sure the rule + // for jsonp is tight enough to not inadvertently recommending jsonb as well + + //jsonb is a dependency of the ee-core-profile-server so it doesn't show up as a decorator + Set set = checkLayersForArchive(p, "jsonb"); + Assert.assertFalse(set.contains("jsonp")); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonp/JsonpClassFromRootPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonp/JsonpClassFromRootPackageUsage.java new file mode 100644 index 000000000000..11ce3b7595ae --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonp/JsonpClassFromRootPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.jsonp; + +import jakarta.json.Json; + +public class JsonpClassFromRootPackageUsage { + Json json; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonp/JsonpClassFromStreamPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonp/JsonpClassFromStreamPackageUsage.java new file mode 100644 index 000000000000..435da3687111 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonp/JsonpClassFromStreamPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.jsonp; + +import jakarta.json.stream.JsonParser; + +public class JsonpClassFromStreamPackageUsage { + JsonParser jsonParser; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonp/JsonpLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonp/JsonpLayerMetaDataTestCase.java new file mode 100644 index 000000000000..397565474bab --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/jsonp/JsonpLayerMetaDataTestCase.java @@ -0,0 +1,26 @@ +package org.wildfly.ee.feature.pack.layer.tests.jsonp; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class JsonpLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + + @Test + public void testClassFromRootPackageUsage() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(JsonpClassFromRootPackageUsage.class) + .build(); + checkLayersForArchive(p, "jsonp"); + } + + @Test + public void testClassFromStreamPackageUsage() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(JsonpClassFromStreamPackageUsage.class) + .build(); + // jsonp is a dependency of the ee-core-profile-server so it doesn't show up as a decorator + checkLayersForArchive(p, "jsonp"); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/mail/MailAnnotationFromRootPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/mail/MailAnnotationFromRootPackageUsage.java new file mode 100644 index 000000000000..7c7137065884 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/mail/MailAnnotationFromRootPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.mail; + +import jakarta.mail.MailSessionDefinition; + +@MailSessionDefinition(name = "x") +public class MailAnnotationFromRootPackageUsage { +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/mail/MailClassFromEventPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/mail/MailClassFromEventPackageUsage.java new file mode 100644 index 000000000000..ca950fc9910d --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/mail/MailClassFromEventPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.mail; + +import jakarta.mail.event.ConnectionAdapter; + +public class MailClassFromEventPackageUsage { + ConnectionAdapter adapter; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/mail/MailClassFromInternetPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/mail/MailClassFromInternetPackageUsage.java new file mode 100644 index 000000000000..1e953f4805f1 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/mail/MailClassFromInternetPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.mail; + +import jakarta.mail.internet.AddressException; + +public class MailClassFromInternetPackageUsage { + AddressException addressException; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/mail/MailClassFromRootPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/mail/MailClassFromRootPackageUsage.java new file mode 100644 index 000000000000..029841332156 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/mail/MailClassFromRootPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.mail; + +import jakarta.mail.Multipart; + +public class MailClassFromRootPackageUsage { + Multipart multipart; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/mail/MailClassFromSearchPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/mail/MailClassFromSearchPackageUsage.java new file mode 100644 index 000000000000..f2ed62fe1cd7 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/mail/MailClassFromSearchPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.mail; + +import jakarta.mail.search.AddressTerm; + +public class MailClassFromSearchPackageUsage { + AddressTerm addressTerm; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/mail/MailClassFromUtilPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/mail/MailClassFromUtilPackageUsage.java new file mode 100644 index 000000000000..6e3c0dce0ac7 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/mail/MailClassFromUtilPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.mail; + +import jakarta.mail.util.ByteArrayDataSource; + +public class MailClassFromUtilPackageUsage { + ByteArrayDataSource byteArrayDataSource; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/mail/MailLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/mail/MailLayerMetaDataTestCase.java new file mode 100644 index 000000000000..94c7e66023c3 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/mail/MailLayerMetaDataTestCase.java @@ -0,0 +1,45 @@ +package org.wildfly.ee.feature.pack.layer.tests.mail; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class MailLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testAnnotationFromRootPackageUsage() { + testSingleClassWar(MailAnnotationFromRootPackageUsage.class); + } + + @Test + public void testClassFromRootPackageUsage() { + testSingleClassWar(MailClassFromRootPackageUsage.class); + } + + @Test + public void testClassFromEventPackageUsage() { + testSingleClassWar(MailClassFromEventPackageUsage.class); + } + + @Test + public void testClassFromInternetPackageUsage() { + testSingleClassWar(MailClassFromInternetPackageUsage.class); + } + + @Test + public void testClassFromSearchPackageUsage() { + testSingleClassWar(MailClassFromSearchPackageUsage.class); + } + + @Test + public void testClassFromUtilPackageUsage() { + testSingleClassWar(MailClassFromUtilPackageUsage.class); + } + + private void testSingleClassWar(Class clazz) { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(clazz) + .build(); + checkLayersForArchive(p, new ExpectedLayers("mail", "mail")); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/messaging/activemq/MessagingActiveMqAnnotationUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/messaging/activemq/MessagingActiveMqAnnotationUsage.java new file mode 100644 index 000000000000..dd13ceef4814 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/messaging/activemq/MessagingActiveMqAnnotationUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.messaging.activemq; + +import jakarta.jms.JMSConnectionFactory; + +@JMSConnectionFactory("s") +public class MessagingActiveMqAnnotationUsage { +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/messaging/activemq/MessagingActiveMqClassUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/messaging/activemq/MessagingActiveMqClassUsage.java new file mode 100644 index 000000000000..82bc0fc983f2 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/messaging/activemq/MessagingActiveMqClassUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.messaging.activemq; + +import jakarta.jms.Message; + +public class MessagingActiveMqClassUsage { + Message message; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/messaging/activemq/MessagingActiveMqLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/messaging/activemq/MessagingActiveMqLayerMetaDataTestCase.java new file mode 100644 index 000000000000..fc79b85f519e --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/messaging/activemq/MessagingActiveMqLayerMetaDataTestCase.java @@ -0,0 +1,29 @@ +package org.wildfly.ee.feature.pack.layer.tests.messaging.activemq; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class MessagingActiveMqLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + + @Test + public void testAnnotationUsage() { + Path p = createArchiveBuilder(ArchiveType.JAR) + .addClasses(MessagingActiveMqAnnotationUsage.class) + .build(); + checkLayersForArchive(p); + } + + @Test + public void testClassUsage() { + Path p = createArchiveBuilder(ArchiveType.JAR) + .addClasses(MessagingActiveMqClassUsage.class) + .build(); + checkLayersForArchive(p); + } + + private void checkLayersForArchive(Path p) { + checkLayersForArchive(p, new ExpectedLayers("messaging-activemq", "messaging-activemq")); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/naming/NamingLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/naming/NamingLayerMetaDataTestCase.java new file mode 100644 index 000000000000..056755259099 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/naming/NamingLayerMetaDataTestCase.java @@ -0,0 +1,21 @@ +package org.wildfly.ee.feature.pack.layer.tests.naming; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class NamingLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + + javax.naming.Context context; + + @Test + public void testNamingClassUsage() { + Path p = createArchiveBuilder(ArchiveType.JAR) + .addClasses(this.getClass()) + .build(); + // naming is a dependency of the ee-core-profile-server so it doesn't show up as a decorator + checkLayersForArchive(p, "naming"); + } + +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/pojo/PojoLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/pojo/PojoLayerMetaDataTestCase.java new file mode 100644 index 000000000000..d444e237aa3e --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/pojo/PojoLayerMetaDataTestCase.java @@ -0,0 +1,36 @@ +package org.wildfly.ee.feature.pack.layer.tests.pojo; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class PojoLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testJarMetaInfBeansXml() { + Path p = createArchiveBuilder(ArchiveType.JAR) + .addXml("one-jboss-beans.xml", "") + .build(); + checkLayersForArchive(p); + } + + @Test + public void testWarWebInfBeansXml() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addXml("xjboss-beans.xml", "") + .build(); + checkLayersForArchive(p); + } + + @Test + public void testWarWebInfClassesMetaInfBeansXml() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addXml("jboss-beans.xml", "", true) + .build(); + checkLayersForArchive(p); + } + + private void checkLayersForArchive(Path p) { + checkLayersForArchive(p, new ExpectedLayers("pojo", "pojo")); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/resource/adapters/ResourceAdaptersLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/resource/adapters/ResourceAdaptersLayerMetaDataTestCase.java new file mode 100644 index 000000000000..27a3b116256f --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/resource/adapters/ResourceAdaptersLayerMetaDataTestCase.java @@ -0,0 +1,28 @@ +package org.wildfly.ee.feature.pack.layer.tests.resource.adapters; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class ResourceAdaptersLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testRaXml() { + Path p = createArchiveBuilder(ArchiveType.RAR) + .addXml("ra.xml", "") + .build(); + checkLayersForArchive(p); + } + + @Test + public void testIronjacamarXml() { + Path p = createArchiveBuilder(ArchiveType.RAR) + .addXml("ironjacamar.xml", "") + .build(); + checkLayersForArchive(p); + } + + private void checkLayersForArchive(Path p) { + checkLayersForArchive(p, new ExpectedLayers("resource-adapters", "resource-adapters")); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/sar/SarLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/sar/SarLayerMetaDataTestCase.java new file mode 100644 index 000000000000..5543d48d8914 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/sar/SarLayerMetaDataTestCase.java @@ -0,0 +1,16 @@ +package org.wildfly.ee.feature.pack.layer.tests.sar; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class SarLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testMetaInfJbossServiceXml() { + Path p = createArchiveBuilder(ArchiveType.SAR) + .addXml("jboss-service.xml", "") + .build(); + checkLayersForArchive(p, new ExpectedLayers("sar", "sar")); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/servlet/ServletAnnotationUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/servlet/ServletAnnotationUsage.java new file mode 100644 index 000000000000..d4f9a4a7681d --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/servlet/ServletAnnotationUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.servlet; + +import jakarta.servlet.annotation.WebFilter; + +public class ServletAnnotationUsage { + WebFilter filter; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/servlet/ServletClassFromDescriptorPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/servlet/ServletClassFromDescriptorPackageUsage.java new file mode 100644 index 000000000000..181950e1cf5d --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/servlet/ServletClassFromDescriptorPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.servlet; + +import jakarta.servlet.http.HttpServlet; + +public class ServletClassFromDescriptorPackageUsage { + HttpServlet httpServlet; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/servlet/ServletClassFromRootPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/servlet/ServletClassFromRootPackageUsage.java new file mode 100644 index 000000000000..c607b0ce2ffa --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/servlet/ServletClassFromRootPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.servlet; + +import jakarta.servlet.GenericServlet; + +public class ServletClassFromRootPackageUsage { + GenericServlet genericServlet; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/servlet/ServletLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/servlet/ServletLayerMetaDataTestCase.java new file mode 100644 index 000000000000..48ea2c06bb65 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/servlet/ServletLayerMetaDataTestCase.java @@ -0,0 +1,67 @@ +package org.wildfly.ee.feature.pack.layer.tests.servlet; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class ServletLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + + @Test + public void testServletAnnotation() { + // No sub packages for this one + testSingleClassWar(ServletAnnotationUsage.class); + } + + @Test + public void testWebsocketAnnotationFromRootPackage() { + testSingleClassWar(WebsocketAnnotationFromRootPackageUsage.class); + } + + @Test + public void testWebsocketAnnotationFromServerPackage() { + testSingleClassWar(WebsocketAnnotationFromServerPackageUsage.class); + } + + @Test + public void testServletInWebXml() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addXml("web.xml", createXmlElementWithContent("", "web-app", "servlet")) + .build(); + // servlet is a dependency of the ee-core-profile-server so it doesn't show up as a decorator + checkLayersForArchive(p, "servlet"); + } + + @Test + public void testServletClassFromRootPackage() { + testSingleClassWar(ServletClassFromRootPackageUsage.class); + } + + @Test + public void testServletClassFromDescriptorPackage() { + testSingleClassWar(ServletClassFromDescriptorPackageUsage.class); + } + + @Test + public void testServletClassFromHttpPackage() { + testSingleClassWar(ServletClassFromDescriptorPackageUsage.class); + } + + @Test + public void testWebsocketClassFromRootPackage() { + testSingleClassWar(WebSocketClassFromRootPackageUsage.class); + } + + @Test + public void testWebsocketClassFromServerPackage() { + testSingleClassWar(WebSocketClassFromServerPackageUsage.class); + } + + private void testSingleClassWar(Class clazz) { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(clazz) + .build(); + // servlet is a dependency of the ee-core-profile-server so it doesn't show up as a decorator + checkLayersForArchive(p, "servlet"); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/servlet/WebSocketClassFromRootPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/servlet/WebSocketClassFromRootPackageUsage.java new file mode 100644 index 000000000000..bd9fe9d68dd8 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/servlet/WebSocketClassFromRootPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.servlet; + +import jakarta.websocket.ClientEndpointConfig; + +public class WebSocketClassFromRootPackageUsage { + ClientEndpointConfig clientEndpointConfig; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/servlet/WebSocketClassFromServerPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/servlet/WebSocketClassFromServerPackageUsage.java new file mode 100644 index 000000000000..315f9379cc2f --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/servlet/WebSocketClassFromServerPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.servlet; + +import jakarta.websocket.server.ServerEndpointConfig; + +public class WebSocketClassFromServerPackageUsage { + ServerEndpointConfig serverEndpointConfig; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/servlet/WebsocketAnnotationFromRootPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/servlet/WebsocketAnnotationFromRootPackageUsage.java new file mode 100644 index 000000000000..f9dd2b4d2abb --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/servlet/WebsocketAnnotationFromRootPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.servlet; + +import jakarta.websocket.ClientEndpoint; + +public class WebsocketAnnotationFromRootPackageUsage { + ClientEndpoint clientEndpoint; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/servlet/WebsocketAnnotationFromServerPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/servlet/WebsocketAnnotationFromServerPackageUsage.java new file mode 100644 index 000000000000..e97427aad74e --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/servlet/WebsocketAnnotationFromServerPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.servlet; + +import jakarta.websocket.server.ServerEndpoint; + +public class WebsocketAnnotationFromServerPackageUsage { + ServerEndpoint serverEndpoint; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/singleton/ha/SingletonHaHaProfileLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/singleton/ha/SingletonHaHaProfileLayerMetaDataTestCase.java new file mode 100644 index 000000000000..c67cbd39fa37 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/singleton/ha/SingletonHaHaProfileLayerMetaDataTestCase.java @@ -0,0 +1,22 @@ +package org.wildfly.ee.feature.pack.layer.tests.singleton.ha; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; +import java.util.Collections; + +public class SingletonHaHaProfileLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testSingletonDeploymentXmlInMetaInf() { + // The tests in ../local test the standard profile + Path p = createArchiveBuilder(ArchiveType.JAR) + .addXml("singleton-deployment.xml", "") + .build(); + + checkLayersForArchive(p, + builder -> builder.setExecutionProfiles(Collections.singleton("ha")), + new ExpectedLayers("singleton-local", "singleton-ha") + .excludedLayers("singleton-local")); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/singleton/local/SingletonLocalClassFromElectionPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/singleton/local/SingletonLocalClassFromElectionPackageUsage.java new file mode 100644 index 000000000000..e17e5d612d95 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/singleton/local/SingletonLocalClassFromElectionPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.singleton.local; + +import org.wildfly.clustering.singleton.election.Preference; + +public class SingletonLocalClassFromElectionPackageUsage { + Preference preference; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/singleton/local/SingletonLocalClassFromRootPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/singleton/local/SingletonLocalClassFromRootPackageUsage.java new file mode 100644 index 000000000000..693cf41a971f --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/singleton/local/SingletonLocalClassFromRootPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.singleton.local; + +import org.wildfly.clustering.singleton.Singleton; + +public class SingletonLocalClassFromRootPackageUsage { + Singleton singleton; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/singleton/local/SingletonLocalClassFromServicePackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/singleton/local/SingletonLocalClassFromServicePackageUsage.java new file mode 100644 index 000000000000..9c9210abd9ed --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/singleton/local/SingletonLocalClassFromServicePackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.singleton.local; + +import org.wildfly.clustering.singleton.service.ImmutableSingletonServiceConfigurator; + +public class SingletonLocalClassFromServicePackageUsage { + ImmutableSingletonServiceConfigurator configurator; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/singleton/local/SingletonLocalLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/singleton/local/SingletonLocalLayerMetaDataTestCase.java new file mode 100644 index 000000000000..d22ae444bffd --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/singleton/local/SingletonLocalLayerMetaDataTestCase.java @@ -0,0 +1,52 @@ +package org.wildfly.ee.feature.pack.layer.tests.singleton.local; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class SingletonLocalLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testSingletonDeploymentXmlInMetaInf() { + Path p = createArchiveBuilder(ArchiveType.JAR) + .addXml("singleton-deployment.xml", "") + .build(); + checkLayersForArchive(p); + } + + @Test + public void testSingletonDeploymentXmlInWebInfClassesMetaInf() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addXml("singleton-deployment.xml", "", true) + .build(); + checkLayersForArchive(p); + } + + @Test + public void testSingletonDeploymentClassUsageFromRootPackage() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(SingletonLocalClassFromRootPackageUsage.class) + .build(); + checkLayersForArchive(p); + } + + @Test + public void testSingletonDeploymentClassUsageFromElectionPackage() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(SingletonLocalClassFromElectionPackageUsage.class) + .build(); + checkLayersForArchive(p); + } + + @Test + public void testSingletonDeploymentClassUsageFromServicePackage() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(SingletonLocalClassFromServicePackageUsage.class) + .build(); + checkLayersForArchive(p); + } + + private void checkLayersForArchive(Path p) { + checkLayersForArchive(p, new ExpectedLayers("singleton-local", "singleton-local")); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/transactions/TransactionAnnotationUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/transactions/TransactionAnnotationUsage.java new file mode 100644 index 000000000000..3ff8ec9d9cf4 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/transactions/TransactionAnnotationUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.transactions; + +import jakarta.transaction.Transactional; + +@Transactional +public class TransactionAnnotationUsage { +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/transactions/TransactionClassUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/transactions/TransactionClassUsage.java new file mode 100644 index 000000000000..aa4df1cfd1b7 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/transactions/TransactionClassUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.transactions; + +import jakarta.transaction.TransactionManager; + +public class TransactionClassUsage { + TransactionManager transactionManager; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/transactions/TransactionsLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/transactions/TransactionsLayerMetaDataTestCase.java new file mode 100644 index 000000000000..7009329c3c3f --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/transactions/TransactionsLayerMetaDataTestCase.java @@ -0,0 +1,31 @@ +package org.wildfly.ee.feature.pack.layer.tests.transactions; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class TransactionsLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + + @Test + public void testTransactionAnnotationUsage() { + // No nested packages for this one + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(TransactionAnnotationUsage.class) + .build(); + checkLayersForArchive(p); + } + + @Test + public void testTransactionClassUsage() { + // No nested packages for this one + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(TransactionClassUsage.class) + .build(); + checkLayersForArchive(p); + } + + private void checkLayersForArchive(Path p) { + checkLayersForArchive(p, new ExpectedLayers("transactions", "transactions")); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/web/clustering/WebClusteringHaProfileLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/web/clustering/WebClusteringHaProfileLayerMetaDataTestCase.java new file mode 100644 index 000000000000..78be89fb2364 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/web/clustering/WebClusteringHaProfileLayerMetaDataTestCase.java @@ -0,0 +1,28 @@ +package org.wildfly.ee.feature.pack.layer.tests.web.clustering; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; +import org.wildfly.glow.ScanArguments; + +import java.nio.file.Path; +import java.util.Collections; +import java.util.function.Consumer; + +public class WebClusteringHaProfileLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + + @Test + public void testDistributableInWebXml() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addXml("web.xml", createXmlElementWithContent("", "web-app", "distributable")) + .build(); + checkLayersForArchive(p, + new Consumer() { + @Override + public void accept(ScanArguments.Builder builder) { + builder.setExecutionProfiles(Collections.singleton("ha")); + } + }, + new ExpectedLayers("web-passivation", "web-clustering") + .excludedLayers("web-passivation")); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/web/passivation/WebPassivationLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/web/passivation/WebPassivationLayerMetaDataTestCase.java new file mode 100644 index 000000000000..73c4f328c321 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/web/passivation/WebPassivationLayerMetaDataTestCase.java @@ -0,0 +1,17 @@ +package org.wildfly.ee.feature.pack.layer.tests.web.passivation; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class WebPassivationLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + + @Test + public void testDistributableInWebXml() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addXml("web.xml", createXmlElementWithContent("", "web-app", "distributable")) + .build(); + checkLayersForArchive(p, new ExpectedLayers("web-passivation", "web-passivation")); + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/AnnotationInJwsSoapPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/AnnotationInJwsSoapPackageUsage.java new file mode 100644 index 000000000000..dde6e96f8a27 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/AnnotationInJwsSoapPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.webservices; + +import jakarta.jws.soap.SOAPBinding; + +@SOAPBinding +public class AnnotationInJwsSoapPackageUsage { +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/AnnotationInRootJwsPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/AnnotationInRootJwsPackageUsage.java new file mode 100644 index 000000000000..0d054c4f592b --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/AnnotationInRootJwsPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.webservices; + +import jakarta.jws.HandlerChain; + +@HandlerChain(file = "x") +public class AnnotationInRootJwsPackageUsage { +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/AnnotationInRootXmlPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/AnnotationInRootXmlPackageUsage.java new file mode 100644 index 000000000000..47f6fa3fa287 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/AnnotationInRootXmlPackageUsage.java @@ -0,0 +1,11 @@ +package org.wildfly.ee.feature.pack.layer.tests.webservices; + +import jakarta.xml.ws.Action; + + +public class AnnotationInRootXmlPackageUsage { + @Action + public void action() { + + } +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/AnnotationInXmlChildPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/AnnotationInXmlChildPackageUsage.java new file mode 100644 index 000000000000..2954e1e9346f --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/AnnotationInXmlChildPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.webservices; + +import jakarta.xml.ws.soap.Addressing; + +@Addressing +public class AnnotationInXmlChildPackageUsage { +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/ClassInRootXmlPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/ClassInRootXmlPackageUsage.java new file mode 100644 index 000000000000..9ef4c7474b05 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/ClassInRootXmlPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.webservices; + +import jakarta.xml.ws.Binding; + +public class ClassInRootXmlPackageUsage { + Binding binding; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/ClassInXmlHandlerPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/ClassInXmlHandlerPackageUsage.java new file mode 100644 index 000000000000..3ae3ef653e47 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/ClassInXmlHandlerPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.webservices; + +import jakarta.xml.ws.handler.Handler; + +public class ClassInXmlHandlerPackageUsage { + Handler handler; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/ClassInXmlHandlerSoapPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/ClassInXmlHandlerSoapPackageUsage.java new file mode 100644 index 000000000000..a53a844460a7 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/ClassInXmlHandlerSoapPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.webservices; + +import jakarta.xml.ws.handler.soap.SOAPHandler; + +public class ClassInXmlHandlerSoapPackageUsage { + SOAPHandler handler; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/ClassInXmlHttpPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/ClassInXmlHttpPackageUsage.java new file mode 100644 index 000000000000..cfb9bf4dbd17 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/ClassInXmlHttpPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.webservices; + +import jakarta.xml.ws.http.HTTPBinding; + +public class ClassInXmlHttpPackageUsage { + HTTPBinding httpBinding; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/ClassInXmlSoapPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/ClassInXmlSoapPackageUsage.java new file mode 100644 index 000000000000..05e54ff54713 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/ClassInXmlSoapPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.webservices; + +import jakarta.xml.ws.soap.MTOMFeature; + +public class ClassInXmlSoapPackageUsage { + MTOMFeature mtomFeature; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/ClassInXmlWsaddressingPackageUsage.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/ClassInXmlWsaddressingPackageUsage.java new file mode 100644 index 000000000000..aab7ea14df27 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/ClassInXmlWsaddressingPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.ee.feature.pack.layer.tests.webservices; + +import jakarta.xml.ws.wsaddressing.W3CEndpointReference; + +public class ClassInXmlWsaddressingPackageUsage { + W3CEndpointReference reference; +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/WebServicesLayerMetaDataTestCase.java b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/WebServicesLayerMetaDataTestCase.java new file mode 100644 index 000000000000..b86a315983c2 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/java/org/wildfly/ee/feature/pack/layer/tests/webservices/WebServicesLayerMetaDataTestCase.java @@ -0,0 +1,66 @@ +package org.wildfly.ee.feature.pack.layer.tests.webservices; + +import org.junit.Test; +import org.wildfly.ee.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class WebServicesLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testAnnotationInRootJwsPackage() { + testSingleWar(AnnotationInRootJwsPackageUsage.class); + } + + @Test + public void testAnnotationInJwsSoapPackage() { + testSingleWar(AnnotationInJwsSoapPackageUsage.class); + } + + @Test + public void testAnnotationInRootXmlPackage() { + testSingleWar(AnnotationInRootXmlPackageUsage.class); + } + + @Test + public void testAnnotationInXmlChildPackage() { + testSingleWar(AnnotationInXmlChildPackageUsage.class); + } + + @Test + public void testClassInRootXmlPackage() { + testSingleWar(ClassInRootXmlPackageUsage.class); + } + + @Test + public void testClassInXmlHandlerSoapPackage() { + testSingleWar(ClassInXmlHandlerSoapPackageUsage.class); + } + + @Test + public void testClassInXmlHandlerPackage() { + testSingleWar(ClassInXmlHandlerPackageUsage.class); + } + + @Test + public void testClassInXmlHttpPackage() { + testSingleWar(ClassInXmlHttpPackageUsage.class); + } + + @Test + public void testClassInXmlSoapPackage() { + testSingleWar(ClassInXmlSoapPackageUsage.class); + } + + @Test + public void testClassInXmlWsaddressingPackage() { + testSingleWar(ClassInXmlWsaddressingPackageUsage.class); + } + + private void testSingleWar(Class clazz) { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(clazz) + .build(); + checkLayersForArchive(p, new ExpectedLayers("webservices", "webservices")); + } + +} diff --git a/ee-feature-pack/layer-metadata-tests/src/test/resources/glow/latest/provisioning-bare-metal.xml b/ee-feature-pack/layer-metadata-tests/src/test/resources/glow/latest/provisioning-bare-metal.xml new file mode 100644 index 000000000000..095513e85fca --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/resources/glow/latest/provisioning-bare-metal.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/ee-feature-pack/layer-metadata-tests/src/test/resources/glow/versions.yaml b/ee-feature-pack/layer-metadata-tests/src/test/resources/glow/versions.yaml new file mode 100644 index 000000000000..776f0dc974a2 --- /dev/null +++ b/ee-feature-pack/layer-metadata-tests/src/test/resources/glow/versions.yaml @@ -0,0 +1,2 @@ +latest: ${project.version} +versions: ${project.version} \ No newline at end of file diff --git a/ee-feature-pack/pom.xml b/ee-feature-pack/pom.xml index 448342da5eac..8324b8adf839 100644 --- a/ee-feature-pack/pom.xml +++ b/ee-feature-pack/pom.xml @@ -47,6 +47,7 @@ galleon-feature-pack galleon-local galleon-shared + layer-metadata-tests @@ -58,6 +59,13 @@ pom import + + ${ee.maven.groupId} + wildfly-standard-test-bom + ${ee.maven.version} + pom + import + diff --git a/ee/src/main/java/org/jboss/as/ee/managedbean/processors/JavaEEDependencyProcessor.java b/ee/src/main/java/org/jboss/as/ee/managedbean/processors/JavaEEDependencyProcessor.java index cd1a183e482a..96e2043d40d5 100644 --- a/ee/src/main/java/org/jboss/as/ee/managedbean/processors/JavaEEDependencyProcessor.java +++ b/ee/src/main/java/org/jboss/as/ee/managedbean/processors/JavaEEDependencyProcessor.java @@ -59,7 +59,7 @@ public class JavaEEDependencyProcessor implements DeploymentUnitProcessor { "javax.rmi.api", "jakarta.xml.bind.api", GLASSFISH_EL, - "org.glassfish.javax.enterprise.concurrent" + "org.glassfish.jakarta.enterprise.concurrent" }; diff --git a/galleon-pack/galleon-shared/src/main/resources/layers/standalone/microprofile-config/layer-spec.xml b/galleon-pack/galleon-shared/src/main/resources/layers/standalone/microprofile-config/layer-spec.xml index ba0420c6f230..b400df34eed6 100644 --- a/galleon-pack/galleon-shared/src/main/resources/layers/standalone/microprofile-config/layer-spec.xml +++ b/galleon-pack/galleon-shared/src/main/resources/layers/standalone/microprofile-config/layer-spec.xml @@ -26,6 +26,7 @@ + diff --git a/galleon-pack/galleon-shared/src/main/resources/layers/standalone/microprofile-openapi/layer-spec.xml b/galleon-pack/galleon-shared/src/main/resources/layers/standalone/microprofile-openapi/layer-spec.xml index 326bd88ce360..ab1e2688a8da 100644 --- a/galleon-pack/galleon-shared/src/main/resources/layers/standalone/microprofile-openapi/layer-spec.xml +++ b/galleon-pack/galleon-shared/src/main/resources/layers/standalone/microprofile-openapi/layer-spec.xml @@ -3,6 +3,10 @@ + + + + diff --git a/galleon-pack/galleon-shared/src/main/resources/layers/standalone/microprofile-reactive-messaging/layer-spec.xml b/galleon-pack/galleon-shared/src/main/resources/layers/standalone/microprofile-reactive-messaging/layer-spec.xml index 4ac86dd6ce0d..c7f8ef003f37 100644 --- a/galleon-pack/galleon-shared/src/main/resources/layers/standalone/microprofile-reactive-messaging/layer-spec.xml +++ b/galleon-pack/galleon-shared/src/main/resources/layers/standalone/microprofile-reactive-messaging/layer-spec.xml @@ -23,7 +23,7 @@ - + diff --git a/galleon-pack/galleon-shared/src/main/resources/layers/standalone/microprofile-telemetry/layer-spec.xml b/galleon-pack/galleon-shared/src/main/resources/layers/standalone/microprofile-telemetry/layer-spec.xml index 61085f35c3dd..430ef394f6f4 100644 --- a/galleon-pack/galleon-shared/src/main/resources/layers/standalone/microprofile-telemetry/layer-spec.xml +++ b/galleon-pack/galleon-shared/src/main/resources/layers/standalone/microprofile-telemetry/layer-spec.xml @@ -2,7 +2,7 @@ - + diff --git a/galleon-pack/galleon-shared/src/main/resources/layers/standalone/opentelemetry/layer-spec.xml b/galleon-pack/galleon-shared/src/main/resources/layers/standalone/opentelemetry/layer-spec.xml index 447286911277..fac993de2304 100644 --- a/galleon-pack/galleon-shared/src/main/resources/layers/standalone/opentelemetry/layer-spec.xml +++ b/galleon-pack/galleon-shared/src/main/resources/layers/standalone/opentelemetry/layer-spec.xml @@ -2,7 +2,7 @@ - + diff --git a/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/io/smallrye/openapi/main/module.xml b/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/io/smallrye/openapi/main/module.xml index 42f23c76a04f..626a563da9f9 100644 --- a/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/io/smallrye/openapi/main/module.xml +++ b/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/io/smallrye/openapi/main/module.xml @@ -50,7 +50,7 @@ - + diff --git a/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/narayana/rts/lra-participant/main/module.xml b/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/narayana/rts/lra-participant/main/module.xml index ced275cdfccd..b12fa6750571 100644 --- a/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/narayana/rts/lra-participant/main/module.xml +++ b/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/jboss/narayana/rts/lra-participant/main/module.xml @@ -44,7 +44,7 @@ - + diff --git a/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/microprofile/fault-tolerance-smallrye/main/module.xml b/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/microprofile/fault-tolerance-smallrye/main/module.xml index 6acce483fbd5..6f1c9e8bb975 100644 --- a/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/microprofile/fault-tolerance-smallrye/main/module.xml +++ b/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/microprofile/fault-tolerance-smallrye/main/module.xml @@ -42,7 +42,7 @@ - + diff --git a/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/microprofile/jwt-smallrye/main/module.xml b/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/microprofile/jwt-smallrye/main/module.xml index 38341d7bbb6c..df33598e8e00 100644 --- a/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/microprofile/jwt-smallrye/main/module.xml +++ b/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/microprofile/jwt-smallrye/main/module.xml @@ -40,6 +40,6 @@ - + diff --git a/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/microprofile/lra-participant/main/module.xml b/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/microprofile/lra-participant/main/module.xml index 5c06eb7f2057..f43ea0dd3924 100644 --- a/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/microprofile/lra-participant/main/module.xml +++ b/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/microprofile/lra-participant/main/module.xml @@ -33,7 +33,7 @@ - + diff --git a/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/microprofile/openapi-smallrye/main/module.xml b/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/microprofile/openapi-smallrye/main/module.xml index 805c438cbdab..d6de5bfc2a55 100644 --- a/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/microprofile/openapi-smallrye/main/module.xml +++ b/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/microprofile/openapi-smallrye/main/module.xml @@ -53,7 +53,7 @@ - + diff --git a/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/microprofile/reactive-messaging-smallrye/main/module.xml b/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/microprofile/reactive-messaging-smallrye/main/module.xml index f78b1d25a51b..3a4b14acef8e 100644 --- a/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/microprofile/reactive-messaging-smallrye/main/module.xml +++ b/galleon-pack/galleon-shared/src/main/resources/modules/system/layers/base/org/wildfly/extension/microprofile/reactive-messaging-smallrye/main/module.xml @@ -37,7 +37,7 @@ - + diff --git a/galleon-pack/layer-metadata-tests/pom.xml b/galleon-pack/layer-metadata-tests/pom.xml new file mode 100644 index 000000000000..f3aad993537b --- /dev/null +++ b/galleon-pack/layer-metadata-tests/pom.xml @@ -0,0 +1,243 @@ + + + + + + 4.0.0 + + + org.wildfly + wildfly-feature-pack-parent + + 30.0.0.Beta1-SNAPSHOT + + + wildfly-galleon-pack-layer-tests + + WildFly: Galleon Pack Layer Tests + Tests for the layer metadata rules + jar + + + + ${full.maven.groupId} + wildfly-galleon-pack + zip + test + + + + + io.opentelemetry.instrumentation + opentelemetry-instrumentation-annotations + test + + + io.opentelemetry + opentelemetry-api + test + + + io.opentelemetry + opentelemetry-api-logs + test + + + io.opentelemetry + opentelemetry-sdk + test + + + io.opentelemetry + opentelemetry-sdk-common + test + + + io.opentelemetry + opentelemetry-sdk-extension-autoconfigure + test + + + io.opentelemetry + opentelemetry-sdk-extension-autoconfigure-spi + test + + + io.opentelemetry + opentelemetry-sdk-logs + test + + + io.opentelemetry + opentelemetry-sdk-metrics + test + + + io.opentelemetry + opentelemetry-sdk-trace + test + + + jakarta.ws.rs + jakarta.ws.rs-api + test + + + junit + junit + test + + + org.eclipse.microprofile.config + microprofile-config-api + test + + + org.eclipse.microprofile.fault-tolerance + microprofile-fault-tolerance-api + test + + + org.eclipse.microprofile.health + microprofile-health-api + test + + + org.eclipse.microprofile.jwt + microprofile-jwt-auth-api + test + + + org.eclipse.microprofile.lra + microprofile-lra-api + test + + + org.eclipse.microprofile.openapi + microprofile-openapi-api + test + + + org.eclipse.microprofile.reactive.messaging + microprofile-reactive-messaging-api + test + + + org.eclipse.microprofile.reactive-streams-operators + microprofile-reactive-streams-operators-api + test + + + org.eclipse.microprofile.rest.client + microprofile-rest-client-api + test + + + org.jboss.logmanager + jboss-logmanager + test + + + org.jboss.shrinkwrap + shrinkwrap-impl-base + test + + + org.jboss.shrinkwrap + shrinkwrap-api + test + + + org.wildfly.glow + wildfly-glow-core + test + + + org.wildfly.glow + wildfly-glow-maven-resolver + test + + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + ban-bad-dependencies + none + + + + + org.apache.maven.plugins + maven-resources-plugin + + + copy-provisioning-xml + validate + + copy-resources + + + ${project.build.testOutputDirectory}/glow/${project.version} + + + ${project.basedir}/src/test/resources/glow/latest + true + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${settings.localRepository} + + + + + + + src/test/resources + + glow/latest/* + + true + + + + diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/AbstractLayerMetaDataTestCase.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/AbstractLayerMetaDataTestCase.java new file mode 100644 index 000000000000..5a91d9ededd0 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/AbstractLayerMetaDataTestCase.java @@ -0,0 +1,303 @@ +package org.wildfly.feature.pack.layer.tests; + +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.container.ClassContainer; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.wildfly.glow.Arguments; +import org.wildfly.glow.GlowMessageWriter; +import org.wildfly.glow.GlowSession; +import org.wildfly.glow.ScanArguments; +import org.wildfly.glow.ScanResults; +import org.wildfly.glow.maven.MavenResolver; + +import java.io.IOException; +import java.nio.file.FileVisitResult; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.attribute.BasicFileAttributes; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.Stack; +import java.util.function.BiConsumer; +import java.util.function.Consumer; +import java.util.stream.Collectors; + +public class AbstractLayerMetaDataTestCase { + + private static String URL_PROPERTY = "wildfly-glow-galleon-feature-packs-url"; + protected static Path ARCHIVES_PATH = Paths.get("target/glow-archives"); + + private boolean checkMethodCalled; + + @BeforeClass + public static void prepareArchivesDirectory() throws Exception { + Path glowXmlPath = Path.of("target/test-classes/glow"); + System.setProperty(URL_PROPERTY, glowXmlPath.toUri().toString()); + if (Files.exists(ARCHIVES_PATH)) { + deleteArchivesDirectory(); + } + Files.createDirectories(ARCHIVES_PATH); + } + + @Before + public void before() { + checkMethodCalled = false; + } + + @After + public void after() { + Assert.assertTrue(checkMethodCalled); + } + + protected static String createXmlElementWithContent(String content, String... path) { + StringBuilder sb = new StringBuilder(); + Stack stack = new Stack<>(); + for (String element : path) { + sb.append("<" + element + ">"); + stack.push(element); + } + if (content != null) { + sb.append(content); + } + while (!stack.empty()) { + sb.append(""); + } + return sb.toString(); + } + + + protected Set checkLayersForArchive(Path archivePath, String...expectedLayers) { + return checkLayersForArchive(archivePath, null, expectedLayers); + } + + protected Set checkLayersForArchive(Path archivePath, ExpectedLayers expectedLayers) { + return checkLayersForArchive(archivePath, null, expectedLayers); + } + + protected Set checkLayersForArchive(Path archivePath, Consumer argumentsAugmenter, String...expectedLayers) { + return checkLayersForArchive(archivePath, argumentsAugmenter, new ExpectedLayers(expectedLayers)); + } + + protected Set checkLayersForArchive(Path archivePath, Consumer argumentsAugmenter, ExpectedLayers expectedLayers) { + checkMethodCalled = true; + try { + checkMethodCalled = true; + ScanArguments.Builder argumentsBuilder = Arguments.scanBuilder().setBinaries(Collections.singletonList(archivePath)); + if (argumentsAugmenter != null) { + argumentsAugmenter.accept(argumentsBuilder); + } + Arguments arguments = argumentsBuilder.build(); + ScanResults scanResults = GlowSession.scan(MavenResolver.newMavenResolver(), arguments, GlowMessageWriter.DEFAULT); + + Set foundLayers = scanResults.getDiscoveredLayers().stream().map(l -> l.getName()).collect(Collectors.toSet()); + Set foundDecorators = scanResults.getDecorators().stream().map(l -> l.getName()).collect(Collectors.toSet()); + Set excludedLayers = scanResults.getExcludedLayers().stream().map(l -> l.getName()).collect(Collectors.toSet()); + + checkLayers(expectedLayers.getExpectedFoundLayers(), foundLayers); + checkLayers(expectedLayers.getExpectedDecorators(), foundDecorators); + + return foundLayers; + } catch (Exception e) { + if (e instanceof RuntimeException) throw (RuntimeException)e; + throw new RuntimeException(e); + } + } + + + private void checkLayers(Set expectedLayers, Set foundLayers) { + //foundLayers.removeAll(standardExpectedLayers); + + Assert.assertEquals("\nExpected:\n" + expectedLayers + "\nActual:\n" + foundLayers, + expectedLayers.size(), foundLayers.size()); + + for (String expectedLayer : expectedLayers) { + Assert.assertTrue(expectedLayer + ": " + foundLayers, foundLayers.contains(expectedLayer)); + } + } + + protected ArchiveBuilder createArchiveBuilder(ArchiveType type) { + return new ArchiveBuilder("test-" + System.currentTimeMillis() + "." + type.suffix, type); + } + + protected ArchiveBuilder createArchiveBuilder(String name, ArchiveType type) { + return new ArchiveBuilder(name, type); + } + + private static void deleteArchivesDirectory() throws IOException { + if (Files.exists(ARCHIVES_PATH)) { + Files.walkFileTree(ARCHIVES_PATH, new SimpleFileVisitor<>() { + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { + Files.delete(file); + return FileVisitResult.CONTINUE; + } + + @Override + public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException { + Files.delete(dir); + return FileVisitResult.CONTINUE; + } + }); + } + } + + public class ArchiveBuilder { + private final String name; + private final ArchiveType type; + private Map xmlContents = new HashMap<>(); + private Set webInfClassesMetaInfXmls = new HashSet<>(); + private List> classes = new ArrayList<>(); + + private ArchiveBuilder(String name, ArchiveType type) { + this.name = name; + this.type = type; + } + + public ArchiveBuilder addFileToInf(String name, String contents) { + return addFileToInf(name, contents, false); + } + + public ArchiveBuilder addFileToInf(String name, String contents, boolean webInfClassesMetaInf) { + if (webInfClassesMetaInf) { + if (type != ArchiveType.WAR) { + throw new IllegalStateException("Can only specify webInfClassesMetaInf for wars"); + } + webInfClassesMetaInfXmls.add(name); + } + xmlContents.put(name, contents); + return this; + } + + public ArchiveBuilder addClasses(Class... classes) { + this.classes.addAll(Arrays.asList(classes)); + return this; + } + + public Path build() { + if (type == ArchiveType.WAR) { + WebArchive war = ShrinkWrap.create(WebArchive.class, name); + addXmlContents((name, xml) -> { + if (webInfClassesMetaInfXmls.contains(name)) { + name = "classes/META-INF/" + name; + } + war.addAsWebInfResource(xml, name); + }); + addClasses(war); + return export(war); + } else if (type == ArchiveType.JAR || type == ArchiveType.RAR || type == ArchiveType.SAR) { + JavaArchive jar = ShrinkWrap.create(JavaArchive.class, name); + addXmlContents((name, xml) -> jar.addAsManifestResource(xml, name)); + addClasses(jar); + return export(jar); + } + + // TODO handle other archive types as needed + + return null; + } + + private void addXmlContents(BiConsumer consumer) { + for (Map.Entry xml : xmlContents.entrySet()) { + consumer.accept(xml.getKey(), new StringAsset(xml.getValue())); + } + } + + private void addClasses(ClassContainer classContainer) { + for (Class clazz : classes) { + classContainer.addClass(clazz); + } + } + + private Path export(Archive archive) { + //System.out.println(archive.toString(true)); + ZipExporter zipExporter = archive.as(ZipExporter.class); + Path path = ARCHIVES_PATH.resolve(name); + zipExporter.exportTo(path.toFile()); + return path; + } + } + + public enum ArchiveType { + WAR("war"), + JAR("jar"), + RAR("rar"), + SAR("sar"); + + private final String suffix; + + ArchiveType(String suffix) { + this.suffix = suffix; + } + } + + + public class ExpectedLayers { + private Set layers = new HashSet<>(); + private Set decoratorLayers = new HashSet<>(); + private Set excludedLayers = new HashSet<>(); + + public ExpectedLayers() { + } + + public ExpectedLayers(String layer) { + addLayer(layer); + } + + public ExpectedLayers(String... layers) { + this.layers.addAll(Arrays.asList(layers)); + } + + public ExpectedLayers(String layer, String decorator) { + addLayerAndDecorator(layer, decorator); + } + + public ExpectedLayers addLayer(String layer) { + this.layers.add(layer); + return this; + } + + public ExpectedLayers addLayerAndDecorator(String layer, String decorator) { + layers.add(layer); + decoratorLayers.add(decorator); + return this; + } + + public ExpectedLayers addDecorator(String decorator) { + decoratorLayers.add(decorator); + return this; + } + + public void excludedLayers(String...excludedDecorators) { + excludedLayers.addAll(Arrays.asList(excludedDecorators)); + } + + private Set getExpectedFoundLayers() { + return layers; + } + + private Set getExpectedDecorators() { + Set decorators = new HashSet<>(); + for (String decorator : decoratorLayers) { + decorators.add(decorator); + } + return decorators; + } + } +} + diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/config/MicroProfileConfigAnnotationUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/config/MicroProfileConfigAnnotationUsage.java new file mode 100644 index 000000000000..5e181f47cc2e --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/config/MicroProfileConfigAnnotationUsage.java @@ -0,0 +1,8 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.config; + +import org.eclipse.microprofile.config.inject.ConfigProperty; + +public class MicroProfileConfigAnnotationUsage { + @ConfigProperty + private String test; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/config/MicroProfileConfigClassFromRootPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/config/MicroProfileConfigClassFromRootPackageUsage.java new file mode 100644 index 000000000000..8c31f1883bf2 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/config/MicroProfileConfigClassFromRootPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.config; + +import org.eclipse.microprofile.config.Config; + +public class MicroProfileConfigClassFromRootPackageUsage { + Config config; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/config/MicroProfileConfigClassFromSpiPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/config/MicroProfileConfigClassFromSpiPackageUsage.java new file mode 100644 index 000000000000..7af15432c66a --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/config/MicroProfileConfigClassFromSpiPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.config; + +import org.eclipse.microprofile.config.spi.ConfigBuilder; + +public class MicroProfileConfigClassFromSpiPackageUsage { + ConfigBuilder configBuilder; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/config/MicroProfileConfigLayerMetaDataTestCase.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/config/MicroProfileConfigLayerMetaDataTestCase.java new file mode 100644 index 000000000000..af8296bed0de --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/config/MicroProfileConfigLayerMetaDataTestCase.java @@ -0,0 +1,54 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.config; + +import org.junit.Test; +import org.wildfly.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class MicroProfileConfigLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + + @Test + public void testAnnotationUsage() { + // Only package containing annotations + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(MicroProfileConfigAnnotationUsage.class) + .build(); + checkLayersForArchive(p); + } + + @Test + public void testClassFromRootPackageUsage() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(MicroProfileConfigClassFromRootPackageUsage.class) + .build(); + checkLayersForArchive(p); + } + + @Test + public void testClassFromSpiPackageUsage() { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(MicroProfileConfigClassFromSpiPackageUsage.class) + .build(); + checkLayersForArchive(p); + } + + @Test + public void testMetaInfMicroProfileConfigProperties() { + Path p = createArchiveBuilder(ArchiveType.JAR) + .addFileToInf("microprofile-config.properties", "") + .build(); + checkLayersForArchive(p); + } + + @Test + public void testWebInfClassesMetaInfMicroProfileConfigProperties(){ + Path p = createArchiveBuilder(ArchiveType.WAR) + .addFileToInf("microprofile-config.properties", "", true) + .build(); + checkLayersForArchive(p); + } + + private void checkLayersForArchive(Path p) { + checkLayersForArchive(p, new ExpectedLayers("microprofile-config", "microprofile-config")); + } +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/fault/tolerance/MicroProfileFaultToleranceAnnotationUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/fault/tolerance/MicroProfileFaultToleranceAnnotationUsage.java new file mode 100644 index 000000000000..2e0b160104d2 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/fault/tolerance/MicroProfileFaultToleranceAnnotationUsage.java @@ -0,0 +1,11 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.fault.tolerance; + +import org.eclipse.microprofile.faulttolerance.Asynchronous; + +public class MicroProfileFaultToleranceAnnotationUsage { + @Asynchronous + public void annotated() { + + } + +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/fault/tolerance/MicroProfileFaultToleranceClassFromExceptionsPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/fault/tolerance/MicroProfileFaultToleranceClassFromExceptionsPackageUsage.java new file mode 100644 index 000000000000..b3e103b55c6c --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/fault/tolerance/MicroProfileFaultToleranceClassFromExceptionsPackageUsage.java @@ -0,0 +1,9 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.fault.tolerance; + +import org.eclipse.microprofile.faulttolerance.exceptions.BulkheadException; + +public class MicroProfileFaultToleranceClassFromExceptionsPackageUsage { + public void test() throws BulkheadException { + + } +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/fault/tolerance/MicroProfileFaultToleranceClassFromRootPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/fault/tolerance/MicroProfileFaultToleranceClassFromRootPackageUsage.java new file mode 100644 index 000000000000..dfb09ab1310a --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/fault/tolerance/MicroProfileFaultToleranceClassFromRootPackageUsage.java @@ -0,0 +1,9 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.fault.tolerance; + +import org.eclipse.microprofile.faulttolerance.ExecutionContext; + +public class MicroProfileFaultToleranceClassFromRootPackageUsage { + public void test(ExecutionContext context) { + + } +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/fault/tolerance/MicroProfileFaultToleranceLayerMetaDataTestCase.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/fault/tolerance/MicroProfileFaultToleranceLayerMetaDataTestCase.java new file mode 100644 index 000000000000..dcdf8e5dc922 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/fault/tolerance/MicroProfileFaultToleranceLayerMetaDataTestCase.java @@ -0,0 +1,32 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.fault.tolerance; + +import org.junit.Test; +import org.wildfly.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class MicroProfileFaultToleranceLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testAnnotationUsage() { + // Only package containing annotations + testSingleClassWar(MicroProfileFaultToleranceAnnotationUsage.class); + } + + @Test + public void testClassFromRootPackageUsage() { + testSingleClassWar(MicroProfileFaultToleranceClassFromRootPackageUsage.class); + } + + @Test + public void testClassFromExceptionsPackageUsage() { + testSingleClassWar(MicroProfileFaultToleranceClassFromExceptionsPackageUsage.class); + } + + + private void testSingleClassWar(Class clazz) { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(clazz) + .build(); + checkLayersForArchive(p, new ExpectedLayers("microprofile-fault-tolerance", "microprofile-fault-tolerance")); + } +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/health/MicroProfileHealthAnnotationUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/health/MicroProfileHealthAnnotationUsage.java new file mode 100644 index 000000000000..42077fd2840e --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/health/MicroProfileHealthAnnotationUsage.java @@ -0,0 +1,8 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.health; + +import org.eclipse.microprofile.health.Readiness; + +public class MicroProfileHealthAnnotationUsage { + @Readiness + String x; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/health/MicroProfileHealthClassUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/health/MicroProfileHealthClassUsage.java new file mode 100644 index 000000000000..cab8f0fa6389 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/health/MicroProfileHealthClassUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.health; + +import org.eclipse.microprofile.health.HealthCheck; + +public class MicroProfileHealthClassUsage { + HealthCheck check; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/health/MicroProfileHealthLayerMetaDataTestCase.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/health/MicroProfileHealthLayerMetaDataTestCase.java new file mode 100644 index 000000000000..0e1c0f7fa364 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/health/MicroProfileHealthLayerMetaDataTestCase.java @@ -0,0 +1,30 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.health; + +import org.junit.Test; +import org.wildfly.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class MicroProfileHealthLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + + @Test + public void testMicroProfileHealthAnnotationUsage() { + // There is only one package with annotations + testSingleClassWar(MicroProfileHealthAnnotationUsage.class); + } + + @Test + public void testMicroProfileHealthClassUsage() { + // There is only one package with classes (the .spi child package is for implementors only) + // There is only one package with annotations + testSingleClassWar(MicroProfileHealthClassUsage.class); + } + + + private void testSingleClassWar(Class clazz) { + Path p = createArchiveBuilder(AbstractLayerMetaDataTestCase.ArchiveType.WAR) + .addClasses(clazz) + .build(); + checkLayersForArchive(p, new ExpectedLayers("microprofile-health", "microprofile-health")); + } +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/jwt/MicroProfileJwtAuthPackageAnnotation.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/jwt/MicroProfileJwtAuthPackageAnnotation.java new file mode 100644 index 000000000000..cdba1aa9c9f8 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/jwt/MicroProfileJwtAuthPackageAnnotation.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.jwt; + +import org.eclipse.microprofile.auth.LoginConfig; + +@LoginConfig(authMethod = "") +public class MicroProfileJwtAuthPackageAnnotation { +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/jwt/MicroProfileJwtJwtConfigPackageAnnotation.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/jwt/MicroProfileJwtJwtConfigPackageAnnotation.java new file mode 100644 index 000000000000..3684fe376b55 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/jwt/MicroProfileJwtJwtConfigPackageAnnotation.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.jwt; + +import org.eclipse.microprofile.jwt.config.Names; + +public class MicroProfileJwtJwtConfigPackageAnnotation { + Names names; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/jwt/MicroProfileJwtJwtPackageAnnotation.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/jwt/MicroProfileJwtJwtPackageAnnotation.java new file mode 100644 index 000000000000..c3a4467a1db6 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/jwt/MicroProfileJwtJwtPackageAnnotation.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.jwt; + +import org.eclipse.microprofile.jwt.Claim; + +@Claim +public class MicroProfileJwtJwtPackageAnnotation { +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/jwt/MicroProfileJwtJwtPackageClass.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/jwt/MicroProfileJwtJwtPackageClass.java new file mode 100644 index 000000000000..aef3fb9cfb4d --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/jwt/MicroProfileJwtJwtPackageClass.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.jwt; + +import org.eclipse.microprofile.jwt.Claims; + +public class MicroProfileJwtJwtPackageClass { + Claims claims; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/jwt/MicroProfileJwtLayerMetaDataTestCase.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/jwt/MicroProfileJwtLayerMetaDataTestCase.java new file mode 100644 index 000000000000..47525dab1358 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/jwt/MicroProfileJwtLayerMetaDataTestCase.java @@ -0,0 +1,36 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.jwt; + +import org.junit.Test; +import org.wildfly.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class MicroProfileJwtLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + + @Test + public void testAuthPackageAnnotation() { + testSingleClassWar(MicroProfileJwtAuthPackageAnnotation.class); + } + + @Test + public void testJwtPackageAnnotation() { + testSingleClassWar(MicroProfileJwtJwtPackageAnnotation.class); + } + + @Test + public void testJwtPackageClass() { + testSingleClassWar(MicroProfileJwtJwtPackageClass.class); + } + + @Test + public void testJwtConfigPackageClass() { + testSingleClassWar(MicroProfileJwtJwtConfigPackageAnnotation.class); + } + + private void testSingleClassWar(Class clazz) { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(clazz) + .build(); + checkLayersForArchive(p, new ExpectedLayers("microprofile-jwt", "microprofile-jwt")); + } +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/lra/MicroProfileLraAnnotationFromAnnotationPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/lra/MicroProfileLraAnnotationFromAnnotationPackageUsage.java new file mode 100644 index 000000000000..6e0796f28935 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/lra/MicroProfileLraAnnotationFromAnnotationPackageUsage.java @@ -0,0 +1,11 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.lra; + + +import org.eclipse.microprofile.lra.annotation.AfterLRA; + +public class MicroProfileLraAnnotationFromAnnotationPackageUsage { + @AfterLRA + public void test() { + + } +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/lra/MicroProfileLraAnnotationFromAnnotationWsRsPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/lra/MicroProfileLraAnnotationFromAnnotationWsRsPackageUsage.java new file mode 100644 index 000000000000..8bc02b10b953 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/lra/MicroProfileLraAnnotationFromAnnotationWsRsPackageUsage.java @@ -0,0 +1,11 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.lra; + +import org.eclipse.microprofile.lra.annotation.ws.rs.LRA; + + +public class MicroProfileLraAnnotationFromAnnotationWsRsPackageUsage { + @LRA + public void test() { + + } +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/lra/MicroProfileLraClassFromAnnotationPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/lra/MicroProfileLraClassFromAnnotationPackageUsage.java new file mode 100644 index 000000000000..4eda01fe5230 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/lra/MicroProfileLraClassFromAnnotationPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.lra; + +import org.eclipse.microprofile.lra.annotation.LRAStatus; + +public class MicroProfileLraClassFromAnnotationPackageUsage { + LRAStatus status; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/lra/MicroProfileLraClassFromRootPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/lra/MicroProfileLraClassFromRootPackageUsage.java new file mode 100644 index 000000000000..a2a1ee0f1d5c --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/lra/MicroProfileLraClassFromRootPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.lra; + +import org.eclipse.microprofile.lra.LRAResponse; + +public class MicroProfileLraClassFromRootPackageUsage { + LRAResponse response; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/lra/MicroProfileLraLayerMetaDataTestCase.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/lra/MicroProfileLraLayerMetaDataTestCase.java new file mode 100644 index 000000000000..b2b4a39b9d52 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/lra/MicroProfileLraLayerMetaDataTestCase.java @@ -0,0 +1,37 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.lra; + +import org.junit.Test; +import org.wildfly.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class MicroProfileLraLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testClassFromRootPackage() { + testSingleClassWar(MicroProfileLraClassFromRootPackageUsage.class); + } + + + @Test + public void testAnnotationFromAnnotationPackage() { + testSingleClassWar(MicroProfileLraAnnotationFromAnnotationPackageUsage.class); + } + + @Test + public void testClassFromAnnotationPackage() { + testSingleClassWar(MicroProfileLraClassFromAnnotationPackageUsage.class); + } + + @Test + public void testAnnotationFromAnnotationWsRsPackage() { + testSingleClassWar(MicroProfileLraAnnotationFromAnnotationWsRsPackageUsage.class); + } + + + private void testSingleClassWar(Class clazz) { + Path p = createArchiveBuilder(AbstractLayerMetaDataTestCase.ArchiveType.WAR) + .addClasses(clazz) + .build(); + checkLayersForArchive(p, new ExpectedLayers("microprofile-lra-participant", "microprofile-lra-participant")); + } +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/openapi/MicroProfileOpenApiLayerMetaDataTestCase.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/openapi/MicroProfileOpenApiLayerMetaDataTestCase.java new file mode 100644 index 000000000000..ea6bee242ed5 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/openapi/MicroProfileOpenApiLayerMetaDataTestCase.java @@ -0,0 +1,146 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.openapi; + +import org.junit.Test; +import org.wildfly.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class MicroProfileOpenApiLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + + ////////////////////////////////////////////////////////////////////// + // Annotation tests + // Note that the annotations in org.eclipse.microprofile.openapi.annotations.info + // and org.eclipse.microprofile.openapi.annotations.links are not directly usable + // (they are used as values for other annotations) + + @Test + public void testOpenApiAnnotationFromRootPackage() throws Exception { + testSingleClassInWar(OpenApiAnnotationFromRootPackageUsage.class); + } + + @Test + public void testOpenApiAnnotationFromCallbacksPackage() throws Exception { + testSingleClassInWar(OpenApiAnnotationFromCallbacksPackageUsage.class); + } + + @Test + public void testOpenApiAnnotationFromExtensionsPackage() throws Exception { + testSingleClassInWar(OpenApiAnnotationFromExtensionsPackageUsage.class); + } + + @Test + public void testOpenApiAnnotationFromMediaPackage() throws Exception { + testSingleClassInWar(OpenApiAnnotationFromMediaPackageUsage.class); + } + + @Test + public void testOpenApiAnnotationFromParametersPackage() throws Exception { + testSingleClassInWar(OpenApiAnnotationFromParametersPackageUsage.class); + } + + @Test + public void testOpenApiAnnotationFromResponsesPackage() throws Exception { + testSingleClassInWar(OpenApiAnnotationFromResponsesPackageUsage.class); + } + + @Test + public void testOpenApiAnnotationFromSecurityPackage() throws Exception { + testSingleClassInWar(OpenApiAnnotationFromSecurityPackageUsage.class); + } + + + private void testSingleClassInWar(Class clazz) throws Exception { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(clazz) + .build(); + checkOpenApi(p); + } + + @Test + public void testConfiguredOasModelReaderMetaInf() throws Exception { + Path p = createArchive(ArchiveType.JAR, "microprofile-config.properties", "mp.openapi.model.reader=x\n"); + checkOpenApiAndConfig(p); + } + + @Test + public void testConfiguredOasModelReaderWebInfClassesMetaInf() throws Exception { + Path p = createArchive(ArchiveType.WAR, "microprofile-config.properties", "mp.openapi.model.reader=x\n"); + checkOpenApiAndConfig(p); + } + + @Test + public void testConfiguredOasFilterMetaInf() throws Exception { + Path p = createArchive(ArchiveType.JAR, "microprofile-config.properties", "mp.openapi.filter=x\n"); + checkOpenApiAndConfig(p); + } + + @Test + public void testConfiguredOasFilterWebInfClassesMetaInf() throws Exception { + Path p = createArchive(ArchiveType.WAR, "microprofile-config.properties", "mp.openapi.filter=x\n"); + checkOpenApiAndConfig(p); + } + + @Test + public void testStaticContentYmlMetaInf() throws Exception { + testArchiveWithFile(ArchiveType.JAR, "openapi.yml", null); + } + + @Test + public void testStaticContentYamlMetaInf() throws Exception { + testArchiveWithFile(ArchiveType.JAR, "openapi.yaml", null); + } + + @Test + public void testStaticContentJsonMetaInf() throws Exception { + testArchiveWithFile(ArchiveType.JAR, "openapi.json", null); + } + + @Test + public void testStaticContentYmlWebInfClassesMetaInf() throws Exception { + testArchiveWithFile(ArchiveType.WAR, "openapi.yml", null); + } + + @Test + public void testStaticContentYamlWebInfClassesMetaInf() throws Exception { + testArchiveWithFile(ArchiveType.WAR, "openapi.yaml", null); + } + + @Test + public void testStaticContentJsonWebInfClassesMetaInf() throws Exception { + testArchiveWithFile(ArchiveType.WAR, "openapi.json", null); + } + + private Path createArchive(ArchiveType archiveType, String filename, String contents) throws Exception { + ArchiveBuilder builder = createArchiveBuilder(archiveType); + if (contents == null) { + contents = ""; + } + if (archiveType == ArchiveType.WAR) { + // Will go into WEB-INF/classes/META-INF + builder.addFileToInf(filename, contents, true); + } else if (archiveType == ArchiveType.JAR) { + // Will go into /META-INF + builder.addFileToInf(filename, contents); + } else { + throw new IllegalStateException("Unhandled archiveType " + archiveType); + } + Path p = builder.build(); + return p; + } + + private void testArchiveWithFile(ArchiveType archiveType, String filename, String contents) throws Exception { + Path p = createArchive(archiveType, filename, contents); + checkOpenApi(p); + } + + private void checkOpenApi(Path p) { + checkLayersForArchive(p, new ExpectedLayers("microprofile-openapi", "microprofile-openapi")); + } + + private void checkOpenApiAndConfig(Path p) { + checkLayersForArchive(p, + new ExpectedLayers("microprofile-openapi", "microprofile-openapi") + // microprofile-config doesn't show up as a decorator since it is a dependency of microprofile-openapi + .addLayer("microprofile-config")); + } +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/openapi/OpenApiAnnotationFromCallbacksPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/openapi/OpenApiAnnotationFromCallbacksPackageUsage.java new file mode 100644 index 000000000000..01301a882d88 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/openapi/OpenApiAnnotationFromCallbacksPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.openapi; + +import org.eclipse.microprofile.openapi.annotations.callbacks.Callback; + +@Callback +public class OpenApiAnnotationFromCallbacksPackageUsage { +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/openapi/OpenApiAnnotationFromExtensionsPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/openapi/OpenApiAnnotationFromExtensionsPackageUsage.java new file mode 100644 index 000000000000..caf82c8d796a --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/openapi/OpenApiAnnotationFromExtensionsPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.openapi; + +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; + +@Extension(name = "x", value = "") +public class OpenApiAnnotationFromExtensionsPackageUsage { +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/openapi/OpenApiAnnotationFromMediaPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/openapi/OpenApiAnnotationFromMediaPackageUsage.java new file mode 100644 index 000000000000..5a08b3e44666 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/openapi/OpenApiAnnotationFromMediaPackageUsage.java @@ -0,0 +1,5 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.openapi; + +@org.eclipse.microprofile.openapi.annotations.media.Schema +public class OpenApiAnnotationFromMediaPackageUsage { +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/openapi/OpenApiAnnotationFromParametersPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/openapi/OpenApiAnnotationFromParametersPackageUsage.java new file mode 100644 index 000000000000..f32f480b28dd --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/openapi/OpenApiAnnotationFromParametersPackageUsage.java @@ -0,0 +1,9 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.openapi; + + +import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; + +public class OpenApiAnnotationFromParametersPackageUsage { + @Parameter + String x; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/openapi/OpenApiAnnotationFromResponsesPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/openapi/OpenApiAnnotationFromResponsesPackageUsage.java new file mode 100644 index 000000000000..719b4fdcb9a4 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/openapi/OpenApiAnnotationFromResponsesPackageUsage.java @@ -0,0 +1,5 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.openapi; + +@org.eclipse.microprofile.openapi.annotations.responses.APIResponse +public class OpenApiAnnotationFromResponsesPackageUsage { +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/openapi/OpenApiAnnotationFromRootPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/openapi/OpenApiAnnotationFromRootPackageUsage.java new file mode 100644 index 000000000000..26e0159918e7 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/openapi/OpenApiAnnotationFromRootPackageUsage.java @@ -0,0 +1,8 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.openapi; + +import org.eclipse.microprofile.openapi.annotations.OpenAPIDefinition; +import org.eclipse.microprofile.openapi.annotations.info.Info; + +@OpenAPIDefinition(info = @Info(title = "hi", version = "1")) +public class OpenApiAnnotationFromRootPackageUsage { +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/openapi/OpenApiAnnotationFromSecurityPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/openapi/OpenApiAnnotationFromSecurityPackageUsage.java new file mode 100644 index 000000000000..0984ef99bba2 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/openapi/OpenApiAnnotationFromSecurityPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.openapi; + +import org.eclipse.microprofile.openapi.annotations.security.SecurityRequirement; + +@SecurityRequirement(name = "s") +public class OpenApiAnnotationFromSecurityPackageUsage { +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/messaging/MicroProfileReactiveMessagingAnnotationFromRootPackage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/messaging/MicroProfileReactiveMessagingAnnotationFromRootPackage.java new file mode 100644 index 000000000000..92cd7d34f2ca --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/messaging/MicroProfileReactiveMessagingAnnotationFromRootPackage.java @@ -0,0 +1,10 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.reactive.messaging; + +import org.eclipse.microprofile.reactive.messaging.Outgoing; + +public class MicroProfileReactiveMessagingAnnotationFromRootPackage { + @Outgoing("n") + public void test() { + + } +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/messaging/MicroProfileReactiveMessagingAnnotationFromSpiPackage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/messaging/MicroProfileReactiveMessagingAnnotationFromSpiPackage.java new file mode 100644 index 000000000000..6f4a73d57c1a --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/messaging/MicroProfileReactiveMessagingAnnotationFromSpiPackage.java @@ -0,0 +1,8 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.reactive.messaging; + +import org.eclipse.microprofile.reactive.messaging.spi.Connector; + +@Connector("x") +public class MicroProfileReactiveMessagingAnnotationFromSpiPackage { + +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/messaging/MicroProfileReactiveMessagingClassFromRootPackage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/messaging/MicroProfileReactiveMessagingClassFromRootPackage.java new file mode 100644 index 000000000000..d72ddd921ac1 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/messaging/MicroProfileReactiveMessagingClassFromRootPackage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.reactive.messaging; + +import org.eclipse.microprofile.reactive.messaging.Emitter; + +public class MicroProfileReactiveMessagingClassFromRootPackage { + Emitter emitter; +} \ No newline at end of file diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/messaging/MicroProfileReactiveMessagingClassFromSpiPackage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/messaging/MicroProfileReactiveMessagingClassFromSpiPackage.java new file mode 100644 index 000000000000..c9e2abed5ae4 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/messaging/MicroProfileReactiveMessagingClassFromSpiPackage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.reactive.messaging; + +import org.eclipse.microprofile.reactive.messaging.spi.ConnectorFactory; + +public class MicroProfileReactiveMessagingClassFromSpiPackage { + ConnectorFactory connectorFactory; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/messaging/MicroProfileReactiveMessagingLayerMetaDataTestCase.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/messaging/MicroProfileReactiveMessagingLayerMetaDataTestCase.java new file mode 100644 index 000000000000..c05c2aea6d66 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/messaging/MicroProfileReactiveMessagingLayerMetaDataTestCase.java @@ -0,0 +1,35 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.reactive.messaging; + +import org.junit.Test; +import org.wildfly.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class MicroProfileReactiveMessagingLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testAnnotationFromRootPackage() { + testSingleClassWar(MicroProfileReactiveMessagingAnnotationFromRootPackage.class); + } + + @Test + public void testClassFromRootPackage() { + testSingleClassWar(MicroProfileReactiveMessagingClassFromRootPackage.class); + } + + @Test + public void testAnnotationFromSpiPackage() { + testSingleClassWar(MicroProfileReactiveMessagingAnnotationFromSpiPackage.class); + } + + @Test + public void testClassFromSpiPackage() { + testSingleClassWar(MicroProfileReactiveMessagingClassFromSpiPackage.class); + } + + private void testSingleClassWar(Class clazz) { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(clazz) + .build(); + checkLayersForArchive(p, new ExpectedLayers("microprofile-reactive-messaging", "microprofile-reactive-messaging")); + } +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/messaging/kafka/MicroProfileReactiveMessagingKafkaLayerMetaDataTestCase.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/messaging/kafka/MicroProfileReactiveMessagingKafkaLayerMetaDataTestCase.java new file mode 100644 index 000000000000..118cea38f800 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/messaging/kafka/MicroProfileReactiveMessagingKafkaLayerMetaDataTestCase.java @@ -0,0 +1,63 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.reactive.messaging.kafka; + +import org.junit.Test; +import org.wildfly.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class MicroProfileReactiveMessagingKafkaLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testGlobalPropertyInWebInfClassesMetaInf() { + testArchiveWithFile(ArchiveType.WAR, "mp.messaging.connector.smallrye-kafka.sasl.mechanism=PLAIN"); + } + + @Test + public void testGlobalPropertyInWebInf() { + testArchiveWithFile(ArchiveType.JAR, "mp.messaging.connector.smallrye-kafka.sasl.mechanism=PLAIN"); + } + + @Test + public void testOutgoingInWebInfClassesMetaInf() { + testArchiveWithFile(ArchiveType.WAR, "mp.messaging.outgoing.name.connector=smallrye-kafka"); + } + + + @Test + public void testOutgoingInWebInf() { + testArchiveWithFile(ArchiveType.JAR, "mp.messaging.outgoing.name.connector=smallrye-kafka"); + } + + + @Test + public void testIncomingInWebInfClassesMetaInf() { + testArchiveWithFile(ArchiveType.WAR, "mp.messaging.incoming.name.connector=smallrye-kafka"); + } + + + @Test + public void testIncomingInWebInf() { + testArchiveWithFile(ArchiveType.JAR, "mp.messaging.incoming.name.connector=smallrye-kafka"); + } + + + private void testArchiveWithFile(ArchiveType archiveType, String contents) { + ArchiveBuilder builder = createArchiveBuilder(archiveType); + if (contents == null) { + contents = ""; + } + if (archiveType == ArchiveType.WAR) { + // Will go into WEB-INF/classes/META-INF + builder.addFileToInf("microprofile-config.properties", contents, true); + } else if (archiveType == ArchiveType.JAR) { + // Will go into /META-INF + builder.addFileToInf("microprofile-config.properties", contents); + } else { + throw new IllegalStateException("Unhandled archiveType " + archiveType); + } + Path p = builder.build(); + checkLayersForArchive(p, + // microprofile-config doesn't show up as a decorator since it is a dependency of microprofile-reactive-messaging-kafka + new ExpectedLayers("microprofile-config") + .addLayerAndDecorator("microprofile-reactive-messaging-kafka", "microprofile-reactive-messaging-kafka")); + } +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/streams/operators/MicroProfileReactiveStreamsOperatorsLayerMetaDataTestCase.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/streams/operators/MicroProfileReactiveStreamsOperatorsLayerMetaDataTestCase.java new file mode 100644 index 000000000000..df7ef6bd791a --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/streams/operators/MicroProfileReactiveStreamsOperatorsLayerMetaDataTestCase.java @@ -0,0 +1,28 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.reactive.streams.operators; + +import org.junit.Test; +import org.wildfly.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class MicroProfileReactiveStreamsOperatorsLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + @Test + public void testClassFromRootPackage() { + Path p = createArchiveBuilder(ArchiveType.JAR) + .addClasses(ReactiveStreamsOperatorsClassFromRootPackageUsage.class) + .build(); + checkLayersForArchive(p); + } + + @Test + public void testClassFromSpiPackage() { + Path p = createArchiveBuilder(ArchiveType.JAR) + .addClasses(ReactiveStreamsOperatorsClassFromSpiPackageUsage.class) + .build(); + checkLayersForArchive(p); + } + + private void checkLayersForArchive(Path p) { + checkLayersForArchive(p, new ExpectedLayers("microprofile-reactive-streams-operators", "microprofile-reactive-streams-operators")); + } +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/streams/operators/ReactiveStreamsOperatorsClassFromRootPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/streams/operators/ReactiveStreamsOperatorsClassFromRootPackageUsage.java new file mode 100644 index 000000000000..b0be45054174 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/streams/operators/ReactiveStreamsOperatorsClassFromRootPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.reactive.streams.operators; + +import org.eclipse.microprofile.reactive.streams.operators.PublisherBuilder; + +public class ReactiveStreamsOperatorsClassFromRootPackageUsage { + PublisherBuilder pb; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/streams/operators/ReactiveStreamsOperatorsClassFromSpiPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/streams/operators/ReactiveStreamsOperatorsClassFromSpiPackageUsage.java new file mode 100644 index 000000000000..028fc5df040b --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/reactive/streams/operators/ReactiveStreamsOperatorsClassFromSpiPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.reactive.streams.operators; + +import org.eclipse.microprofile.reactive.streams.operators.spi.ReactiveStreamsEngine; + +public class ReactiveStreamsOperatorsClassFromSpiPackageUsage { + ReactiveStreamsEngine engine; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/rest/client/MicroProfileRestClientAnnotationFromAnnotationsPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/rest/client/MicroProfileRestClientAnnotationFromAnnotationsPackageUsage.java new file mode 100644 index 000000000000..f7c3d2936546 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/rest/client/MicroProfileRestClientAnnotationFromAnnotationsPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.rest.client; + +import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; + +@RegisterProvider(value = MicroProfileRestClientAnnotationFromAnnotationsPackageUsage.class) +public class MicroProfileRestClientAnnotationFromAnnotationsPackageUsage { +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/rest/client/MicroProfileRestClientAnnotationFromInjectPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/rest/client/MicroProfileRestClientAnnotationFromInjectPackageUsage.java new file mode 100644 index 000000000000..79a06db6b4af --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/rest/client/MicroProfileRestClientAnnotationFromInjectPackageUsage.java @@ -0,0 +1,8 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.rest.client; + +import org.eclipse.microprofile.rest.client.inject.RestClient; + +@RestClient +public class MicroProfileRestClientAnnotationFromInjectPackageUsage { + +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/rest/client/MicroProfileRestClientClassFromExtPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/rest/client/MicroProfileRestClientClassFromExtPackageUsage.java new file mode 100644 index 000000000000..1cb5a17eb926 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/rest/client/MicroProfileRestClientClassFromExtPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.rest.client; + +import org.eclipse.microprofile.rest.client.ext.AsyncInvocationInterceptor; + +public class MicroProfileRestClientClassFromExtPackageUsage { + AsyncInvocationInterceptor interceptor; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/rest/client/MicroProfileRestClientClassFromRootPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/rest/client/MicroProfileRestClientClassFromRootPackageUsage.java new file mode 100644 index 000000000000..0e5439b5090e --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/rest/client/MicroProfileRestClientClassFromRootPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.rest.client; + +import org.eclipse.microprofile.rest.client.RestClientBuilder; + +public class MicroProfileRestClientClassFromRootPackageUsage { + RestClientBuilder builder; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/rest/client/MicroProfileRestClientClassFromSpiPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/rest/client/MicroProfileRestClientClassFromSpiPackageUsage.java new file mode 100644 index 000000000000..19cef440b47e --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/rest/client/MicroProfileRestClientClassFromSpiPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.rest.client; + +import org.eclipse.microprofile.rest.client.spi.RestClientListener; + +public class MicroProfileRestClientClassFromSpiPackageUsage { + RestClientListener listener; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/rest/client/MicroProfileRestClientLayerMetaDataTestCase.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/rest/client/MicroProfileRestClientLayerMetaDataTestCase.java new file mode 100644 index 000000000000..b96581961c58 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/rest/client/MicroProfileRestClientLayerMetaDataTestCase.java @@ -0,0 +1,41 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.rest.client; + +import org.junit.Test; +import org.wildfly.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class MicroProfileRestClientLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + + @Test + public void testClassFromRootPackage() { + testSingleClassWar(MicroProfileRestClientClassFromRootPackageUsage.class); + } + + @Test + public void testClassFromExtPackage() { + testSingleClassWar(MicroProfileRestClientClassFromExtPackageUsage.class); + } + + @Test + public void testClassFromSpiPackage() { + testSingleClassWar(MicroProfileRestClientClassFromSpiPackageUsage.class); + } + + @Test + public void testAnnotationFromAnnotationsPackage() { + testSingleClassWar(MicroProfileRestClientAnnotationFromAnnotationsPackageUsage.class); + } + + @Test + public void testAnnotationFromInjectPackage() { + testSingleClassWar(MicroProfileRestClientAnnotationFromInjectPackageUsage.class); + } + + private void testSingleClassWar(Class clazz) { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(clazz) + .build(); + checkLayersForArchive(p, new ExpectedLayers("microprofile-rest-client", "microprofile-rest-client")); + } +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/telemetry/MicroProfileTelemetryLayerMetaDataTestCase.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/telemetry/MicroProfileTelemetryLayerMetaDataTestCase.java new file mode 100644 index 000000000000..3d012b0412dd --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/microprofile/telemetry/MicroProfileTelemetryLayerMetaDataTestCase.java @@ -0,0 +1,9 @@ +package org.wildfly.feature.pack.layer.tests.microprofile.telemetry; + +import org.wildfly.feature.pack.layer.tests.opentelemetry.OpenTelemetryLayerMetaDataTestCase; + +public class MicroProfileTelemetryLayerMetaDataTestCase extends OpenTelemetryLayerMetaDataTestCase { + + // There is no distinction between this layer and the opentelemetry one, + // so simply run the tests again here to verify +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryAnnotationInInstrumentationAnnotationsPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryAnnotationInInstrumentationAnnotationsPackageUsage.java new file mode 100644 index 000000000000..350c30cbf4db --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryAnnotationInInstrumentationAnnotationsPackageUsage.java @@ -0,0 +1,11 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + + +import io.opentelemetry.instrumentation.annotations.WithSpan; + +public class OpenTelemetryAnnotationInInstrumentationAnnotationsPackageUsage { + @WithSpan + public void test() { + + } +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInApiBaggagePackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInApiBaggagePackageUsage.java new file mode 100644 index 000000000000..7931137de72a --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInApiBaggagePackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + +import io.opentelemetry.api.baggage.Baggage; + +public class OpenTelemetryClassInApiBaggagePackageUsage { + Baggage baggage; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInApiBaggagePropagationPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInApiBaggagePropagationPackageUsage.java new file mode 100644 index 000000000000..3bc16d89f9c2 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInApiBaggagePropagationPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + +import io.opentelemetry.api.baggage.propagation.W3CBaggagePropagator; + +public class OpenTelemetryClassInApiBaggagePropagationPackageUsage { + W3CBaggagePropagator propagator; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInApiCommonPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInApiCommonPackageUsage.java new file mode 100644 index 000000000000..cb4712edfd35 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInApiCommonPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + +import io.opentelemetry.api.common.AttributesBuilder; + +public class OpenTelemetryClassInApiCommonPackageUsage { + AttributesBuilder attributesBuilder; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInApiLogsPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInApiLogsPackageUsage.java new file mode 100644 index 000000000000..be16306b3ef5 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInApiLogsPackageUsage.java @@ -0,0 +1,5 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + +public class OpenTelemetryClassInApiLogsPackageUsage { + io.opentelemetry.api.logs.Logger logger; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInApiMetricsPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInApiMetricsPackageUsage.java new file mode 100644 index 000000000000..a66fe5050fd1 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInApiMetricsPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + +import io.opentelemetry.api.metrics.BatchCallback; + +public class OpenTelemetryClassInApiMetricsPackageUsage { + BatchCallback batchCallback; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInApiTracePackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInApiTracePackageUsage.java new file mode 100644 index 000000000000..5948d0604587 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInApiTracePackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + +import io.opentelemetry.api.trace.Span; + +public class OpenTelemetryClassInApiTracePackageUsage { + Span span; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInApiTracePropagationPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInApiTracePropagationPackageUsage.java new file mode 100644 index 000000000000..9edb8f902354 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInApiTracePropagationPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + +import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator; + +public class OpenTelemetryClassInApiTracePropagationPackageUsage { + W3CTraceContextPropagator propagator; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkAutoConfigurePackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkAutoConfigurePackageUsage.java new file mode 100644 index 000000000000..ebaab39a5d5a --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkAutoConfigurePackageUsage.java @@ -0,0 +1,5 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + +public class OpenTelemetryClassInSdkAutoConfigurePackageUsage { + io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdkBuilder builder; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkAutoConfigureSpiLogsPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkAutoConfigureSpiLogsPackageUsage.java new file mode 100644 index 000000000000..a79f34df7d38 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkAutoConfigureSpiLogsPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + +import io.opentelemetry.sdk.autoconfigure.spi.logs.ConfigurableLogRecordExporterProvider; + +public class OpenTelemetryClassInSdkAutoConfigureSpiLogsPackageUsage { + ConfigurableLogRecordExporterProvider provider; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkAutoConfigureSpiMetricsPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkAutoConfigureSpiMetricsPackageUsage.java new file mode 100644 index 000000000000..23e377953112 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkAutoConfigureSpiMetricsPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + +import io.opentelemetry.sdk.autoconfigure.spi.metrics.ConfigurableMetricExporterProvider; + +public class OpenTelemetryClassInSdkAutoConfigureSpiMetricsPackageUsage { + ConfigurableMetricExporterProvider provider; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkAutoConfigureSpiPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkAutoConfigureSpiPackageUsage.java new file mode 100644 index 000000000000..398aef35a6c3 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkAutoConfigureSpiPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + +import io.opentelemetry.sdk.autoconfigure.spi.Ordered; + +public class OpenTelemetryClassInSdkAutoConfigureSpiPackageUsage { + Ordered ordered; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkAutoConfigureSpiTracesPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkAutoConfigureSpiTracesPackageUsage.java new file mode 100644 index 000000000000..a3d1385fdf66 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkAutoConfigureSpiTracesPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + +import io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSamplerProvider; + +public class OpenTelemetryClassInSdkAutoConfigureSpiTracesPackageUsage { + ConfigurableSamplerProvider provider; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkCommonPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkCommonPackageUsage.java new file mode 100644 index 000000000000..5a14f9b142bb --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkCommonPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + +import io.opentelemetry.sdk.common.Clock; + +public class OpenTelemetryClassInSdkCommonPackageUsage { + Clock clock; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkLogsDataPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkLogsDataPackageUsage.java new file mode 100644 index 000000000000..7866e50077fa --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkLogsDataPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + +import io.opentelemetry.sdk.logs.data.Body; + +public class OpenTelemetryClassInSdkLogsDataPackageUsage { + Body body; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkLogsExportPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkLogsExportPackageUsage.java new file mode 100644 index 000000000000..029708708ba4 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkLogsExportPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + +import io.opentelemetry.sdk.logs.export.LogRecordExporter; + +public class OpenTelemetryClassInSdkLogsExportPackageUsage { + LogRecordExporter exporter; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkLogsPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkLogsPackageUsage.java new file mode 100644 index 000000000000..ec03d8bf65d1 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkLogsPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + +import io.opentelemetry.sdk.logs.SdkLoggerProvider; + +public class OpenTelemetryClassInSdkLogsPackageUsage { + SdkLoggerProvider provider; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkMetricsDataPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkMetricsDataPackageUsage.java new file mode 100644 index 000000000000..97b17a45b12e --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkMetricsDataPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + +import io.opentelemetry.sdk.metrics.data.Data; + +public class OpenTelemetryClassInSdkMetricsDataPackageUsage { + Data data; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkMetricsExportPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkMetricsExportPackageUsage.java new file mode 100644 index 000000000000..1c06e2ae0f99 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkMetricsExportPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + +import io.opentelemetry.sdk.metrics.export.MetricExporter; + +public class OpenTelemetryClassInSdkMetricsExportPackageUsage { + MetricExporter exporter; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkMetricsPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkMetricsPackageUsage.java new file mode 100644 index 000000000000..31b36ae2979d --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkMetricsPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + +import io.opentelemetry.sdk.metrics.Aggregation; + +public class OpenTelemetryClassInSdkMetricsPackageUsage { + Aggregation aggregation; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkPackageUsage.java new file mode 100644 index 000000000000..775f6dfe9a2a --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + +import io.opentelemetry.sdk.OpenTelemetrySdk; + +public class OpenTelemetryClassInSdkPackageUsage { + OpenTelemetrySdk sdk; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkTraceDataPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkTraceDataPackageUsage.java new file mode 100644 index 000000000000..c30d31bf2e8c --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkTraceDataPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + +import io.opentelemetry.sdk.trace.data.EventData; + +public class OpenTelemetryClassInSdkTraceDataPackageUsage { + EventData eventData; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkTraceExportPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkTraceExportPackageUsage.java new file mode 100644 index 000000000000..c84781ae370d --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkTraceExportPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + +import io.opentelemetry.sdk.trace.export.BatchSpanProcessor; + +public class OpenTelemetryClassInSdkTraceExportPackageUsage { + BatchSpanProcessor processor; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkTracePackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkTracePackageUsage.java new file mode 100644 index 000000000000..44a84bf67b23 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkTracePackageUsage.java @@ -0,0 +1,5 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + +public class OpenTelemetryClassInSdkTracePackageUsage { + io.opentelemetry.sdk.trace.SdkTracerProvider provider; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkTraceSamplersPackageUsage.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkTraceSamplersPackageUsage.java new file mode 100644 index 000000000000..808fb09183fa --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryClassInSdkTraceSamplersPackageUsage.java @@ -0,0 +1,7 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + +import io.opentelemetry.sdk.trace.samplers.Sampler; + +public class OpenTelemetryClassInSdkTraceSamplersPackageUsage { + Sampler sampler; +} diff --git a/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryLayerMetaDataTestCase.java b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryLayerMetaDataTestCase.java new file mode 100644 index 000000000000..1670ca86cd99 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/java/org/wildfly/feature/pack/layer/tests/opentelemetry/OpenTelemetryLayerMetaDataTestCase.java @@ -0,0 +1,141 @@ +package org.wildfly.feature.pack.layer.tests.opentelemetry; + +import org.junit.Test; +import org.wildfly.feature.pack.layer.tests.AbstractLayerMetaDataTestCase; + +import java.nio.file.Path; + +public class OpenTelemetryLayerMetaDataTestCase extends AbstractLayerMetaDataTestCase { + + @Test + public void testAnnotationInInstrumentationAnnotationsPackage() { + testSingleClassWar(OpenTelemetryAnnotationInInstrumentationAnnotationsPackageUsage.class); + } + + @Test + public void testClassInApiBaggagePackage() { + testSingleClassWar(OpenTelemetryClassInApiBaggagePackageUsage.class); + } + + @Test + public void testClassInApiBaggagePropagationPackage() { + testSingleClassWar(OpenTelemetryClassInApiBaggagePropagationPackageUsage.class); + } + + @Test + public void testClassInApiCommonPackage() { + testSingleClassWar(OpenTelemetryClassInApiCommonPackageUsage.class); + } + + @Test + public void testClassInApiMetricsPackage() { + testSingleClassWar(OpenTelemetryClassInApiMetricsPackageUsage.class); + } + + @Test + public void testClassInApiTracePackage() { + testSingleClassWar(OpenTelemetryClassInApiTracePackageUsage.class); + } + + @Test + public void testClassInApiTracePropagationPackage() { + testSingleClassWar(OpenTelemetryClassInApiTracePropagationPackageUsage.class); + } + + @Test + public void testClassInApiLogsPackage() { + testSingleClassWar(OpenTelemetryClassInApiLogsPackageUsage.class); + } + + @Test + public void testClassInSdkPackage() { + testSingleClassWar(OpenTelemetryClassInSdkPackageUsage.class); + } + + @Test + public void testClassInSdkCommonPackage() { + testSingleClassWar(OpenTelemetryClassInSdkCommonPackageUsage.class); + } + + @Test + public void testClassInSdkAutoConfigurePackage() { + testSingleClassWar(OpenTelemetryClassInSdkAutoConfigurePackageUsage.class); + } + + @Test + public void testClassInSdkAutoConfigureSpiPackage() { + testSingleClassWar(OpenTelemetryClassInSdkAutoConfigureSpiPackageUsage.class); + } + + @Test + public void testClassInSdkAutoConfigureSpiLogsPackage() { + testSingleClassWar(OpenTelemetryClassInSdkAutoConfigureSpiLogsPackageUsage.class); + } + + @Test + public void testClassInSdkAutoConfigureSpiMetricsPackage() { + testSingleClassWar(OpenTelemetryClassInSdkAutoConfigureSpiMetricsPackageUsage.class); + } + + @Test + public void testClassInSdkAutoConfigureSpiTracesPackage() { + testSingleClassWar(OpenTelemetryClassInSdkAutoConfigureSpiTracesPackageUsage.class); + } + + @Test + public void testClassInSdkLogsPackage() { + testSingleClassWar(OpenTelemetryClassInSdkLogsPackageUsage.class); + } + + @Test + public void testClassInSdkLogsDataPackage() { + testSingleClassWar(OpenTelemetryClassInSdkLogsDataPackageUsage.class); + } + + @Test + public void testClassInSdkLogsExportPackage() { + testSingleClassWar(OpenTelemetryClassInSdkLogsExportPackageUsage.class); + } + + @Test + public void testClassInSdkMetricsPackage() { + testSingleClassWar(OpenTelemetryClassInSdkMetricsPackageUsage.class); + } + + @Test + public void testClassInSdkMetricsDataPackage() { + testSingleClassWar(OpenTelemetryClassInSdkMetricsDataPackageUsage.class); + } + + @Test + public void testClassInSdkMetricsExportPackage() { + testSingleClassWar(OpenTelemetryClassInSdkMetricsExportPackageUsage.class); + } + + @Test + public void testClassInSdkTracePackage() { + testSingleClassWar(OpenTelemetryClassInSdkTracePackageUsage.class); + } + + @Test + public void testClassInSdkTraceDataPackage() { + testSingleClassWar(OpenTelemetryClassInSdkTraceDataPackageUsage.class); + } + + @Test + public void testClassInSdkTraceExportPackage() { + testSingleClassWar(OpenTelemetryClassInSdkTraceExportPackageUsage.class); + } + + @Test + public void testClassInSdkTraceSamplersPackage() { + testSingleClassWar(OpenTelemetryClassInSdkTraceSamplersPackageUsage.class); + } + + private void testSingleClassWar(Class clazz) { + Path p = createArchiveBuilder(ArchiveType.WAR) + .addClasses(clazz) + .build(); + checkLayersForArchive(p, new ExpectedLayers("opentelemetry", "opentelemetry")); + } +} diff --git a/galleon-pack/layer-metadata-tests/src/test/resources/glow/latest/provisioning-bare-metal.xml b/galleon-pack/layer-metadata-tests/src/test/resources/glow/latest/provisioning-bare-metal.xml new file mode 100644 index 000000000000..e1ca107b4712 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/resources/glow/latest/provisioning-bare-metal.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/galleon-pack/layer-metadata-tests/src/test/resources/glow/versions.yaml b/galleon-pack/layer-metadata-tests/src/test/resources/glow/versions.yaml new file mode 100644 index 000000000000..776f0dc974a2 --- /dev/null +++ b/galleon-pack/layer-metadata-tests/src/test/resources/glow/versions.yaml @@ -0,0 +1,2 @@ +latest: ${project.version} +versions: ${project.version} \ No newline at end of file diff --git a/galleon-pack/pom.xml b/galleon-pack/pom.xml index d264e3febf66..20aa78685e6b 100644 --- a/galleon-pack/pom.xml +++ b/galleon-pack/pom.xml @@ -47,6 +47,7 @@ galleon-feature-pack galleon-local galleon-shared + layer-metadata-tests @@ -61,6 +62,13 @@ import + + ${ee.maven.groupId} + wildfly-standard-test-bom + ${ee.maven.version} + pom + import + @@ -87,7 +95,6 @@ wildfly-standard-expansion-bom pom - diff --git a/jsf/multi-jsf-installer/src/main/resources/mojarra-api-module.xml b/jsf/multi-jsf-installer/src/main/resources/mojarra-api-module.xml index 8b22fc5abb87..0c8abd770c64 100644 --- a/jsf/multi-jsf-installer/src/main/resources/mojarra-api-module.xml +++ b/jsf/multi-jsf-installer/src/main/resources/mojarra-api-module.xml @@ -35,7 +35,7 @@ - + diff --git a/jsf/multi-jsf-installer/src/main/resources/mojarra-impl-module.xml b/jsf/multi-jsf-installer/src/main/resources/mojarra-impl-module.xml index dfade86baa5c..14dfcb6d04c2 100644 --- a/jsf/multi-jsf-installer/src/main/resources/mojarra-impl-module.xml +++ b/jsf/multi-jsf-installer/src/main/resources/mojarra-impl-module.xml @@ -43,7 +43,7 @@ - + diff --git a/jsf/multi-jsf-installer/src/main/resources/myfaces-api-module.xml b/jsf/multi-jsf-installer/src/main/resources/myfaces-api-module.xml index d4998ad49359..3bbd790120b8 100644 --- a/jsf/multi-jsf-installer/src/main/resources/myfaces-api-module.xml +++ b/jsf/multi-jsf-installer/src/main/resources/myfaces-api-module.xml @@ -33,7 +33,7 @@ - + diff --git a/jsf/subsystem/src/test/resources/modules2/jakarta/faces/impl/myfaces2/module.xml b/jsf/subsystem/src/test/resources/modules2/jakarta/faces/impl/myfaces2/module.xml index b1f97acdfa6c..24b25dbea351 100644 --- a/jsf/subsystem/src/test/resources/modules2/jakarta/faces/impl/myfaces2/module.xml +++ b/jsf/subsystem/src/test/resources/modules2/jakarta/faces/impl/myfaces2/module.xml @@ -38,7 +38,7 @@ - + diff --git a/microprofile/lra/participant/src/main/java/org/wildfly/extension/microprofile/lra/participant/deployment/LRAParticipantDeploymentDependencyProcessor.java b/microprofile/lra/participant/src/main/java/org/wildfly/extension/microprofile/lra/participant/deployment/LRAParticipantDeploymentDependencyProcessor.java index b4d2cfa70c3d..c3a0c96047e8 100644 --- a/microprofile/lra/participant/src/main/java/org/wildfly/extension/microprofile/lra/participant/deployment/LRAParticipantDeploymentDependencyProcessor.java +++ b/microprofile/lra/participant/src/main/java/org/wildfly/extension/microprofile/lra/participant/deployment/LRAParticipantDeploymentDependencyProcessor.java @@ -62,7 +62,7 @@ private void addModuleDependencies(DeploymentUnit deploymentUnit) { ModuleDependency lraParticipantDependency = new ModuleDependency(moduleLoader, "org.jboss.narayana.rts.lra-participant", false, false, true, false); lraParticipantDependency.addImportFilter(PathFilters.getMetaInfFilter(), true); moduleSpecification.addSystemDependency(lraParticipantDependency); - moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, "org.jboss.jandex", false, false, true, false)); + moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, "io.smallrye.jandex", false, false, true, false)); moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, "org.jboss.as.weld.common", false, false, true, false)); moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, "org.jboss.resteasy.resteasy-cdi", false, false, true, false)); diff --git a/mod_cluster/undertow/src/main/java/org/wildfly/mod_cluster/undertow/UndertowEventHandlerAdapterService.java b/mod_cluster/undertow/src/main/java/org/wildfly/mod_cluster/undertow/UndertowEventHandlerAdapterService.java index d016df2d7ae1..2616517f6b3a 100644 --- a/mod_cluster/undertow/src/main/java/org/wildfly/mod_cluster/undertow/UndertowEventHandlerAdapterService.java +++ b/mod_cluster/undertow/src/main/java/org/wildfly/mod_cluster/undertow/UndertowEventHandlerAdapterService.java @@ -26,6 +26,7 @@ import java.util.Set; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import org.jboss.as.server.suspend.ServerActivity; @@ -56,6 +57,7 @@ public class UndertowEventHandlerAdapterService implements UndertowEventListener, Service, Runnable, ServerActivity { // No logger interface for this module and no reason to create one for this class only private static final Logger log = Logger.getLogger("org.jboss.mod_cluster.undertow"); + private static final ThreadFactory THREAD_FACTORY = new DefaultThreadFactory(UndertowEventHandlerAdapterService.class); private final UndertowEventHandlerAdapterConfiguration configuration; private final Set contexts = new HashSet<>(); @@ -84,12 +86,12 @@ public void start(StartContext context) { eventHandler.start(this.server); for (Engine engine : this.server.getEngines()) { for (org.jboss.modcluster.container.Host host : engine.getHosts()) { - host.getContexts().forEach(c->contexts.add(c)); + host.getContexts().forEach(contexts::add); } } // Start the periodic STATUS thread - this.executor = Executors.newScheduledThreadPool(1, new DefaultThreadFactory(UndertowEventHandlerAdapterService.class)); + this.executor = Executors.newScheduledThreadPool(1, THREAD_FACTORY); this.executor.scheduleWithFixedDelay(this, 0, this.configuration.getStatusInterval().toMillis(), TimeUnit.MILLISECONDS); this.configuration.getSuspendController().registerActivity(this); } @@ -120,13 +122,15 @@ private Context createContext(String contextPath, Host host) { private synchronized void onStart(Context context) { ContainerEventHandler handler = this.configuration.getContainerEventHandler(); - handler.add(context); - State state = this.configuration.getSuspendController().getState(); - // TODO break into onDeploymentAdd once implemented in Undertow - if(state == State.RUNNING) { + if (state == State.RUNNING) { + // Normal operation - trigger ENABLE-APP handler.start(context); + } else { + // Suspended mode - trigger STOP-APP without request nor session draining; + // n.b. contexts will be started by UndertowEventHandlerAdapterService#resume() + handler.add(context); } this.contexts.add(context); @@ -134,10 +138,13 @@ private synchronized void onStart(Context context) { private synchronized void onStop(Context context) { ContainerEventHandler handler = this.configuration.getContainerEventHandler(); + + // Trigger STOP-APP with possible session draining handler.stop(context); - // TODO break into onDeploymentRemove once implemented in Undertow + // Trigger REMOVE-APP handler.remove(context); + this.contexts.remove(context); } diff --git a/pom.xml b/pom.xml index 1c5fa1ddebaa..fbf558feae62 100644 --- a/pom.xml +++ b/pom.xml @@ -313,6 +313,7 @@ 2.2.2 0.8.10 5.2.0.Final + 1.0.0.Alpha6 2.1.0.Final 1.2.12.Final 1.0.8.Final @@ -366,10 +367,9 @@ 0.9.30 1.18.0 7.4.0 - 5.0.0.Final + 5.0.1.Final 1.6.2 1.0.17.Final - 1.3.8 + + + + + diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/ClassAInSarDeployment.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/ClassAInSarDeployment.java similarity index 94% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/ClassAInSarDeployment.java rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/ClassAInSarDeployment.java index 9ce759986636..877c611d731b 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/ClassAInSarDeployment.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/ClassAInSarDeployment.java @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.as.test.integration.sar.context.classloader; +package org.jboss.as.test.integration.sar.context.classloader.module; /** * @author: Jaikiran Pai diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/ClassBInSarDeployment.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/ClassBInSarDeployment.java similarity index 94% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/ClassBInSarDeployment.java rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/ClassBInSarDeployment.java index 563f847006a9..4c6cac391814 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/ClassBInSarDeployment.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/ClassBInSarDeployment.java @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.as.test.integration.sar.context.classloader; +package org.jboss.as.test.integration.sar.context.classloader.module; /** * @author: Jaikiran Pai diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/ClassCInSarDeployment.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/ClassCInSarDeployment.java similarity index 94% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/ClassCInSarDeployment.java rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/ClassCInSarDeployment.java index 7b3debde58e9..2e4bb0558eb6 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/ClassCInSarDeployment.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/ClassCInSarDeployment.java @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.as.test.integration.sar.context.classloader; +package org.jboss.as.test.integration.sar.context.classloader.module; /** * @author: Jaikiran Pai diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/ClassDInSarDeployment.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/ClassDInSarDeployment.java similarity index 94% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/ClassDInSarDeployment.java rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/ClassDInSarDeployment.java index e320f771ad1f..1cc8d8772157 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/ClassDInSarDeployment.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/ClassDInSarDeployment.java @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.as.test.integration.sar.context.classloader; +package org.jboss.as.test.integration.sar.context.classloader.module; /** * @author: Jaikiran Pai diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/MBeanTCCLTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/MBeanInModuleTCCLTestCase.java similarity index 90% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/MBeanTCCLTestCase.java rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/MBeanInModuleTCCLTestCase.java index 9cf1080af150..e4a015752d56 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/MBeanTCCLTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/MBeanInModuleTCCLTestCase.java @@ -1,4 +1,4 @@ -package org.jboss.as.test.integration.sar.context.classloader; +package org.jboss.as.test.integration.sar.context.classloader.module; import java.io.IOException; @@ -14,8 +14,8 @@ import org.jboss.as.arquillian.api.ContainerResource; import org.jboss.as.arquillian.container.ManagementClient; import org.jboss.as.test.integration.common.DefaultConfiguration; -import org.jboss.as.test.integration.sar.context.classloader.mbean.MBeanInAModuleService; -import org.jboss.as.test.integration.sar.context.classloader.mbean.MBeanInAModuleServiceMBean; +import org.jboss.as.test.integration.sar.context.classloader.module.mbean.MBeanInAModuleService; +import org.jboss.as.test.integration.sar.context.classloader.module.mbean.MBeanInAModuleServiceMBean; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; @@ -26,7 +26,7 @@ import org.junit.runner.RunWith; import org.xnio.IoUtils; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; /** * Tests that the MBean instance lifecycle has the correct TCCL set. The TCCL is expected to be the classloader of the deployment through which the MBean was deployed. @@ -36,7 +36,7 @@ */ @RunWith(Arquillian.class) @RunAsClient -public class MBeanTCCLTestCase { +public class MBeanInModuleTCCLTestCase { private static final String EAR_NAME = "tccl-mbean-test-app"; private static final String SAR_NAME = "tccl-mbean-test-sar"; @@ -82,7 +82,7 @@ public static Archive createDeployment() { final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, EAR_NAME + ".ear"); ear.addAsModule(sar); ear.addAsModule(jar); - ear.addAsManifestResource(MBeanTCCLTestCase.class.getPackage(), "jboss-deployment-structure.xml", "jboss-deployment-structure.xml"); + ear.addAsManifestResource(MBeanInModuleTCCLTestCase.class.getPackage(), "jboss-deployment-structure.xml", "jboss-deployment-structure.xml"); ear.addAsManifestResource(createPermissionsXmlAsset( // mbean [wildfly:name=tccl-test-mbean] needs the following permission diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/jboss-deployment-structure.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/jboss-deployment-structure.xml similarity index 100% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/jboss-deployment-structure.xml rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/jboss-deployment-structure.xml diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/mbean/MBeanInAModuleService.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/mbean/MBeanInAModuleService.java similarity index 86% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/mbean/MBeanInAModuleService.java rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/mbean/MBeanInAModuleService.java index 4735142427d0..e0224518ecdc 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/mbean/MBeanInAModuleService.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/mbean/MBeanInAModuleService.java @@ -1,4 +1,4 @@ -package org.jboss.as.test.integration.sar.context.classloader.mbean; +package org.jboss.as.test.integration.sar.context.classloader.module.mbean; import org.jboss.logging.Logger; @@ -14,13 +14,13 @@ public class MBeanInAModuleService implements MBeanInAModuleServiceMBean { static { logger.trace("Static block of " + MBeanInAModuleService.class.getName() + " being loaded"); // test TCCL in static block - testClassLoadByTCCL("org.jboss.as.test.integration.sar.context.classloader.ClassAInSarDeployment"); + testClassLoadByTCCL("org.jboss.as.test.integration.sar.context.classloader.module.ClassAInSarDeployment"); } public MBeanInAModuleService() { logger.trace("Constructing " + this); // test TCCL in constructor - testClassLoadByTCCL("org.jboss.as.test.integration.sar.context.classloader.ClassBInSarDeployment"); + testClassLoadByTCCL("org.jboss.as.test.integration.sar.context.classloader.module.ClassBInSarDeployment"); } @Override @@ -31,13 +31,13 @@ public int add(int a, int b) { public void start() { logger.trace("Starting " + this); // test TCCL in lifecycle method - testClassLoadByTCCL("org.jboss.as.test.integration.sar.context.classloader.ClassCInSarDeployment"); + testClassLoadByTCCL("org.jboss.as.test.integration.sar.context.classloader.module.ClassCInSarDeployment"); } public void stop() { logger.trace("Stopping " + this); // test TCCL in lifecycle method - testClassLoadByTCCL("org.jboss.as.test.integration.sar.context.classloader.ClassDInSarDeployment"); + testClassLoadByTCCL("org.jboss.as.test.integration.sar.context.classloader.module.ClassDInSarDeployment"); } private static void testClassLoadByTCCL(final String className) { diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/mbean/MBeanInAModuleServiceMBean.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/mbean/MBeanInAModuleServiceMBean.java similarity index 59% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/mbean/MBeanInAModuleServiceMBean.java rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/mbean/MBeanInAModuleServiceMBean.java index 2facac424ed2..beb94847a8b8 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/mbean/MBeanInAModuleServiceMBean.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/mbean/MBeanInAModuleServiceMBean.java @@ -1,4 +1,4 @@ -package org.jboss.as.test.integration.sar.context.classloader.mbean; +package org.jboss.as.test.integration.sar.context.classloader.module.mbean; /** * @author: Jaikiran Pai diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/mbean/tccl-test-service.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/mbean/tccl-test-service.xml similarity index 94% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/mbean/tccl-test-service.xml rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/mbean/tccl-test-service.xml index da1e4e5be57e..165f46068d0c 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/mbean/tccl-test-service.xml +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/mbean/tccl-test-service.xml @@ -23,6 +23,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:service:7.0 jboss-service_7_0.xsd"> - + diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/order/ServiceMBeanSupportOrderingTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/order/ServiceMBeanSupportOrderingTestCase.java index 5cc75f3a05d0..5ec4e69dd96a 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/order/ServiceMBeanSupportOrderingTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/order/ServiceMBeanSupportOrderingTestCase.java @@ -22,7 +22,7 @@ package org.jboss.as.test.integration.sar.order; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.io.IOException; import java.util.Arrays; diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/servicembean/ServiceMBeanSupportTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/servicembean/ServiceMBeanSupportTestCase.java index f39f5dfd5eee..383598f08b7b 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/servicembean/ServiceMBeanSupportTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/servicembean/ServiceMBeanSupportTestCase.java @@ -45,7 +45,7 @@ import org.junit.runner.RunWith; import org.wildfly.naming.java.permission.JndiPermission; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; /** * Test MBeans which implement {@link ServiceMBean} and extend {@link ServiceMBeanSupport}. diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/security/jacc/context/PolicyContextTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/security/jacc/context/PolicyContextTestCase.java index 5d6c05e10810..51329152a534 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/security/jacc/context/PolicyContextTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/security/jacc/context/PolicyContextTestCase.java @@ -23,7 +23,7 @@ package org.jboss.as.test.integration.security.jacc.context; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assert.assertTrue; import java.net.URL; diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/transaction/MaximumTimeoutTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/transaction/MaximumTimeoutTestCase.java index 012789d2990b..3d9569bf95c2 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/transaction/MaximumTimeoutTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/transaction/MaximumTimeoutTestCase.java @@ -58,7 +58,7 @@ import java.util.List; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; /** * Tests for EAP7-981 / WFLY-10009 diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/transaction/TransactionStatisticsTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/transaction/TransactionStatisticsTestCase.java index 7b0f603d1318..a8dcd18fa42d 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/transaction/TransactionStatisticsTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/transaction/TransactionStatisticsTestCase.java @@ -55,7 +55,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.NAME; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.READ_ATTRIBUTE_GROUP_OPERATION; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; @RunWith(Arquillian.class) @ServerSetup({TransactionStatisticsTestCase.TransactionEnabledSetup.class}) diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/transaction/inflow/TransactionInflowTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/transaction/inflow/TransactionInflowTestCase.java index 9fcee8074097..c2bb989124ba 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/transaction/inflow/TransactionInflowTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/transaction/inflow/TransactionInflowTestCase.java @@ -22,7 +22,7 @@ package org.jboss.as.test.integration.transaction.inflow; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.net.SocketPermission; import java.util.Hashtable; diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/web/security/runas/ServletRunAsTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/web/security/runas/ServletRunAsTestCase.java index c3370d3f271f..f51cab719478 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/web/security/runas/ServletRunAsTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/web/security/runas/ServletRunAsTestCase.java @@ -49,7 +49,7 @@ import org.jboss.as.arquillian.container.ManagementClient; import org.jboss.as.test.integration.security.common.Utils; import org.jboss.as.test.shared.ServerReload; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Test; diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/web/servlet/preservepath/PreservePathTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/web/servlet/preservepath/PreservePathTestCase.java index c3065e35ec27..d48c69a08ed1 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/web/servlet/preservepath/PreservePathTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/web/servlet/preservepath/PreservePathTestCase.java @@ -20,7 +20,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.UNDEFINE_ATTRIBUTE_OPERATION; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.WRITE_ATTRIBUTE_OPERATION; import static org.jboss.as.test.integration.management.util.ModelUtil.createOpNode; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.io.BufferedReader; import java.io.File; diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/web/suspend/WebSuspendTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/web/suspend/WebSuspendTestCase.java index 2600bfad677d..0ff946f65630 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/web/suspend/WebSuspendTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/web/suspend/WebSuspendTestCase.java @@ -49,7 +49,7 @@ import org.junit.Test; import org.junit.runner.RunWith; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; /** * Tests for suspend/resume functionality in the web subsystem diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/context/application/lifecycle/ApplicationContextLifecycleTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/context/application/lifecycle/ApplicationContextLifecycleTestCase.java index 5ff37a885f0a..9329fa244872 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/context/application/lifecycle/ApplicationContextLifecycleTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/context/application/lifecycle/ApplicationContextLifecycleTestCase.java @@ -41,7 +41,7 @@ import java.util.PropertyPermission; import java.util.concurrent.TimeUnit; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; /** * Tests possible deployment scenarios for CDI ApplicationScoped events, and usage of other EE technologies in such event handlers. diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/xerces/unit/XercesUsageTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/xerces/unit/XercesUsageTestCase.java index 1854938e960d..edc17ef3dcde 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/xerces/unit/XercesUsageTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/xerces/unit/XercesUsageTestCase.java @@ -38,7 +38,7 @@ import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.as.test.integration.xerces.JSFManagedBean; import org.jboss.as.test.integration.xerces.XercesUsageServlet; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.logging.Logger; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; diff --git a/testsuite/integration/basic/src/test/java/org/wildfly/test/integration/weld/beanarchives/BootstrapBeanDeploymentArchiveTestCase.java b/testsuite/integration/basic/src/test/java/org/wildfly/test/integration/weld/beanarchives/BootstrapBeanDeploymentArchiveTestCase.java index f9a7c1811038..1818cf887fdb 100644 --- a/testsuite/integration/basic/src/test/java/org/wildfly/test/integration/weld/beanarchives/BootstrapBeanDeploymentArchiveTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/wildfly/test/integration/weld/beanarchives/BootstrapBeanDeploymentArchiveTestCase.java @@ -21,7 +21,7 @@ */ package org.wildfly.test.integration.weld.beanarchives; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assert.assertEquals; import java.util.Map; diff --git a/testsuite/integration/basic/src/test/java/org/wildfly/test/integration/weld/builtinBeans/InjectPrincipalTestCase.java b/testsuite/integration/basic/src/test/java/org/wildfly/test/integration/weld/builtinBeans/InjectPrincipalTestCase.java index 6ec69622e68d..b28fe9034cb5 100644 --- a/testsuite/integration/basic/src/test/java/org/wildfly/test/integration/weld/builtinBeans/InjectPrincipalTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/wildfly/test/integration/weld/builtinBeans/InjectPrincipalTestCase.java @@ -15,7 +15,7 @@ */ package org.wildfly.test.integration.weld.builtinBeans; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; diff --git a/testsuite/integration/clustering/pom.xml b/testsuite/integration/clustering/pom.xml index d24c2e06d747..b30a49d43f69 100644 --- a/testsuite/integration/clustering/pom.xml +++ b/testsuite/integration/clustering/pom.xml @@ -438,11 +438,6 @@ wildfly-http-transaction-client test - - xom - xom - test - diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/ClusterTestUtil.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/ClusterTestUtil.java index 1784f5107ce7..fe0227a14dba 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/ClusterTestUtil.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/ClusterTestUtil.java @@ -21,7 +21,7 @@ */ package org.jboss.as.test.clustering; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.util.PropertyPermission; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/dispatcher/CommandDispatcherTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/dispatcher/CommandDispatcherTestCase.java index 566159a37106..5a45c58abf41 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/dispatcher/CommandDispatcherTestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/dispatcher/CommandDispatcherTestCase.java @@ -36,7 +36,7 @@ import org.jboss.as.test.clustering.ejb.EJBDirectory; import org.jboss.as.test.clustering.ejb.RemoteEJBDirectory; import org.jboss.as.test.shared.TimeoutUtil; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.WebArchive; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/forwarding/AbstractRemoteEJBForwardingTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/forwarding/AbstractRemoteEJBForwardingTestCase.java index 3d41b0265a26..aad73b788f64 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/forwarding/AbstractRemoteEJBForwardingTestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/forwarding/AbstractRemoteEJBForwardingTestCase.java @@ -22,7 +22,7 @@ package org.jboss.as.test.clustering.cluster.ejb.forwarding; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assert.fail; import java.net.SocketPermission; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/AbstractRemoteStatefulEJBFailoverTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/AbstractRemoteStatefulEJBFailoverTestCase.java index 01644e01916e..9d328d7ec157 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/AbstractRemoteStatefulEJBFailoverTestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/AbstractRemoteStatefulEJBFailoverTestCase.java @@ -32,7 +32,7 @@ import org.jboss.as.test.clustering.cluster.ejb.remote.bean.StatefulIncrementorBean; import org.jboss.as.test.clustering.ejb.EJBDirectory; import org.jboss.as.test.shared.TimeoutUtil; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/AbstractRemoteStatelessEJBFailoverTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/AbstractRemoteStatelessEJBFailoverTestCase.java index 3d61fc9b10fb..2de9b680d0fb 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/AbstractRemoteStatelessEJBFailoverTestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/AbstractRemoteStatelessEJBFailoverTestCase.java @@ -40,7 +40,7 @@ import org.jboss.as.test.clustering.cluster.ejb.remote.bean.StatelessIncrementorBean; import org.jboss.as.test.clustering.ejb.EJBDirectory; import org.jboss.as.test.shared.TimeoutUtil; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/ClientClusterNodeSelectorTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/ClientClusterNodeSelectorTestCase.java index a77d8da6b4d8..719746ea355c 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/ClientClusterNodeSelectorTestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/ClientClusterNodeSelectorTestCase.java @@ -34,7 +34,7 @@ import org.jboss.as.test.clustering.cluster.ejb.remote.bean.Result; import org.jboss.as.test.clustering.ejb.EJBDirectory; import org.jboss.as.test.shared.TimeoutUtil; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.ejb.client.ClusterNodeSelector; import org.jboss.ejb.client.EJBClientConnection; import org.jboss.ejb.client.EJBClientContext; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/ClientExceptionRemoteEJBTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/ClientExceptionRemoteEJBTestCase.java index 375f12df283d..3c27dbfb60e2 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/ClientExceptionRemoteEJBTestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/ClientExceptionRemoteEJBTestCase.java @@ -38,7 +38,7 @@ import org.jboss.as.test.clustering.cluster.ejb.remote.bean.Result; import org.jboss.as.test.clustering.ejb.EJBDirectory; import org.jboss.as.test.clustering.ejb.RemoteEJBDirectory; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/PassivationDisabledRemoteStatefulEjbFailoverTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/PassivationDisabledRemoteStatefulEjbFailoverTestCase.java index 540de9c30c29..f43441a96da1 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/PassivationDisabledRemoteStatefulEjbFailoverTestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/PassivationDisabledRemoteStatefulEjbFailoverTestCase.java @@ -14,7 +14,7 @@ import org.jboss.as.test.clustering.ejb.EJBDirectory; import org.jboss.as.test.clustering.ejb.RemoteEJBDirectory; import org.jboss.as.test.shared.TimeoutUtil; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/RemoteStatefulEJBConcurrentFailoverTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/RemoteStatefulEJBConcurrentFailoverTestCase.java index e9bff2ebbafb..bcd04e394383 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/RemoteStatefulEJBConcurrentFailoverTestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/RemoteStatefulEJBConcurrentFailoverTestCase.java @@ -42,7 +42,7 @@ import org.jboss.as.test.clustering.ejb.EJBDirectory; import org.jboss.as.test.clustering.ejb.RemoteEJBDirectory; import org.jboss.as.test.shared.TimeoutUtil; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/RemoteStatefulEJBFailoverTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/RemoteStatefulEJBFailoverTestCase.java index e958d82ab989..49097242e80e 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/RemoteStatefulEJBFailoverTestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/RemoteStatefulEJBFailoverTestCase.java @@ -32,7 +32,7 @@ import org.jboss.as.test.clustering.cluster.ejb.remote.bean.StatefulIncrementorBean; import org.jboss.as.test.clustering.ejb.EJBDirectory; import org.jboss.as.test.clustering.ejb.RemoteEJBDirectory; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/SuspendResumeRemoteEJBTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/SuspendResumeRemoteEJBTestCase.java index 1b5c8eefed76..ffdcfbf7d169 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/SuspendResumeRemoteEJBTestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/SuspendResumeRemoteEJBTestCase.java @@ -37,7 +37,7 @@ import org.jboss.as.test.clustering.cluster.ejb.remote.bean.Result; import org.jboss.as.test.clustering.ejb.EJBDirectory; import org.jboss.as.test.clustering.ejb.RemoteEJBDirectory; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.dmr.ModelNode; import org.jboss.logging.Logger; import org.jboss.shrinkwrap.api.Archive; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/TransactionalRemoteStatefulEJBFailoverTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/TransactionalRemoteStatefulEJBFailoverTestCase.java index 997342a03379..73d392b76352 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/TransactionalRemoteStatefulEJBFailoverTestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/TransactionalRemoteStatefulEJBFailoverTestCase.java @@ -41,7 +41,7 @@ import org.jboss.as.test.clustering.ejb.EJBDirectory; import org.jboss.as.test.clustering.ejb.RemoteEJBDirectory; import org.jboss.as.test.shared.ServerReload; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.ejb.client.EJBClient; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/TransactionalRemoteStatelessTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/TransactionalRemoteStatelessTestCase.java index a0d1e3c0adc1..81d316b32807 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/TransactionalRemoteStatelessTestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/TransactionalRemoteStatelessTestCase.java @@ -48,7 +48,7 @@ import org.jboss.as.test.integration.transactions.TransactionCheckerSingleton; import org.jboss.as.test.integration.transactions.TransactionCheckerSingletonRemote; import org.jboss.as.test.integration.transactions.RemoteLookups; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/TwoConnectorsEJBFailoverTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/TwoConnectorsEJBFailoverTestCase.java index 382256ea1cf6..78918155cfed 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/TwoConnectorsEJBFailoverTestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/TwoConnectorsEJBFailoverTestCase.java @@ -38,7 +38,7 @@ import org.jboss.as.test.clustering.ejb.RemoteEJBDirectory; import org.jboss.as.test.shared.CLIServerSetupTask; import org.jboss.as.test.shared.TimeoutUtil; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/byteman/LastNodeToLeaveRemoteEJBTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/byteman/LastNodeToLeaveRemoteEJBTestCase.java index 9e7b3245ee01..57e48c60feba 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/byteman/LastNodeToLeaveRemoteEJBTestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb/remote/byteman/LastNodeToLeaveRemoteEJBTestCase.java @@ -37,7 +37,7 @@ import org.jboss.as.test.clustering.ejb.NamingEJBDirectory; import org.jboss.as.test.clustering.ejb.RemoteEJBDirectory; import org.jboss.as.test.shared.TimeoutUtil; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.ejb.client.ClusterNodeSelector; import org.jboss.ejb.client.EJBClientConnection; import org.jboss.ejb.client.EJBClientContext; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb2/remote/SuspendResumeRemoteEJB2TestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb2/remote/SuspendResumeRemoteEJB2TestCase.java index 88832fe1bcee..e002ed9bb327 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb2/remote/SuspendResumeRemoteEJB2TestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb2/remote/SuspendResumeRemoteEJB2TestCase.java @@ -39,7 +39,7 @@ import org.jboss.as.test.clustering.cluster.ejb2.remote.bean.SlowHeartbeatBean; import org.jboss.as.test.clustering.ejb.EJBDirectory; import org.jboss.as.test.clustering.ejb.RemoteEJBDirectory; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.dmr.ModelNode; import org.jboss.logging.Logger; import org.jboss.shrinkwrap.api.Archive; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb2/stateful/failover/RemoteEJBClientStatefulBeanFailoverTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb2/stateful/failover/RemoteEJBClientStatefulBeanFailoverTestCase.java index 1d6b0026ff64..3cc277e5374a 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb2/stateful/failover/RemoteEJBClientStatefulBeanFailoverTestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb2/stateful/failover/RemoteEJBClientStatefulBeanFailoverTestCase.java @@ -22,7 +22,7 @@ package org.jboss.as.test.clustering.cluster.ejb2.stateful.failover; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.util.PropertyPermission; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb2/stateful/failover/dd/RemoteEJB2ClientStatefulBeanFailoverDDTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb2/stateful/failover/dd/RemoteEJB2ClientStatefulBeanFailoverDDTestCase.java index 071939c6b254..c02ea5bceeab 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb2/stateful/failover/dd/RemoteEJB2ClientStatefulBeanFailoverDDTestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb2/stateful/failover/dd/RemoteEJB2ClientStatefulBeanFailoverDDTestCase.java @@ -22,7 +22,7 @@ package org.jboss.as.test.clustering.cluster.ejb2.stateful.failover.dd; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.util.PropertyPermission; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb2/stateless/RemoteStatelessFailoverTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb2/stateless/RemoteStatelessFailoverTestCase.java index a6fa808f1393..47d9025131cf 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb2/stateless/RemoteStatelessFailoverTestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/ejb2/stateless/RemoteStatelessFailoverTestCase.java @@ -23,7 +23,7 @@ package org.jboss.as.test.clustering.cluster.ejb2.stateless; import static org.jboss.as.test.clustering.cluster.AbstractClusteringTestCase.*; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assert.assertEquals; import java.util.ArrayList; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/group/GroupListenerTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/group/GroupListenerTestCase.java index 0f1a08c12ee9..e3c624b12658 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/group/GroupListenerTestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/group/GroupListenerTestCase.java @@ -34,7 +34,7 @@ import org.jboss.as.test.clustering.ejb.EJBDirectory; import org.jboss.as.test.clustering.ejb.RemoteEJBDirectory; import org.jboss.as.test.shared.TimeoutUtil; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.WebArchive; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/infinispan/AbstractCacheTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/infinispan/AbstractCacheTestCase.java index ebe82d311398..150b7abaf79d 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/infinispan/AbstractCacheTestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/infinispan/AbstractCacheTestCase.java @@ -22,7 +22,7 @@ package org.jboss.as.test.clustering.cluster.infinispan; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.io.IOException; import java.lang.reflect.ReflectPermission; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/provider/ServiceProviderRegistrationTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/provider/ServiceProviderRegistrationTestCase.java index 20c28de79628..2faceed667ee 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/provider/ServiceProviderRegistrationTestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/provider/ServiceProviderRegistrationTestCase.java @@ -12,7 +12,7 @@ import org.jboss.as.test.clustering.cluster.provider.bean.ServiceProviderRetrieverBean; import org.jboss.as.test.clustering.ejb.EJBDirectory; import org.jboss.as.test.clustering.ejb.RemoteEJBDirectory; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.WebArchive; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/registry/RegistryTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/registry/RegistryTestCase.java index 4602d9d4d21b..340cec929224 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/registry/RegistryTestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/registry/RegistryTestCase.java @@ -1,6 +1,6 @@ package org.jboss.as.test.clustering.cluster.registry; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assert.*; import java.util.Collection; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/singleton/SingletonBackupServiceTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/singleton/SingletonBackupServiceTestCase.java index 4dcb383fdc19..6360c7ebcbf1 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/singleton/SingletonBackupServiceTestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/singleton/SingletonBackupServiceTestCase.java @@ -41,7 +41,7 @@ import org.jboss.as.test.clustering.cluster.singleton.service.ValueServiceActivator; import org.jboss.as.test.clustering.cluster.singleton.service.ValueServiceServlet; import org.jboss.as.test.http.util.TestHttpClientUtils; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/single/dispatcher/CommandDispatcherTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/single/dispatcher/CommandDispatcherTestCase.java index 9ffe42cff6f9..7777fae8940e 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/single/dispatcher/CommandDispatcherTestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/single/dispatcher/CommandDispatcherTestCase.java @@ -31,7 +31,7 @@ import org.jboss.as.test.clustering.cluster.dispatcher.bean.ClusterTopologyRetrieverBean; import org.jboss.as.test.clustering.ejb.EJBDirectory; import org.jboss.as.test.clustering.ejb.RemoteEJBDirectory; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.WebArchive; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/single/provider/ServiceProviderRegistrationTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/single/provider/ServiceProviderRegistrationTestCase.java index d6e81cd8f34e..883d50adc00e 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/single/provider/ServiceProviderRegistrationTestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/single/provider/ServiceProviderRegistrationTestCase.java @@ -22,7 +22,7 @@ package org.jboss.as.test.clustering.single.provider; import static org.jboss.as.test.clustering.cluster.AbstractClusteringTestCase.*; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assert.*; import java.util.Collection; diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/single/registry/RegistryTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/single/registry/RegistryTestCase.java index 94cb259391ad..745de18222ae 100644 --- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/single/registry/RegistryTestCase.java +++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/single/registry/RegistryTestCase.java @@ -22,7 +22,7 @@ package org.jboss.as.test.clustering.single.registry; import static org.jboss.as.test.clustering.cluster.AbstractClusteringTestCase.*; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assert.*; import java.util.Collection; diff --git a/testsuite/integration/elytron-oidc-client/pom.xml b/testsuite/integration/elytron-oidc-client/pom.xml index 5b174aa4fff8..4468555279ec 100644 --- a/testsuite/integration/elytron-oidc-client/pom.xml +++ b/testsuite/integration/elytron-oidc-client/pom.xml @@ -133,11 +133,6 @@ wildfly-naming-client test - - xom - xom - test - diff --git a/testsuite/integration/elytron-oidc-client/src/test/java/org/wildfly/test/integration/elytron/oidc/client/propagation/OidcIdentityPropagationTestCase.java b/testsuite/integration/elytron-oidc-client/src/test/java/org/wildfly/test/integration/elytron/oidc/client/propagation/OidcIdentityPropagationTestCase.java index 5030b87538a3..18bf7cec1006 100644 --- a/testsuite/integration/elytron-oidc-client/src/test/java/org/wildfly/test/integration/elytron/oidc/client/propagation/OidcIdentityPropagationTestCase.java +++ b/testsuite/integration/elytron-oidc-client/src/test/java/org/wildfly/test/integration/elytron/oidc/client/propagation/OidcIdentityPropagationTestCase.java @@ -29,7 +29,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.WRITE_ATTRIBUTE_OPERATION; import static org.jboss.as.controller.operations.common.Util.createAddOperation; import static org.jboss.as.test.integration.management.util.ModelUtil.createOpNode; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assume.assumeTrue; import static org.wildfly.test.integration.elytron.oidc.client.KeycloakConfiguration.getRealmRepresentation; import static org.wildfly.test.integration.elytron.oidc.client.OidcBaseTest.KEYCLOAK_CONTAINER; diff --git a/testsuite/integration/elytron/pom.xml b/testsuite/integration/elytron/pom.xml index 63f7e016eafa..1b0f090b75b5 100644 --- a/testsuite/integration/elytron/pom.xml +++ b/testsuite/integration/elytron/pom.xml @@ -140,11 +140,6 @@ jboss-ejb-client test - - xom - xom - test - ${project.groupId} diff --git a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/application/AbstractCredentialStoreTestCase.java b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/application/AbstractCredentialStoreTestCase.java index 74bc4da07c98..42e1be3a83da 100644 --- a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/application/AbstractCredentialStoreTestCase.java +++ b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/application/AbstractCredentialStoreTestCase.java @@ -53,7 +53,7 @@ import org.jboss.as.controller.descriptions.ModelDescriptionConstants; import org.jboss.as.test.integration.management.util.CLIOpResult; import org.jboss.as.test.integration.management.util.CLIWrapper; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; diff --git a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/batch/BatchSubsystemSecurityTestCase.java b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/batch/BatchSubsystemSecurityTestCase.java index 00370bf45347..8dae09cb3416 100644 --- a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/batch/BatchSubsystemSecurityTestCase.java +++ b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/batch/BatchSubsystemSecurityTestCase.java @@ -47,7 +47,7 @@ import org.jboss.as.test.shared.ServerReload; import org.jboss.as.test.shared.SnapshotRestoreSetupTask; import org.jboss.as.test.shared.TimeoutUtil; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.dmr.ModelNode; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/ejb/AuthenticationTestCase.java b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/ejb/AuthenticationTestCase.java index 049dd81132b0..4335c7b508eb 100644 --- a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/ejb/AuthenticationTestCase.java +++ b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/ejb/AuthenticationTestCase.java @@ -23,7 +23,7 @@ import static org.wildfly.test.integration.elytron.util.HttpUtil.get; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/ejb/DefaultElytronEjbSecurityDomainTestCase.java b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/ejb/DefaultElytronEjbSecurityDomainTestCase.java index d35a97f991b4..09ba36d5157a 100644 --- a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/ejb/DefaultElytronEjbSecurityDomainTestCase.java +++ b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/ejb/DefaultElytronEjbSecurityDomainTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.elytron.ejb; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; diff --git a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/ejb/IdentityPropagationTestCase.java b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/ejb/IdentityPropagationTestCase.java index c5e168e02631..9a47d1370798 100644 --- a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/ejb/IdentityPropagationTestCase.java +++ b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/ejb/IdentityPropagationTestCase.java @@ -29,7 +29,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.WRITE_ATTRIBUTE_OPERATION; import static org.jboss.as.controller.operations.common.Util.createAddOperation; import static org.jboss.as.controller.operations.common.Util.getUndefineAttributeOperation; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.wildfly.test.integration.elytron.util.HttpUtil.get; diff --git a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/realm/AggregateRealmTestCase.java b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/realm/AggregateRealmTestCase.java index 54d55fb3f08d..fd9c3b02f56a 100644 --- a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/realm/AggregateRealmTestCase.java +++ b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/realm/AggregateRealmTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.elytron.realm; import static jakarta.servlet.http.HttpServletResponse.SC_OK; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assert.assertEquals; import static org.wildfly.test.integration.elytron.realm.AggregateRealmUtil.assertAttribute; import static org.wildfly.test.integration.elytron.realm.AggregateRealmUtil.assertAuthenticationFailed; diff --git a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/realm/AggregateRealmWithTransformerTestCase.java b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/realm/AggregateRealmWithTransformerTestCase.java index 3c7d4b2520f0..09aa30cad1a3 100644 --- a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/realm/AggregateRealmWithTransformerTestCase.java +++ b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/realm/AggregateRealmWithTransformerTestCase.java @@ -55,7 +55,7 @@ import static org.hamcrest.CoreMatchers.is; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.wildfly.test.integration.elytron.realm.AggregateRealmUtil.assertAttribute; import static org.wildfly.test.integration.elytron.realm.AggregateRealmUtil.assertAuthenticationFailed; import static org.wildfly.test.integration.elytron.realm.AggregateRealmUtil.assertAuthenticationSuccess; diff --git a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/realm/JdbcRealmTestCase.java b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/realm/JdbcRealmTestCase.java index 36376e6d25f0..e114a03d617e 100644 --- a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/realm/JdbcRealmTestCase.java +++ b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/realm/JdbcRealmTestCase.java @@ -17,7 +17,7 @@ package org.wildfly.test.integration.elytron.realm; import static jakarta.servlet.http.HttpServletResponse.SC_OK; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assert.assertEquals; import java.net.URL; diff --git a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/web/WebAuthenticationTestCaseBase.java b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/web/WebAuthenticationTestCaseBase.java index e0024231b430..a0337d91c94f 100644 --- a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/web/WebAuthenticationTestCaseBase.java +++ b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/web/WebAuthenticationTestCaseBase.java @@ -23,7 +23,7 @@ package org.wildfly.test.integration.elytron.web; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assert.assertEquals; import static org.wildfly.test.integration.elytron.util.HttpUtil.get; diff --git a/testsuite/integration/iiop/pom.xml b/testsuite/integration/iiop/pom.xml index 3818c0779ac6..577e55101109 100644 --- a/testsuite/integration/iiop/pom.xml +++ b/testsuite/integration/iiop/pom.xml @@ -96,11 +96,6 @@ wildfly-transaction-client test - - xom - xom - test - diff --git a/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/basic/BasicIIOPInvocationTestCase.java b/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/basic/BasicIIOPInvocationTestCase.java index 881383d07adf..a1eac259bbfe 100644 --- a/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/basic/BasicIIOPInvocationTestCase.java +++ b/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/basic/BasicIIOPInvocationTestCase.java @@ -36,7 +36,7 @@ import org.jboss.as.network.NetworkUtils; import org.jboss.as.test.shared.FileUtils; import org.jboss.as.test.shared.PropertiesValueResolver; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/security/IIOPSecurityInvocationTestCase.java b/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/security/IIOPSecurityInvocationTestCase.java index 90ca76c9cdea..ba039a199912 100644 --- a/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/security/IIOPSecurityInvocationTestCase.java +++ b/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/security/IIOPSecurityInvocationTestCase.java @@ -36,7 +36,7 @@ import org.jboss.as.network.NetworkUtils; import org.jboss.as.test.shared.FileUtils; import org.jboss.as.test.shared.PropertiesValueResolver; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.as.test.shared.integration.ejb.security.Util; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/transaction/TransactionIIOPInvocationTestCase.java b/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/transaction/TransactionIIOPInvocationTestCase.java index f9f7c7d7314d..98193bee0153 100644 --- a/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/transaction/TransactionIIOPInvocationTestCase.java +++ b/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/transaction/TransactionIIOPInvocationTestCase.java @@ -40,7 +40,7 @@ import org.jboss.as.network.NetworkUtils; import org.jboss.as.test.shared.FileUtils; import org.jboss.as.test.shared.PropertiesValueResolver; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/transaction/timeout/IIOPTimeoutTestCase.java b/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/transaction/timeout/IIOPTimeoutTestCase.java index 381873f90406..86d150db5424 100644 --- a/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/transaction/timeout/IIOPTimeoutTestCase.java +++ b/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/transaction/timeout/IIOPTimeoutTestCase.java @@ -50,7 +50,7 @@ import java.rmi.ServerException; import java.util.PropertyPermission; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; /** * Tests on transaction timeout behavior with SLSB beans diff --git a/testsuite/integration/manualmode/pom.xml b/testsuite/integration/manualmode/pom.xml index c31f81010485..edcb54f6ae63 100644 --- a/testsuite/integration/manualmode/pom.xml +++ b/testsuite/integration/manualmode/pom.xml @@ -320,11 +320,6 @@ wsdl4j test - - xom - xom - test - ${project.groupId} wildfly-client-all diff --git a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/ejb/client/outbound/connection/RemoteOutboundConnectionReconnectTestCase.java b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/ejb/client/outbound/connection/RemoteOutboundConnectionReconnectTestCase.java index be934bec02a3..fed56956c784 100644 --- a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/ejb/client/outbound/connection/RemoteOutboundConnectionReconnectTestCase.java +++ b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/ejb/client/outbound/connection/RemoteOutboundConnectionReconnectTestCase.java @@ -22,7 +22,7 @@ package org.jboss.as.test.manualmode.ejb.client.outbound.connection; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.io.File; import java.io.FilePermission; diff --git a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/ejb/client/outbound/connection/transaction/preparehalt/TransactionPropagationFailureTestCase.java b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/ejb/client/outbound/connection/transaction/preparehalt/TransactionPropagationFailureTestCase.java index e4ca97932e59..ba81a6ec3a8e 100644 --- a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/ejb/client/outbound/connection/transaction/preparehalt/TransactionPropagationFailureTestCase.java +++ b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/ejb/client/outbound/connection/transaction/preparehalt/TransactionPropagationFailureTestCase.java @@ -62,7 +62,7 @@ import java.util.PropertyPermission; import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createFilePermission; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; /** * Testing transaction recovery on cases where WildFly calls remote Jakarta Enterprise Beans on the other WildFly instance. diff --git a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/messaging/ActivemqServerAddonsTestCase.java b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/messaging/ActivemqServerAddonsTestCase.java index 1203b135efbb..ee87efc9f667 100644 --- a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/messaging/ActivemqServerAddonsTestCase.java +++ b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/messaging/ActivemqServerAddonsTestCase.java @@ -15,7 +15,7 @@ */ package org.jboss.as.test.manualmode.messaging; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.jboss.shrinkwrap.api.ShrinkWrap.create; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/server/nongraceful/NongracefulStartTestCase.java b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/server/nongraceful/NongracefulStartTestCase.java index 51bd76a63901..ad5d2c024dcb 100644 --- a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/server/nongraceful/NongracefulStartTestCase.java +++ b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/server/nongraceful/NongracefulStartTestCase.java @@ -1,6 +1,6 @@ package org.jboss.as.test.manualmode.server.nongraceful; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.net.SocketPermission; import java.util.PropertyPermission; diff --git a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/weld/builtinBeans/LegacyCompliantPrincipalPropagationTestCase.java b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/weld/builtinBeans/LegacyCompliantPrincipalPropagationTestCase.java index ec60056176f2..9f7521a3f4b0 100644 --- a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/weld/builtinBeans/LegacyCompliantPrincipalPropagationTestCase.java +++ b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/weld/builtinBeans/LegacyCompliantPrincipalPropagationTestCase.java @@ -40,7 +40,7 @@ import org.wildfly.security.permission.ElytronPermission; import static org.jboss.as.controller.client.helpers.Operations.createWriteAttributeOperation; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; /** diff --git a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/weld/extension/BeforeShutdownJNDILookupTestCase.java b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/weld/extension/BeforeShutdownJNDILookupTestCase.java index 5643257fc975..361c33075366 100644 --- a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/weld/extension/BeforeShutdownJNDILookupTestCase.java +++ b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/weld/extension/BeforeShutdownJNDILookupTestCase.java @@ -6,7 +6,7 @@ import org.jboss.arquillian.container.test.api.TargetsContainer; import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/testsuite/integration/manualmode/src/test/java/org/wildfly/test/manual/elytron/seccontext/AbstractSecurityContextPropagationTestBase.java b/testsuite/integration/manualmode/src/test/java/org/wildfly/test/manual/elytron/seccontext/AbstractSecurityContextPropagationTestBase.java index 6c444cc181b7..9b2d1e354f0c 100644 --- a/testsuite/integration/manualmode/src/test/java/org/wildfly/test/manual/elytron/seccontext/AbstractSecurityContextPropagationTestBase.java +++ b/testsuite/integration/manualmode/src/test/java/org/wildfly/test/manual/elytron/seccontext/AbstractSecurityContextPropagationTestBase.java @@ -24,7 +24,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.startsWith; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/testsuite/integration/manualmode/src/test/java/org/wildfly/test/manual/elytron/seccontext/ServerChainSecurityContextPropagationTestCase.java b/testsuite/integration/manualmode/src/test/java/org/wildfly/test/manual/elytron/seccontext/ServerChainSecurityContextPropagationTestCase.java index ce4e0a8922e0..870cb589608f 100644 --- a/testsuite/integration/manualmode/src/test/java/org/wildfly/test/manual/elytron/seccontext/ServerChainSecurityContextPropagationTestCase.java +++ b/testsuite/integration/manualmode/src/test/java/org/wildfly/test/manual/elytron/seccontext/ServerChainSecurityContextPropagationTestCase.java @@ -21,7 +21,7 @@ */ package org.wildfly.test.manual.elytron.seccontext; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/testsuite/integration/microprofile-tck/fault-tolerance/pom.xml b/testsuite/integration/microprofile-tck/fault-tolerance/pom.xml index 64dba58594c7..89de1c8df2c0 100644 --- a/testsuite/integration/microprofile-tck/fault-tolerance/pom.xml +++ b/testsuite/integration/microprofile-tck/fault-tolerance/pom.xml @@ -46,6 +46,11 @@ + + org.wildfly.core + wildfly-core-testsuite-shared + test + io.smallrye smallrye-fault-tolerance @@ -76,11 +81,6 @@ shrinkwrap-descriptors-impl-javaee test - - xom - xom - test - diff --git a/testsuite/integration/microprofile-tck/fault-tolerance/src/test/java/org/wildfly/extension/microprofile/faulttolerance/tck/FaultToleranceApplicationArchiveProcessor.java b/testsuite/integration/microprofile-tck/fault-tolerance/src/test/java/org/wildfly/extension/microprofile/faulttolerance/tck/FaultToleranceApplicationArchiveProcessor.java index a3c4cccbbacc..15f7c031434f 100644 --- a/testsuite/integration/microprofile-tck/fault-tolerance/src/test/java/org/wildfly/extension/microprofile/faulttolerance/tck/FaultToleranceApplicationArchiveProcessor.java +++ b/testsuite/integration/microprofile-tck/fault-tolerance/src/test/java/org/wildfly/extension/microprofile/faulttolerance/tck/FaultToleranceApplicationArchiveProcessor.java @@ -21,7 +21,7 @@ */ package org.wildfly.extension.microprofile.faulttolerance.tck; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.lang.reflect.ReflectPermission; import java.util.PropertyPermission; diff --git a/testsuite/integration/microprofile/pom.xml b/testsuite/integration/microprofile/pom.xml index 498d67c64072..a620c94b1fce 100644 --- a/testsuite/integration/microprofile/pom.xml +++ b/testsuite/integration/microprofile/pom.xml @@ -327,12 +327,6 @@ test - - xom - xom - test - - org.wildfly diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/api/ReactiveMessagingKafkaUserApiTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/api/ReactiveMessagingKafkaUserApiTestCase.java index 2065512e9b01..627cf5329a6f 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/api/ReactiveMessagingKafkaUserApiTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/api/ReactiveMessagingKafkaUserApiTestCase.java @@ -53,7 +53,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; /** * @author Kabir Khan diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/serializer/ReactiveMessagingKafkaSerializerTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/serializer/ReactiveMessagingKafkaSerializerTestCase.java index 1b226bbd3f1e..dff6e1555357 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/serializer/ReactiveMessagingKafkaSerializerTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/serializer/ReactiveMessagingKafkaSerializerTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.messaging.kafka.serializer; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.util.ArrayList; import java.util.HashMap; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/ssl/ReactiveMessagingKafkaSslTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/ssl/ReactiveMessagingKafkaSslTestCase.java index 28a04acdf339..e9a5efe8532b 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/ssl/ReactiveMessagingKafkaSslTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/ssl/ReactiveMessagingKafkaSslTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.messaging.kafka.ssl; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.util.Arrays; import java.util.HashSet; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/tx/ReactiveMessagingKafkaTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/tx/ReactiveMessagingKafkaTestCase.java index a6c28282b707..8f40ba420597 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/tx/ReactiveMessagingKafkaTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/tx/ReactiveMessagingKafkaTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.messaging.kafka.tx; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.util.Arrays; import java.util.Collections; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/config/ConnectorConfigTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/config/ConnectorConfigTestCase.java index 5988b8381eb6..721982839f38 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/config/ConnectorConfigTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/config/ConnectorConfigTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.messaging.ported.config; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.wildfly.test.integration.microprofile.reactive.messaging.ported.utils.ReactiveMessagingTestUtils.await; import static org.wildfly.test.integration.microprofile.reactive.messaging.ported.utils.ReactiveMessagingTestUtils.checkList; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/config/ConnectorProfileConfigTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/config/ConnectorProfileConfigTestCase.java index 60485fab54d6..96c5a9975ee5 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/config/ConnectorProfileConfigTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/config/ConnectorProfileConfigTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.messaging.ported.config; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.wildfly.test.integration.microprofile.reactive.messaging.ported.utils.ReactiveMessagingTestUtils.await; import java.util.List; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/ProcessorSignatureTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/ProcessorSignatureTestCase.java index 7b292148401d..dccc344683af 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/ProcessorSignatureTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/ProcessorSignatureTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.messaging.ported.signatures; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.wildfly.test.integration.microprofile.reactive.messaging.ported.utils.ReactiveMessagingTestUtils.await; import static org.wildfly.test.integration.microprofile.reactive.messaging.ported.utils.ReactiveMessagingTestUtils.checkList; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/PublisherSignatureTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/PublisherSignatureTestCase.java index 6d87b32420ab..d40acd697a49 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/PublisherSignatureTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/PublisherSignatureTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.messaging.ported.signatures; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.wildfly.test.integration.microprofile.reactive.messaging.ported.utils.ReactiveMessagingTestUtils.await; import static org.wildfly.test.integration.microprofile.reactive.messaging.ported.utils.ReactiveMessagingTestUtils.checkList; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/SubscriberSignatureTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/SubscriberSignatureTestCase.java index eddac33b5f75..920545928ff1 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/SubscriberSignatureTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/SubscriberSignatureTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.messaging.ported.signatures; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.wildfly.test.integration.microprofile.reactive.messaging.ported.utils.ReactiveMessagingTestUtils.await; import static org.wildfly.test.integration.microprofile.reactive.messaging.ported.utils.ReactiveMessagingTestUtils.checkList; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/TransformerSignatureTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/TransformerSignatureTestCase.java index 5e3852c92d69..8ad8fa8b58a5 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/TransformerSignatureTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/TransformerSignatureTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.messaging.ported.signatures; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.wildfly.test.integration.microprofile.reactive.messaging.ported.utils.ReactiveMessagingTestUtils.await; import static org.wildfly.test.integration.microprofile.reactive.messaging.ported.utils.ReactiveMessagingTestUtils.checkList; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/rest/channels/ReactiveMessagingChannelsTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/rest/channels/ReactiveMessagingChannelsTestCase.java index acafc5b1c1e4..1d165fcb6ed9 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/rest/channels/ReactiveMessagingChannelsTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/rest/channels/ReactiveMessagingChannelsTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.messaging.rest.channels; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assert.assertEquals; import java.io.BufferedReader; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/sanity/ReactiveMessagingSanityTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/sanity/ReactiveMessagingSanityTestCase.java index 7d7d22625202..7250c4f569fa 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/sanity/ReactiveMessagingSanityTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/sanity/ReactiveMessagingSanityTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.messaging.sanity; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.util.PropertyPermission; import java.util.concurrent.TimeUnit; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/tx/ReactiveMessagingTransactionTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/tx/ReactiveMessagingTransactionTestCase.java index 8af0c3984dba..dbe491b650b1 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/tx/ReactiveMessagingTransactionTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/tx/ReactiveMessagingTransactionTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.messaging.tx; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.util.Collections; import java.util.PropertyPermission; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/streams/operators/ReactiveStreamsOperatorsInjectedReactiveEngineProviderSanityTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/streams/operators/ReactiveStreamsOperatorsInjectedReactiveEngineProviderSanityTestCase.java index 463188514fd9..312efcd35aec 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/streams/operators/ReactiveStreamsOperatorsInjectedReactiveEngineProviderSanityTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/streams/operators/ReactiveStreamsOperatorsInjectedReactiveEngineProviderSanityTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.streams.operators; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.io.FilePermission; import java.util.List; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/streams/operators/ReactiveStreamsOperatorsNoReactiveEngineProviderSanityTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/streams/operators/ReactiveStreamsOperatorsNoReactiveEngineProviderSanityTestCase.java index 7c03910df5d0..42a95d6ea95f 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/streams/operators/ReactiveStreamsOperatorsNoReactiveEngineProviderSanityTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/streams/operators/ReactiveStreamsOperatorsNoReactiveEngineProviderSanityTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.streams.operators; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.io.FilePermission; import java.util.List; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/observability/opentelemetry/BaseOpenTelemetryTest.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/observability/opentelemetry/BaseOpenTelemetryTest.java index d80feed243b6..5f2e71d97d2f 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/observability/opentelemetry/BaseOpenTelemetryTest.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/observability/opentelemetry/BaseOpenTelemetryTest.java @@ -19,7 +19,7 @@ package org.wildfly.test.integration.observability.opentelemetry; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import jakarta.inject.Inject; import io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider; diff --git a/testsuite/integration/multinode/pom.xml b/testsuite/integration/multinode/pom.xml index 882b8044fa94..a3fa32bc3ae3 100644 --- a/testsuite/integration/multinode/pom.xml +++ b/testsuite/integration/multinode/pom.xml @@ -93,11 +93,6 @@ wildfly-transaction-client test - - xom - xom - test - diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/batch/stoprestart/StopFromDifferentNodeTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/batch/stoprestart/StopFromDifferentNodeTestCase.java index 937d83b3070a..e5b8fad77562 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/batch/stoprestart/StopFromDifferentNodeTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/batch/stoprestart/StopFromDifferentNodeTestCase.java @@ -28,7 +28,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.STEPS; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; import static org.jboss.as.test.multinode.ejb.timer.database.DatabaseTimerServiceMultiNodeExecutionDisabledTestCase.getRemoteContext; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assert.assertEquals; import java.net.SocketPermission; diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/RemoteCallClientInterceptorTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/RemoteCallClientInterceptorTestCase.java index 25c564c1032c..41085d95a95b 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/RemoteCallClientInterceptorTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/RemoteCallClientInterceptorTestCase.java @@ -22,7 +22,7 @@ package org.jboss.as.test.multinode.clientinterceptor; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.io.File; import java.io.FilePermission; diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/multiple/MultipleClientInterceptorTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/multiple/MultipleClientInterceptorTestCase.java index 34e753d85b6b..5f8adcf1cbb5 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/multiple/MultipleClientInterceptorTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/multiple/MultipleClientInterceptorTestCase.java @@ -21,7 +21,7 @@ */ package org.jboss.as.test.multinode.clientinterceptor.multiple; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assert.fail; import java.security.SecurityPermission; import java.util.Arrays; diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/protocol/RemoteProtocolChangeClientInterceptorTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/protocol/RemoteProtocolChangeClientInterceptorTestCase.java index 13170c937d93..5263f783d065 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/protocol/RemoteProtocolChangeClientInterceptorTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/protocol/RemoteProtocolChangeClientInterceptorTestCase.java @@ -22,7 +22,7 @@ package org.jboss.as.test.multinode.clientinterceptor.protocol; import static org.jboss.as.test.shared.TestSuiteEnvironment.getSystemProperty; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.io.File; import java.io.FilePermission; diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/secured/SecuredBeanClientInterceptorTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/secured/SecuredBeanClientInterceptorTestCase.java index b919861a1f80..fdfd92dbd5d7 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/secured/SecuredBeanClientInterceptorTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/secured/SecuredBeanClientInterceptorTestCase.java @@ -21,7 +21,7 @@ */ package org.jboss.as.test.multinode.clientinterceptor.secured; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.io.File; import java.io.FilePermission; diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/http/EjbOverHttpDescriptorTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/http/EjbOverHttpDescriptorTestCase.java index e4e27bcf1d7e..1198fee049ce 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/http/EjbOverHttpDescriptorTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/http/EjbOverHttpDescriptorTestCase.java @@ -41,7 +41,7 @@ import java.net.SocketPermission; import java.util.Arrays; import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createFilePermission; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; /** diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/http/EjbOverHttpTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/http/EjbOverHttpTestCase.java index a0a4ad123fda..a071d42fe008 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/http/EjbOverHttpTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/http/EjbOverHttpTestCase.java @@ -57,7 +57,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.STEPS; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createFilePermission; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; /** diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/http/EjbOverHttpWrongCredentialsTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/http/EjbOverHttpWrongCredentialsTestCase.java index 8feef4044916..d2094fa8f103 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/http/EjbOverHttpWrongCredentialsTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/http/EjbOverHttpWrongCredentialsTestCase.java @@ -22,7 +22,7 @@ package org.jboss.as.test.multinode.ejb.http; import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createFilePermission; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.net.SocketPermission; import java.util.Arrays; diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/timer/database/DatabaseTimerServiceMultiNodeTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/timer/database/DatabaseTimerServiceMultiNodeTestCase.java index 8c68a6835e39..617534db98ae 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/timer/database/DatabaseTimerServiceMultiNodeTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/timer/database/DatabaseTimerServiceMultiNodeTestCase.java @@ -28,7 +28,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.STEPS; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; import static org.jboss.as.test.multinode.ejb.timer.database.DatabaseTimerServiceMultiNodeExecutionDisabledTestCase.getRemoteContext; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assert.assertTrue; import java.io.File; diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/timer/database/DatabaseTimerServiceRefreshTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/timer/database/DatabaseTimerServiceRefreshTestCase.java index 07f0665341ce..a49cf1b35edc 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/timer/database/DatabaseTimerServiceRefreshTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/timer/database/DatabaseTimerServiceRefreshTestCase.java @@ -32,7 +32,7 @@ import static org.jboss.as.test.multinode.ejb.timer.database.RefreshIF.Info.CLIENT1; import static org.jboss.as.test.multinode.ejb.timer.database.RefreshIF.Info.RETURN_HANDLE; import static org.jboss.as.test.multinode.ejb.timer.database.RefreshIF.Info.SERVER1; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/remotecall/RemoteLocalCallProfileTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/remotecall/RemoteLocalCallProfileTestCase.java index ea7733d2693d..0adafa89e0f6 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/remotecall/RemoteLocalCallProfileTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/remotecall/RemoteLocalCallProfileTestCase.java @@ -28,7 +28,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.STEPS; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createFilePermission; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.util.Arrays; import java.util.Collections; diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/remotecall/RemoteLocalCallTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/remotecall/RemoteLocalCallTestCase.java index ca675d490834..d05b5d82f8fc 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/remotecall/RemoteLocalCallTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/remotecall/RemoteLocalCallTestCase.java @@ -23,7 +23,7 @@ package org.jboss.as.test.multinode.remotecall; import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createFilePermission; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.security.SecurityPermission; import java.util.Arrays; diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/remotecall/scoped/context/DynamicJNDIContextEJBInvocationTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/remotecall/scoped/context/DynamicJNDIContextEJBInvocationTestCase.java index 2bf04e8159da..c91b9a4d698b 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/remotecall/scoped/context/DynamicJNDIContextEJBInvocationTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/remotecall/scoped/context/DynamicJNDIContextEJBInvocationTestCase.java @@ -40,7 +40,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; /** * A test case for testing the feature introduced in https://issues.jboss.org/browse/EJBCLIENT-34 which diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/transaction/TransactionInvocationTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/transaction/TransactionInvocationTestCase.java index 1ed3e0cf22b8..f7712aea5157 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/transaction/TransactionInvocationTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/transaction/TransactionInvocationTestCase.java @@ -43,7 +43,7 @@ import java.util.Arrays; import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createFilePermission; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; /** * A simple Jakarta Enterprise Beans Remoting transaction context propagation in JTS style from one AS7 server to another. diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/transaction/async/TransactionPropagationTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/transaction/async/TransactionPropagationTestCase.java index ac0b0003680c..068ebfe1c9e2 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/transaction/async/TransactionPropagationTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/transaction/async/TransactionPropagationTestCase.java @@ -33,7 +33,7 @@ import org.junit.runner.RunWith; import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createFilePermission; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.util.Arrays; diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/transaction/nooutbound/TransactionContextRemoteCallTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/transaction/nooutbound/TransactionContextRemoteCallTestCase.java index 1422152925b6..525e8087d548 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/transaction/nooutbound/TransactionContextRemoteCallTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/transaction/nooutbound/TransactionContextRemoteCallTestCase.java @@ -23,7 +23,7 @@ package org.jboss.as.test.multinode.transaction.nooutbound; import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createFilePermission; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.net.SocketPermission; import java.util.Arrays; diff --git a/testsuite/integration/rts/pom.xml b/testsuite/integration/rts/pom.xml index 45d74f756d6f..34b721a17d9c 100644 --- a/testsuite/integration/rts/pom.xml +++ b/testsuite/integration/rts/pom.xml @@ -122,11 +122,6 @@ wildfly-core-testsuite-shared test - - xom - xom - test - diff --git a/testsuite/integration/rts/src/test/java/org/wildfly/test/extension/rts/CoordinatorTestCase.java b/testsuite/integration/rts/src/test/java/org/wildfly/test/extension/rts/CoordinatorTestCase.java index ab6e28483337..204bdf38774a 100644 --- a/testsuite/integration/rts/src/test/java/org/wildfly/test/extension/rts/CoordinatorTestCase.java +++ b/testsuite/integration/rts/src/test/java/org/wildfly/test/extension/rts/CoordinatorTestCase.java @@ -31,7 +31,7 @@ import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.as.arquillian.container.ManagementClient; import org.jboss.as.test.shared.TestSuiteEnvironment; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.jbossts.star.util.TxMediaType; import org.jboss.jbossts.star.util.TxStatusMediaType; import org.jboss.jbossts.star.util.TxSupport; diff --git a/testsuite/integration/rts/src/test/java/org/wildfly/test/extension/rts/ParticipantTestCase.java b/testsuite/integration/rts/src/test/java/org/wildfly/test/extension/rts/ParticipantTestCase.java index 2111b79510c6..c4dda4cf2898 100644 --- a/testsuite/integration/rts/src/test/java/org/wildfly/test/extension/rts/ParticipantTestCase.java +++ b/testsuite/integration/rts/src/test/java/org/wildfly/test/extension/rts/ParticipantTestCase.java @@ -33,7 +33,7 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.as.test.shared.TestSuiteEnvironment; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.jbossts.star.util.TxStatus; import org.jboss.jbossts.star.util.TxSupport; import org.jboss.narayana.rest.integration.api.Aborted; diff --git a/testsuite/integration/secman/pom.xml b/testsuite/integration/secman/pom.xml index 26420f5a1f35..d131af7d8507 100644 --- a/testsuite/integration/secman/pom.xml +++ b/testsuite/integration/secman/pom.xml @@ -93,11 +93,6 @@ jakarta.transaction-api test - - xom - xom - test - diff --git a/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/propertypermission/AbstractPropertyPermissionTests.java b/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/propertypermission/AbstractPropertyPermissionTests.java index 8251fbb933d9..a51a584610bb 100644 --- a/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/propertypermission/AbstractPropertyPermissionTests.java +++ b/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/propertypermission/AbstractPropertyPermissionTests.java @@ -38,7 +38,7 @@ import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.as.arquillian.api.ServerSetup; import org.jboss.as.test.integration.security.common.Utils; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.as.testsuite.integration.secman.servlets.JSMCheckServlet; import org.jboss.logging.Logger; import org.jboss.shrinkwrap.api.asset.Asset; diff --git a/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/propertypermission/PropertyPermissionExpressionsTestCase.java b/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/propertypermission/PropertyPermissionExpressionsTestCase.java index 73433e8b0045..9d73604021cc 100644 --- a/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/propertypermission/PropertyPermissionExpressionsTestCase.java +++ b/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/propertypermission/PropertyPermissionExpressionsTestCase.java @@ -43,7 +43,7 @@ import org.jboss.as.test.integration.security.common.AbstractSystemPropertiesServerSetupTask; import org.jboss.as.test.integration.security.common.Utils; import org.jboss.as.test.shared.TestSuiteEnvironment; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.as.testsuite.integration.secman.servlets.JSMCheckServlet; import org.jboss.as.testsuite.integration.secman.servlets.PrintSystemPropertyServlet; import org.jboss.dmr.ModelNode; diff --git a/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/subsystem/MaximumPermissionsTestCase.java b/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/subsystem/MaximumPermissionsTestCase.java index cf38166a52c6..3a3ac3f2de65 100644 --- a/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/subsystem/MaximumPermissionsTestCase.java +++ b/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/subsystem/MaximumPermissionsTestCase.java @@ -40,7 +40,7 @@ import org.jboss.as.test.integration.management.util.CLIOpResult; import org.jboss.as.test.integration.security.common.Utils; import org.jboss.as.test.shared.TestSuiteEnvironment; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.as.testsuite.integration.secman.servlets.PrintSystemPropertyServlet; import org.jboss.logging.Logger; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/testsuite/integration/smoke/pom.xml b/testsuite/integration/smoke/pom.xml index b74508d917d4..71fbc4f2383d 100644 --- a/testsuite/integration/smoke/pom.xml +++ b/testsuite/integration/smoke/pom.xml @@ -416,12 +416,6 @@ wsdl4j test - - - xom - xom - test - diff --git a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/jms/JMSBridgeTest.java b/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/jms/JMSBridgeTest.java index 6d7cf9448ec0..ddbb9cfc5146 100644 --- a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/jms/JMSBridgeTest.java +++ b/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/jms/JMSBridgeTest.java @@ -24,7 +24,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OUTCOME; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.RESULT; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUCCESS; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/testsuite/integration/web/pom.xml b/testsuite/integration/web/pom.xml index af9feeae4d4b..e6315c768a33 100644 --- a/testsuite/integration/web/pom.xml +++ b/testsuite/integration/web/pom.xml @@ -167,12 +167,6 @@ test - - xom - xom - test - - org.wildfly diff --git a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/ee/concurrent/DefaultContextServiceServletTestCase.java b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/ee/concurrent/DefaultContextServiceServletTestCase.java index f59e1771ad85..2bc9f9b3e500 100644 --- a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/ee/concurrent/DefaultContextServiceServletTestCase.java +++ b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/ee/concurrent/DefaultContextServiceServletTestCase.java @@ -22,7 +22,7 @@ package org.jboss.as.test.integration.ee.concurrent; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.net.URL; diff --git a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/handlers/ForwardedHandlerTestCase.java b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/handlers/ForwardedHandlerTestCase.java index c421fede4dc6..8a6b198dfe23 100644 --- a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/handlers/ForwardedHandlerTestCase.java +++ b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/handlers/ForwardedHandlerTestCase.java @@ -3,7 +3,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ALLOW_RESOURCE_SERVICE_RESTART; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OPERATION_HEADERS; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assert.assertEquals; import java.io.IOException; diff --git a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/handlers/RequestDumpingHandlerTestCase.java b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/handlers/RequestDumpingHandlerTestCase.java index 75924c36ca08..d5084fd43f2c 100644 --- a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/handlers/RequestDumpingHandlerTestCase.java +++ b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/handlers/RequestDumpingHandlerTestCase.java @@ -7,7 +7,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.PROTOCOL; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; import static org.jboss.as.test.integration.management.util.ModelUtil.createOpNode; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.io.File; import java.net.SocketPermission; diff --git a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/handlers/UndertowHandlersConfigTestCase.java b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/handlers/UndertowHandlersConfigTestCase.java index af8a58fe96ae..5fd8817860ad 100644 --- a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/handlers/UndertowHandlersConfigTestCase.java +++ b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/handlers/UndertowHandlersConfigTestCase.java @@ -12,7 +12,6 @@ import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; @@ -23,6 +22,7 @@ import java.io.FilePermission; import java.net.URL; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assert.assertEquals; /** @@ -41,7 +41,7 @@ public static WebArchive deploy() { .addAsWebInfResource(UndertowHandlersConfigTestCase.class.getPackage(), "jboss-web.xml", "jboss-web.xml") .addAsWebResource(new StringAsset("A file"), "file.txt") .addAsWebInfResource(new StringAsset("regex['/rewrite.*'] -> rewrite['/file.txt']"), "undertow-handlers.conf") - .addAsWebResource(PermissionUtils.createPermissionsXmlAsset(new FilePermission("<>", "read,write")), "META-INF/permissions.xml"); + .addAsWebResource(createPermissionsXmlAsset(new FilePermission("<>", "read,write")), "META-INF/permissions.xml"); } diff --git a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/security/servlet3/WebSecurityProgrammaticLoginTestCase.java b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/security/servlet3/WebSecurityProgrammaticLoginTestCase.java index 3685ca7aa142..5bab1b5cceb7 100644 --- a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/security/servlet3/WebSecurityProgrammaticLoginTestCase.java +++ b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/security/servlet3/WebSecurityProgrammaticLoginTestCase.java @@ -21,7 +21,7 @@ */ package org.jboss.as.test.integration.web.security.servlet3; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; diff --git a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/security/websocket/WebSocketSecurityTestCase.java b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/security/websocket/WebSocketSecurityTestCase.java index d90b3fdb0cd7..a6d1ae60d618 100644 --- a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/security/websocket/WebSocketSecurityTestCase.java +++ b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/security/websocket/WebSocketSecurityTestCase.java @@ -21,7 +21,7 @@ */ package org.jboss.as.test.integration.web.security.websocket; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.net.SocketPermission; import java.net.URI; diff --git a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/servlet/lifecycle/ServletLifecycleMethodDescriptorTestCase.java b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/servlet/lifecycle/ServletLifecycleMethodDescriptorTestCase.java index d733c0ec3f73..2ac60e1e0477 100644 --- a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/servlet/lifecycle/ServletLifecycleMethodDescriptorTestCase.java +++ b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/servlet/lifecycle/ServletLifecycleMethodDescriptorTestCase.java @@ -22,7 +22,7 @@ package org.jboss.as.test.integration.web.servlet.lifecycle; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assert.assertEquals; import java.net.URL; diff --git a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/websocket/WebSocketTestCase.java b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/websocket/WebSocketTestCase.java index c80dadadf80c..d04e92f311cc 100644 --- a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/websocket/WebSocketTestCase.java +++ b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/websocket/WebSocketTestCase.java @@ -1,6 +1,6 @@ package org.jboss.as.test.integration.web.websocket; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.io.IOException; import java.net.SocketPermission; diff --git a/testsuite/integration/ws/pom.xml b/testsuite/integration/ws/pom.xml index e9462a577c6a..ad6216f33dcd 100644 --- a/testsuite/integration/ws/pom.xml +++ b/testsuite/integration/ws/pom.xml @@ -360,11 +360,6 @@ wsdl4j test - - xom - xom - test - diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/basic/EJBEndpointTestCase.java b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/basic/EJBEndpointTestCase.java index 4c73e21d1225..50ac09aa8575 100644 --- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/basic/EJBEndpointTestCase.java +++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/basic/EJBEndpointTestCase.java @@ -36,7 +36,7 @@ import org.junit.Before; import org.junit.runner.RunWith; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; /** * @author Rostislav Svoboda diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/basic/PojoEndpointTestCase.java b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/basic/PojoEndpointTestCase.java index 88b1c9baa009..dee7fdad2683 100644 --- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/basic/PojoEndpointTestCase.java +++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/basic/PojoEndpointTestCase.java @@ -36,7 +36,7 @@ import org.junit.Before; import org.junit.runner.RunWith; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; /** * @author Rostislav Svoboda diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefEarTestCase.java b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefEarTestCase.java index ad11a7c3859a..02191fd13a6c 100644 --- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefEarTestCase.java +++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefEarTestCase.java @@ -48,7 +48,7 @@ import org.junit.Test; import org.junit.runner.RunWith; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; /** * Tests for WS ServiceRef from servlet to verify access for in nested war diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefSevletTestCase.java b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefSevletTestCase.java index 737204c4bb6c..b91fc1eb8de2 100644 --- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefSevletTestCase.java +++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefSevletTestCase.java @@ -46,7 +46,7 @@ import org.junit.Test; import org.junit.runner.RunWith; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; /** * @author Rostislav Svoboda diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefTestCase.java b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefTestCase.java index 2303b2b722b8..6ae86b4c3bd1 100644 --- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefTestCase.java +++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefTestCase.java @@ -45,7 +45,7 @@ import org.junit.Test; import org.junit.runner.RunWith; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; /** * Serviceref through ejb3 deployment descriptor. diff --git a/testsuite/integration/xts/pom.xml b/testsuite/integration/xts/pom.xml index e268ad005cdd..c30b856fd1f4 100644 --- a/testsuite/integration/xts/pom.xml +++ b/testsuite/integration/xts/pom.xml @@ -211,11 +211,6 @@ wsdl4j test - - xom - xom - test - diff --git a/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/suspend/AbstractTestCase.java b/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/suspend/AbstractTestCase.java index 873fd6fe7058..ef9a1af01f8f 100644 --- a/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/suspend/AbstractTestCase.java +++ b/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/suspend/AbstractTestCase.java @@ -41,7 +41,7 @@ import java.net.URL; import java.util.List; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.jboss.as.test.xts.suspend.Helpers.getExecutorService; import static org.jboss.as.test.xts.suspend.Helpers.getRemoteService; diff --git a/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/util/DeploymentHelper.java b/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/util/DeploymentHelper.java index f0b2505a4be8..7cd425defd89 100644 --- a/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/util/DeploymentHelper.java +++ b/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/util/DeploymentHelper.java @@ -26,7 +26,7 @@ import java.lang.reflect.ReflectPermission; import java.util.PropertyPermission; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.Asset; diff --git a/testsuite/preview/basic/src/test/java/org/wildfly/test/preview/util/TestsuiteModuleTestCase.java b/testsuite/preview/basic/src/test/java/org/wildfly/test/preview/util/TestsuiteModuleTestCase.java index 345e21bcd16f..c03bafdec874 100644 --- a/testsuite/preview/basic/src/test/java/org/wildfly/test/preview/util/TestsuiteModuleTestCase.java +++ b/testsuite/preview/basic/src/test/java/org/wildfly/test/preview/util/TestsuiteModuleTestCase.java @@ -17,7 +17,7 @@ */ package org.wildfly.test.preview.util; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; diff --git a/testsuite/preview/pom.xml b/testsuite/preview/pom.xml index 96c2160bfd8d..665235c1ed81 100644 --- a/testsuite/preview/pom.xml +++ b/testsuite/preview/pom.xml @@ -86,11 +86,6 @@ wildfly-arquillian-protocol-jmx test - - xom - xom - test - diff --git a/testsuite/shared/pom.xml b/testsuite/shared/pom.xml index ce297e9ce404..1a453aa9868c 100644 --- a/testsuite/shared/pom.xml +++ b/testsuite/shared/pom.xml @@ -255,11 +255,6 @@ compile - - xom - xom - - diff --git a/testsuite/shared/src/main/java/org/jboss/as/test/shared/integration/ejb/security/PermissionUtils.java b/testsuite/shared/src/main/java/org/jboss/as/test/shared/integration/ejb/security/PermissionUtils.java index bb72258f0fa8..3c660b03e982 100644 --- a/testsuite/shared/src/main/java/org/jboss/as/test/shared/integration/ejb/security/PermissionUtils.java +++ b/testsuite/shared/src/main/java/org/jboss/as/test/shared/integration/ejb/security/PermissionUtils.java @@ -22,66 +22,19 @@ package org.jboss.as.test.shared.integration.ejb.security; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FilePermission; -import java.io.IOException; -import java.io.OutputStream; -import java.io.UnsupportedEncodingException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.security.Permission; import java.util.Arrays; import java.util.Iterator; -import nu.xom.Attribute; -import nu.xom.Document; -import nu.xom.Element; -import nu.xom.Serializer; -import org.jboss.shrinkwrap.api.asset.Asset; -import org.jboss.shrinkwrap.api.asset.StringAsset; - /** * @author David M. Lloyd */ public final class PermissionUtils { - public static Asset createPermissionsXmlAsset(Permission... permissions) { - final Element permissionsElement = new Element("permissions"); - permissionsElement.setNamespaceURI("http://xmlns.jcp.org/xml/ns/javaee"); - permissionsElement.addAttribute(new Attribute("version", "7")); - for (Permission permission : permissions) { - final Element permissionElement = new Element("permission"); - - final Element classNameElement = new Element("class-name"); - final Element nameElement = new Element("name"); - classNameElement.appendChild(permission.getClass().getName()); - nameElement.appendChild(permission.getName()); - permissionElement.appendChild(classNameElement); - permissionElement.appendChild(nameElement); - - final String actions = permission.getActions(); - if (actions != null && ! actions.isEmpty()) { - final Element actionsElement = new Element("actions"); - actionsElement.appendChild(actions); - permissionElement.appendChild(actionsElement); - } - permissionsElement.appendChild(permissionElement); - } - Document document = new Document(permissionsElement); - try (ByteArrayOutputStream stream = new ByteArrayOutputStream()) { - final NiceSerializer serializer = new NiceSerializer(stream); - serializer.setIndent(4); - serializer.setLineSeparator("\n"); - serializer.write(document); - serializer.flush(); - return new StringAsset(stream.toString("UTF-8")); - } catch (IOException e) { - throw new IllegalStateException("Generating permissions.xml failed", e); - } - } - /** * Creates a new {@link FilePermission} with the base path of the system property {@code jboss.inst}. * @@ -152,16 +105,4 @@ public static FilePermission createFilePermission(final String action, final Str } return new FilePermission(path.toString(), action); } - - static class NiceSerializer extends Serializer { - - public NiceSerializer(OutputStream out) throws UnsupportedEncodingException { - super(out, "UTF-8"); - } - - protected void writeXMLDeclaration() throws IOException { - super.writeXMLDeclaration(); - super.breakLine(); - } - } } diff --git a/transactions/src/main/java/org/jboss/iiop/tm/InboundTransactionCurrent.java b/transactions/src/main/java/org/jboss/iiop/tm/InboundTransactionCurrent.java deleted file mode 100644 index 93b86d5c5c44..000000000000 --- a/transactions/src/main/java/org/jboss/iiop/tm/InboundTransactionCurrent.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.iiop.tm; - -import jakarta.transaction.Transaction; - -import org.omg.CORBA.Current; - -/** - * Interface to be implemented by a CORBA OTS provider for integration with - * JBossAS. The CORBA OTS provider must (i) create an object that implements - * this interface and (ii) register an initial reference for that object - * with the JBossAS ORB, under name "InboundTransactionCurrent". - *

- * Step (ii) above should be done by a call - * orbInitInfo.register_initial_reference within the - * pre_init method of an - * org.omg.PortableInterceptor.ORBInitializer, - * which will probably be also the initializer that registers a server request - * interceptor for the OTS provider. - * - * @author Francisco Reverbel - * @version $Revision$ - */ -public interface InboundTransactionCurrent extends Current { - String NAME = "InboundTransactionCurrent"; - - /** - * Gets the Transaction instance associated with the current incoming - * request. This method should be called only by code that handles incoming - * requests; its return value is undefined in the case of a call issued - * outside of a request scope. - * - * @return the jakarta.transaction.Transaction instance associated with the - * current incoming request, or null if that request was not issued - * within the scope of some transaction. - */ - Transaction getCurrentTransaction(); - -} diff --git a/undertow/pom.xml b/undertow/pom.xml index aad0f8652aa9..87579664f1a1 100644 --- a/undertow/pom.xml +++ b/undertow/pom.xml @@ -281,5 +281,10 @@ org.wildfly.security wildfly-elytron-ssl + + com.google.guava + guava + test + diff --git a/weld/subsystem/src/main/java/org/jboss/as/weld/services/bootstrap/WeldExecutorServices.java b/weld/subsystem/src/main/java/org/jboss/as/weld/services/bootstrap/WeldExecutorServices.java index 33e1ef74c813..92dc75965aae 100644 --- a/weld/subsystem/src/main/java/org/jboss/as/weld/services/bootstrap/WeldExecutorServices.java +++ b/weld/subsystem/src/main/java/org/jboss/as/weld/services/bootstrap/WeldExecutorServices.java @@ -71,8 +71,7 @@ public WeldExecutorServices(final Consumer executorServicesCon @Override public void start(final StartContext context) throws StartException { - final ThreadGroup threadGroup = new ThreadGroup("Weld ThreadGroup"); - final ThreadFactory factory = new JBossThreadFactory(threadGroup, Boolean.FALSE, null, THREAD_NAME_PATTERN, null, null); + final ThreadFactory factory = new JBossThreadFactory(null, Boolean.FALSE, null, THREAD_NAME_PATTERN, null, null); // set TCCL to null for new threads to make sure no deployment classloader leaks through this executor's TCCL // Weld does not mind having null TCCL in this executor this.executor = new WeldExecutor(bound, runnable -> {