Fixes #3998 - Rename Piranha JAR container to Managed Piranha contain…

…er (#3999)
piranhacloud · Sep 21, 2024 · 4aa16ca · 4aa16ca
1 parent f03c7fb
commit 4aa16ca
Show file tree

Hide file tree

Showing 11 changed files with 132 additions and 99 deletions.
diff --git a/arquillian/jarcontainer/pom.xml b/arquillian/jarcontainer/pom.xml
@@ -1,65 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <parent>
         <groupId>cloud.piranha.arquillian</groupId>
         <artifactId>project</artifactId>
         <version>24.10.0-SNAPSHOT</version>
     </parent>
-
     <artifactId>piranha-arquillian-jarcontainer</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Piranha - Arquillian - JAR DeployableContainer</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.jboss.arquillian.container</groupId>
-            <artifactId>arquillian-container-spi</artifactId>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jboss.shrinkwrap.descriptors</groupId>
-                    <artifactId>shrinkwrap-descriptors-api-base</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>me.alexpanov</groupId>
-            <artifactId>free-port-finder</artifactId>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jboss.arquillian.container</groupId>
-            <artifactId>arquillian-container-test-spi</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jboss.arquillian.protocol</groupId>
-            <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jboss.arquillian.testenricher</groupId>
-            <artifactId>arquillian-testenricher-cdi-jakarta</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jboss.arquillian.testenricher</groupId>
-            <artifactId>arquillian-testenricher-ejb-jakarta</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jboss.arquillian.testenricher</groupId>
-            <artifactId>arquillian-testenricher-resource-jakarta</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jboss.arquillian.testenricher</groupId>
-            <artifactId>arquillian-testenricher-initialcontext</artifactId>
-        </dependency>
-    </dependencies>
+    <distributionManagement>
+        <relocation>
+            <groupId>cloud.piranha.arquillian</groupId>
+            <artifactId>piranha-arquillian-managed</artifactId>
+            <version>${project.version}</version>
+        </relocation>
+    </distributionManagement>
 </project>
diff --git a/...iner/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/...iner/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
diff --git a/arquillian/managed/pom.xml b/arquillian/managed/pom.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>cloud.piranha.arquillian</groupId>
+        <artifactId>project</artifactId>
+        <version>24.10.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>piranha-arquillian-managed</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Piranha - Arquillian - Managed</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.arquillian.container</groupId>
+            <artifactId>arquillian-container-spi</artifactId>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jboss.shrinkwrap.descriptors</groupId>
+                    <artifactId>shrinkwrap-descriptors-api-base</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>me.alexpanov</groupId>
+            <artifactId>free-port-finder</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.arquillian.container</groupId>
+            <artifactId>arquillian-container-test-spi</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jboss.shrinkwrap.descriptors</groupId>
+                    <artifactId>shrinkwrap-descriptors-api-base</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.arquillian.protocol</groupId>
+            <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jboss.shrinkwrap.descriptors</groupId>
+                    <artifactId>shrinkwrap-descriptors-api-base</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.arquillian.testenricher</groupId>
+            <artifactId>arquillian-testenricher-cdi-jakarta</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.arquillian.testenricher</groupId>
+            <artifactId>arquillian-testenricher-ejb-jakarta</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.arquillian.testenricher</groupId>
+            <artifactId>arquillian-testenricher-resource-jakarta</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.arquillian.testenricher</groupId>
+            <artifactId>arquillian-testenricher-initialcontext</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/...ian/jarcontainer/PiranhaJarContainer.java → ...lian/managed/ManagedPiranhaContainer.java b/...ian/jarcontainer/PiranhaJarContainer.java → ...lian/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 ([email protected])
  */
-public class PiranhaJarContainer implements DeployableContainer<PiranhaJarContainerConfiguration> {
+public class ManagedPiranhaContainer implements DeployableContainer<ManagedPiranhaContainerConfiguration> {
 
     /**
      * 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<PiranhaJarContai
     /**
      * Stores the configuration.
      */
-    private PiranhaJarContainerConfiguration configuration;
+    private ManagedPiranhaContainerConfiguration configuration;
 
     /**
      * Stores the local repository directory.
@@ -95,16 +95,16 @@ public class PiranhaJarContainer implements DeployableContainer<PiranhaJarContai
     /**
      * Default constructor.
      */
-    public PiranhaJarContainer() {
+    public ManagedPiranhaContainer() {
     }
 
     @Override
-    public Class<PiranhaJarContainerConfiguration> getConfigurationClass() {
-        return PiranhaJarContainerConfiguration.class;
+    public Class<ManagedPiranhaContainerConfiguration> getConfigurationClass() {
+        return ManagedPiranhaContainerConfiguration.class;
     }
 
     @Override
-    public void setup(PiranhaJarContainerConfiguration configuration) {
+    public void setup(ManagedPiranhaContainerConfiguration configuration) {
         this.configuration = configuration;
     }
 

diff --git a/...ner/PiranhaJarContainerConfiguration.java → ...ManagedPiranhaContainerConfiguration.java b/...ner/PiranhaJarContainerConfiguration.java → ...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 ([email protected])
  */
-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/...ntainer/PiranhaJarContainerExtension.java → ...ged/ManagedPiranhaContainerExtension.java b/...ntainer/PiranhaJarContainerExtension.java → ...ged/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 ([email protected])
  */
-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/...rcontainer/src/main/java/module-info.java → ...an/managed/src/main/java/module-info.java b/...rcontainer/src/main/java/module-info.java → ...an/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 ([email protected])
  */
-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/...aged/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/...aged/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
@@ -19,7 +19,7 @@
     </description>
 
     <modules>
-        <module>jarcontainer</module>
+        <module>managed</module>
         <module>server</module>
     </modules>
 

diff --git a/test/coreprofile/helloarquillian/pom.xml b/test/coreprofile/helloarquillian/pom.xml
@@ -36,25 +36,10 @@
             <artifactId>jakarta.jakartaee-core-api</artifactId>
             <scope>provided</scope>
         </dependency>
-
-        <!-- 
-      
-            This dependency is here to make sure piranha-dist-coreprofile.jar
-            exists prior to executing the tests when building in parallel.
-      
-          -->
-        <dependency>
-            <groupId>cloud.piranha.dist</groupId>
-            <artifactId>piranha-dist-coreprofile</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-            <type>jar</type>
-            <optional>true</optional>
-        </dependency>
         <!-- test -->
         <dependency>
             <groupId>cloud.piranha.arquillian</groupId>
-            <artifactId>piranha-arquillian-jarcontainer</artifactId>
+            <artifactId>piranha-arquillian-managed</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
@@ -81,7 +66,7 @@
     </dependencies>
 
     <build>
-        <finalName>piranha-test-arquillian-jarcontainer</finalName>
+        <finalName>piranha-test-coreprofile-helloarquillian</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/test/coreprofile/pom.xml b/test/coreprofile/pom.xml
@@ -14,7 +14,22 @@
     <packaging>pom</packaging>
 
     <name>Piranha - Test - Core Profile - Project</name>
-
+    <dependencies>
+        <!--
+         
+          Make sure the Piranha Core Profile distribution is available before 
+          attempting to build any of the modules. 
+              
+        -->
+        <dependency>
+            <groupId>cloud.piranha.dist</groupId>
+            <artifactId>piranha-dist-coreprofile</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+            <type>jar</type>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
     <modules>
         <module>helloarquillian</module>
         <module>hello</module>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		cloud.piranha.arquillian.managed.ManagedPiranhaContainerExtension