diff --git a/arquillian/jarcontainer/pom.xml b/arquillian/jarcontainer/pom.xml index 03ed295ad7..3ddcde9777 100644 --- a/arquillian/jarcontainer/pom.xml +++ b/arquillian/jarcontainer/pom.xml @@ -1,65 +1,21 @@ - + 4.0.0 - cloud.piranha.arquillian project 24.10.0-SNAPSHOT - piranha-arquillian-jarcontainer - jar - - Piranha - Arquillian - JAR DeployableContainer - - - - org.jboss.arquillian.container - arquillian-container-spi - compile - - - org.jboss.shrinkwrap.descriptors - shrinkwrap-descriptors-api-base - - - - - me.alexpanov - free-port-finder - compile - - - - org.jboss.arquillian.container - arquillian-container-test-spi - - - - org.jboss.arquillian.protocol - arquillian-protocol-servlet-jakarta - - - - org.jboss.arquillian.testenricher - arquillian-testenricher-cdi-jakarta - - - - org.jboss.arquillian.testenricher - arquillian-testenricher-ejb-jakarta - - - - org.jboss.arquillian.testenricher - arquillian-testenricher-resource-jakarta - - - - org.jboss.arquillian.testenricher - arquillian-testenricher-initialcontext - - + + + cloud.piranha.arquillian + piranha-arquillian-managed + ${project.version} + + diff --git a/arquillian/jarcontainer/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/arquillian/jarcontainer/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension deleted file mode 100644 index a16463d72d..0000000000 --- a/arquillian/jarcontainer/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension +++ /dev/null @@ -1 +0,0 @@ -cloud.piranha.arquillian.jarcontainer.PiranhaJarContainerExtension diff --git a/arquillian/managed/pom.xml b/arquillian/managed/pom.xml new file mode 100644 index 0000000000..e73157bf7e --- /dev/null +++ b/arquillian/managed/pom.xml @@ -0,0 +1,77 @@ + + + + 4.0.0 + + + cloud.piranha.arquillian + project + 24.10.0-SNAPSHOT + + + piranha-arquillian-managed + jar + + Piranha - Arquillian - Managed + + + + org.jboss.arquillian.container + arquillian-container-spi + compile + + + org.jboss.shrinkwrap.descriptors + shrinkwrap-descriptors-api-base + + + + + me.alexpanov + free-port-finder + compile + + + + org.jboss.arquillian.container + arquillian-container-test-spi + + + org.jboss.shrinkwrap.descriptors + shrinkwrap-descriptors-api-base + + + + + + org.jboss.arquillian.protocol + arquillian-protocol-servlet-jakarta + + + org.jboss.shrinkwrap.descriptors + shrinkwrap-descriptors-api-base + + + + + + org.jboss.arquillian.testenricher + arquillian-testenricher-cdi-jakarta + + + + org.jboss.arquillian.testenricher + arquillian-testenricher-ejb-jakarta + + + + org.jboss.arquillian.testenricher + arquillian-testenricher-resource-jakarta + + + + org.jboss.arquillian.testenricher + arquillian-testenricher-initialcontext + + + diff --git a/arquillian/jarcontainer/src/main/java/cloud/piranha/arquillian/jarcontainer/PiranhaJarContainer.java b/arquillian/managed/src/main/java/cloud/piranha/arquillian/managed/ManagedPiranhaContainer.java similarity index 96% rename from arquillian/jarcontainer/src/main/java/cloud/piranha/arquillian/jarcontainer/PiranhaJarContainer.java rename to arquillian/managed/src/main/java/cloud/piranha/arquillian/managed/ManagedPiranhaContainer.java index 8e9e044c06..1126cb38cf 100644 --- a/arquillian/jarcontainer/src/main/java/cloud/piranha/arquillian/jarcontainer/PiranhaJarContainer.java +++ b/arquillian/managed/src/main/java/cloud/piranha/arquillian/managed/ManagedPiranhaContainer.java @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.arquillian.jarcontainer; +package cloud.piranha.arquillian.managed; import java.io.File; import java.io.IOException; @@ -51,16 +51,16 @@ import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; /** - * The Piranha JAR container. + * The Managed Piranha container. * * @author Manfred Riem (mriem@manorrock.com) */ -public class PiranhaJarContainer implements DeployableContainer { +public class ManagedPiranhaContainer implements DeployableContainer { /** * Stores the logger. */ - private static final System.Logger LOGGER = System.getLogger(PiranhaJarContainer.class.getName()); + private static final System.Logger LOGGER = System.getLogger(ManagedPiranhaContainer.class.getName()); /** * Stores the PID filename. @@ -80,7 +80,7 @@ public class PiranhaJarContainer implements DeployableContainer getConfigurationClass() { - return PiranhaJarContainerConfiguration.class; + public Class getConfigurationClass() { + return ManagedPiranhaContainerConfiguration.class; } @Override - public void setup(PiranhaJarContainerConfiguration configuration) { + public void setup(ManagedPiranhaContainerConfiguration configuration) { this.configuration = configuration; } diff --git a/arquillian/jarcontainer/src/main/java/cloud/piranha/arquillian/jarcontainer/PiranhaJarContainerConfiguration.java b/arquillian/managed/src/main/java/cloud/piranha/arquillian/managed/ManagedPiranhaContainerConfiguration.java similarity index 95% rename from arquillian/jarcontainer/src/main/java/cloud/piranha/arquillian/jarcontainer/PiranhaJarContainerConfiguration.java rename to arquillian/managed/src/main/java/cloud/piranha/arquillian/managed/ManagedPiranhaContainerConfiguration.java index 20f75009a0..03d7243e8b 100644 --- a/arquillian/jarcontainer/src/main/java/cloud/piranha/arquillian/jarcontainer/PiranhaJarContainerConfiguration.java +++ b/arquillian/managed/src/main/java/cloud/piranha/arquillian/managed/ManagedPiranhaContainerConfiguration.java @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.arquillian.jarcontainer; +package cloud.piranha.arquillian.managed; import org.jboss.arquillian.container.spi.ConfigurationException; import org.jboss.arquillian.container.spi.client.container.ContainerConfiguration; @@ -35,16 +35,16 @@ import static java.lang.System.Logger.Level.INFO; /** - * The Piranha JAR container configuration. + * The Managed Piranha container configuration. * * @author Manfred Riem (mriem@manorrock.com) */ -public class PiranhaJarContainerConfiguration implements ContainerConfiguration { +public class ManagedPiranhaContainerConfiguration implements ContainerConfiguration { /** * Stores the logger. */ - private static final System.Logger LOGGER = System.getLogger(PiranhaJarContainerConfiguration.class.getName()); + private static final System.Logger LOGGER = System.getLogger(ManagedPiranhaContainerConfiguration.class.getName()); /** * Stores the HTTP port. diff --git a/arquillian/jarcontainer/src/main/java/cloud/piranha/arquillian/jarcontainer/PiranhaJarContainerExtension.java b/arquillian/managed/src/main/java/cloud/piranha/arquillian/managed/ManagedPiranhaContainerExtension.java similarity index 86% rename from arquillian/jarcontainer/src/main/java/cloud/piranha/arquillian/jarcontainer/PiranhaJarContainerExtension.java rename to arquillian/managed/src/main/java/cloud/piranha/arquillian/managed/ManagedPiranhaContainerExtension.java index 892e74812d..910d3400c9 100644 --- a/arquillian/jarcontainer/src/main/java/cloud/piranha/arquillian/jarcontainer/PiranhaJarContainerExtension.java +++ b/arquillian/managed/src/main/java/cloud/piranha/arquillian/managed/ManagedPiranhaContainerExtension.java @@ -25,26 +25,26 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.arquillian.jarcontainer; +package cloud.piranha.arquillian.managed; import org.jboss.arquillian.container.spi.client.container.DeployableContainer; import org.jboss.arquillian.core.spi.LoadableExtension; /** - * The Piranha JAR container extension. + * The Managed Piranha container extension. * * @author Manfred Riem (mriem@manorrock.com) */ -public class PiranhaJarContainerExtension implements LoadableExtension { +public class ManagedPiranhaContainerExtension implements LoadableExtension { /** * Default constructor. */ - public PiranhaJarContainerExtension() { + public ManagedPiranhaContainerExtension() { } @Override public void register(ExtensionBuilder extensionBuilder) { - extensionBuilder.service(DeployableContainer.class, PiranhaJarContainer.class); + extensionBuilder.service(DeployableContainer.class, ManagedPiranhaContainer.class); } } diff --git a/arquillian/jarcontainer/src/main/java/module-info.java b/arquillian/managed/src/main/java/module-info.java similarity index 83% rename from arquillian/jarcontainer/src/main/java/module-info.java rename to arquillian/managed/src/main/java/module-info.java index 8662442ee3..7c34f49217 100644 --- a/arquillian/jarcontainer/src/main/java/module-info.java +++ b/arquillian/managed/src/main/java/module-info.java @@ -26,19 +26,19 @@ * POSSIBILITY OF SUCH DAMAGE. */ -import cloud.piranha.arquillian.jarcontainer.PiranhaJarContainerExtension; +import cloud.piranha.arquillian.managed.ManagedPiranhaContainerExtension; import org.jboss.arquillian.core.spi.LoadableExtension; /** - * This module delivers the JAR based distribution support for Arquillian. + * This module delivers the managed Piranha container support for Arquillian. * * @author Manfred Riem (mriem@manorrock.com) */ -module cloud.piranha.arquillian.jarcontainer { +module cloud.piranha.arquillian.managed { - exports cloud.piranha.arquillian.jarcontainer; - opens cloud.piranha.arquillian.jarcontainer; - provides LoadableExtension with PiranhaJarContainerExtension; + exports cloud.piranha.arquillian.managed; + opens cloud.piranha.arquillian.managed; + provides LoadableExtension with ManagedPiranhaContainerExtension; requires arquillian.container.spi; requires arquillian.core.spi; requires free.port.finder; diff --git a/arquillian/managed/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/arquillian/managed/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension new file mode 100644 index 0000000000..2fe378fed7 --- /dev/null +++ b/arquillian/managed/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension @@ -0,0 +1 @@ +cloud.piranha.arquillian.managed.ManagedPiranhaContainerExtension diff --git a/arquillian/pom.xml b/arquillian/pom.xml index 16c4387583..b69db6412d 100644 --- a/arquillian/pom.xml +++ b/arquillian/pom.xml @@ -19,7 +19,7 @@ - jarcontainer + managed server diff --git a/test/coreprofile/helloarquillian/pom.xml b/test/coreprofile/helloarquillian/pom.xml index 8752612eee..3014fb7f98 100644 --- a/test/coreprofile/helloarquillian/pom.xml +++ b/test/coreprofile/helloarquillian/pom.xml @@ -36,25 +36,10 @@ jakarta.jakartaee-core-api provided - - - - cloud.piranha.dist - piranha-dist-coreprofile - ${project.version} - provided - jar - true - cloud.piranha.arquillian - piranha-arquillian-jarcontainer + piranha-arquillian-managed ${project.version} test @@ -81,7 +66,7 @@ - piranha-test-arquillian-jarcontainer + piranha-test-coreprofile-helloarquillian org.apache.maven.plugins diff --git a/test/coreprofile/pom.xml b/test/coreprofile/pom.xml index d02c83e30b..67042ba9b3 100644 --- a/test/coreprofile/pom.xml +++ b/test/coreprofile/pom.xml @@ -14,7 +14,22 @@ pom Piranha - Test - Core Profile - Project - + + + + cloud.piranha.dist + piranha-dist-coreprofile + ${project.version} + provided + jar + true + + helloarquillian hello