From 2741110f6da1529789a7c7a56843afbc249db44a Mon Sep 17 00:00:00 2001
From: Manfred Riem <mriem@manorrock.com>
Date: Thu, 22 Aug 2024 16:26:11 -0500
Subject: [PATCH 1/2] First pass for #3851

---
 external/tck/coreprofile/pom.xml              |   1 +
 external/tck/coreprofile/rest/pom.xml         |  87 +++++++++++
 .../tck/coreprofile/rest/rest-tck/pom.xml     | 138 ++++++++++++++++++
 .../src/test/resources/arquillian.xml         |   9 ++
 4 files changed, 235 insertions(+)
 create mode 100644 external/tck/coreprofile/rest/pom.xml
 create mode 100644 external/tck/coreprofile/rest/rest-tck/pom.xml
 create mode 100644 external/tck/coreprofile/rest/rest-tck/src/test/resources/arquillian.xml

diff --git a/external/tck/coreprofile/pom.xml b/external/tck/coreprofile/pom.xml
index 1d550e72d2..555264801d 100644
--- a/external/tck/coreprofile/pom.xml
+++ b/external/tck/coreprofile/pom.xml
@@ -20,5 +20,6 @@
         <module>atinject</module>
         <module>jsonb</module>
         <module>jsonp</module>
+        <module>rest</module>
     </modules>
 </project>
diff --git a/external/tck/coreprofile/rest/pom.xml b/external/tck/coreprofile/rest/pom.xml
new file mode 100644
index 0000000000..ac42cc48fe
--- /dev/null
+++ b/external/tck/coreprofile/rest/pom.xml
@@ -0,0 +1,87 @@
+<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>cloud.piranha.external.tck.coreprofile</groupId>
+        <artifactId>project</artifactId>
+        <version>24.9.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>piranha-external-tck-coreprofile-jakarta-coreprofile-tck</artifactId>
+    <packaging>pom</packaging>
+    <name>Piranha - External - TCK - CoreProfile - Jakarta CoreProfile TCK</name>
+    <properties>
+        <ant.home>${project.build.directory}/ant</ant.home>
+        <signature.home>${project.build.directory}/signature</signature.home>
+        <tck.home>${project.build.directory}/tck</tck.home>
+        <test.home>${tck.home}/src/com/sun/ts/tests</test.home>
+    </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>cloud.piranha</groupId>
+                <artifactId>bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>    
+    <profiles>
+        <profile>
+            <id>unix</id>
+            <activation>
+                <os>
+                    <family>unix</family>
+                </os>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>validate</id>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <target xmlns:if="ant:if" xmlns:unless="ant:unless">
+                                        <echo>Executing UNIX profile</echo>
+                                        
+                                        <!-- Download, unzip and rename TCK -->
+                                        <get src="https://download.eclipse.org/jakartaee/restful-ws/3.1/jakarta-restful-ws-tck-3.1.5.zip"
+                                             dest="${project.build.directory}/tck.zip"
+                                             skipexisting="true"/>
+                                        <unzip src="${project.build.directory}/tck.zip"
+                                               dest="${project.build.directory}/tck"/>
+                                        
+                                        <!-- Install the TCK artifact into local repository -->
+                                        <exec dir="${project.build.directory}/tck"
+                                              executable="mvn">
+                                            <arg line="install:install-file -Dfile=jakarta-restful-ws-tck-3.1.5.jar -DgroupId=jakarta.ws.rs -DartifactId=jakarta-restful-ws-tck -Dversion=3.1.5 -Dpackaging=jar"/>
+                                        </exec>
+                                    </target>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>integration-test</id>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <target>
+                                        <!-- Run the tests -->
+                                    </target>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/external/tck/coreprofile/rest/rest-tck/pom.xml b/external/tck/coreprofile/rest/rest-tck/pom.xml
new file mode 100644
index 0000000000..528129140f
--- /dev/null
+++ b/external/tck/coreprofile/rest/rest-tck/pom.xml
@@ -0,0 +1,138 @@
+<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>tck</groupId>
+    <artifactId>rest-runner</artifactId>
+    <version>1-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>Piranha - External - TCK - CoreProfile - Jakarta REST TCK - Runner</name>
+    <properties>
+        <piranha.version>24.9.0-SNAPSHOT</piranha.version>
+    </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.jboss.arquillian</groupId>
+                <artifactId>arquillian-bom</artifactId>
+                <version>1.8.0.Final</version>
+                <scope>test</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <profiles>
+        <profile>
+            <id>unix</id>
+            <activation>
+                <os>
+                    <family>unix</family>
+                </os>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>cloud.piranha.arquillian</groupId>
+                    <artifactId>piranha-arquillian-jarcontainer</artifactId>
+                    <version>${piranha.version}</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>jakarta.ws.rs</groupId>
+                    <artifactId>jakarta-restful-ws-tck</artifactId>
+                    <version>3.1.5</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.jboss.arquillian.protocol</groupId>
+                    <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
+                    <version>1.8.0.Final</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.jboss.arquillian.junit5</groupId>
+                    <artifactId>arquillian-junit5-container</artifactId>
+                    <version>1.8.0.Final</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.junit.jupiter</groupId>
+                    <artifactId>junit-jupiter</artifactId>
+                    <version>5.11.0</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.junit.jupiter</groupId>
+                    <artifactId>junit-jupiter-api</artifactId>
+                    <version>5.11.0</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.junit.jupiter</groupId>
+                    <artifactId>junit-jupiter-engine</artifactId>
+                    <version>5.11.0</version>
+                    <scope>test</scope>
+                </dependency>
+                <!-- RESTEasy required dependencies -->
+                <dependency>
+                    <groupId>org.jboss.resteasy</groupId>
+                    <artifactId>resteasy-core</artifactId>
+                    <version>6.1.0.Beta2</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.jboss.resteasy</groupId>
+                    <artifactId>resteasy-client</artifactId>
+                    <version>6.1.0.Beta2</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.jboss.resteasy</groupId>
+                    <artifactId>resteasy-json-binding-provider</artifactId>
+                    <version>6.1.0.Beta2</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.jboss.resteasy</groupId>
+                    <artifactId>resteasy-jaxb-provider</artifactId>
+                    <version>6.1.0.Beta2</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <version>3.0.0</version>
+                        <executions>
+                            <execution>
+                                <id>verify</id>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>   
+                            <dependenciesToScan>
+                                <dependency>jakarta.ws.rs:jakarta-restful-ws-tck</dependency>
+                            </dependenciesToScan>
+                            <forkCount>1</forkCount>
+                            <reuseForks>false</reuseForks>
+                            <systemPropertyVariables>
+                                <arquillian.launch>piranha</arquillian.launch>
+                                <cts.harness.debug>true</cts.harness.debug>
+                                <optional.tech.packages.to.ignore>jakarta.xml.bind</optional.tech.packages.to.ignore>
+                                <porting.ts.url.class.1>ee.jakarta.tck.ws.rs.lib.implementation.sun.common.SunRIURL</porting.ts.url.class.1>
+                                <servlet_adaptor>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet_adaptor>
+                                <webServerHost>localhost</webServerHost>
+                                <webServerPort>8080</webServerPort>
+                            </systemPropertyVariables>
+                            <testFailureIgnore>true</testFailureIgnore>
+                        </configuration>
+                    </plugin>  
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/external/tck/coreprofile/rest/rest-tck/src/test/resources/arquillian.xml b/external/tck/coreprofile/rest/rest-tck/src/test/resources/arquillian.xml
new file mode 100644
index 0000000000..bf4a6f1bef
--- /dev/null
+++ b/external/tck/coreprofile/rest/rest-tck/src/test/resources/arquillian.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<arquillian 
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xmlns="http://jboss.org/schema/arquillian"
+    xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+    <defaultProtocol type="Servlet 5.0" />
+    <container qualifier="piranha" default="true"/>
+</arquillian>

From 38ff5ec5527b274051a6f08670ac2aad46329eba Mon Sep 17 00:00:00 2001
From: Manfred Riem <mriem@manorrock.com>
Date: Thu, 22 Aug 2024 19:57:56 -0500
Subject: [PATCH 2/2] Second pass for #3851

---
 arquillian/jarcontainer/pom.xml               |  6 ++++
 .../jarcontainer/PiranhaJarContainer.java     | 33 +++++++++++--------
 .../PiranhaJarContainerConfiguration.java     | 17 ++++++++++
 .../src/main/java/module-info.java            |  1 -
 .../src/test/resources/arquillian.xml         |  6 +++-
 5 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/arquillian/jarcontainer/pom.xml b/arquillian/jarcontainer/pom.xml
index 6ccee3d0c6..81dff8f077 100644
--- a/arquillian/jarcontainer/pom.xml
+++ b/arquillian/jarcontainer/pom.xml
@@ -19,6 +19,12 @@
             <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>
diff --git a/arquillian/jarcontainer/src/main/java/cloud/piranha/arquillian/jarcontainer/PiranhaJarContainer.java b/arquillian/jarcontainer/src/main/java/cloud/piranha/arquillian/jarcontainer/PiranhaJarContainer.java
index d2a167dc83..4a9fa1012c 100644
--- a/arquillian/jarcontainer/src/main/java/cloud/piranha/arquillian/jarcontainer/PiranhaJarContainer.java
+++ b/arquillian/jarcontainer/src/main/java/cloud/piranha/arquillian/jarcontainer/PiranhaJarContainer.java
@@ -47,7 +47,6 @@
 import org.jboss.arquillian.container.spi.client.protocol.metadata.Servlet;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.exporter.ZipExporter;
-import org.jboss.shrinkwrap.descriptor.api.Descriptor;
 
 /**
  * The Piranha JAR container.
@@ -86,6 +85,11 @@ public class PiranhaJarContainer implements DeployableContainer<PiranhaJarContai
      */
     private File localRepositoryDir = new File(System.getProperty("user.home"), ".m2/repository");
 
+    /**
+     * Stores the process.
+     */
+    private Process process;
+
     /**
      * Default constructor.
      */
@@ -168,11 +172,6 @@ public ProtocolMetaData deploy(Archive<?> archive) throws DeploymentException {
         return metadata;
     }
 
-    @Override
-    public void deploy(Descriptor descriptor) throws DeploymentException {
-        // not supporting deployment by descriptor.
-    }
-
     @Override
     public void undeploy(Archive<?> archive) throws DeploymentException {
         LOGGER.log(Level.INFO, "Undeploying - " + archive.getName());
@@ -198,6 +197,19 @@ public void undeploy(Archive<?> archive) throws DeploymentException {
         } catch (InterruptedException ie) {
         }
 
+        /*
+         * Destroy the process forcibly if it is still running.
+         */
+        try {
+            if (process.isAlive()) {
+                LOGGER.log(Level.WARNING, 
+                        "Process for {0} still alive, destroying forcibly", 
+                        archive.getName());
+                process.destroyForcibly().waitFor();
+            }
+        } catch (InterruptedException ie) {
+        }
+
         /*
          * Delete the WAR file.
          */
@@ -205,11 +217,6 @@ public void undeploy(Archive<?> archive) throws DeploymentException {
         warFile.delete();
     }
 
-    @Override
-    public void undeploy(Descriptor d) throws DeploymentException {
-        // not supporting undeployment by descriptor.
-    }
-
     /**
      * Creates a WAR filename for the archive.
      *
@@ -329,7 +336,7 @@ private void startPiranhaCoreProfile(
             File warFilename)
             throws IOException {
 
-        new ProcessBuilder()
+        process = new ProcessBuilder()
                 .directory(runtimeDirectory)
                 .command("java",
                         "-jar",
@@ -360,7 +367,7 @@ private void startPiranhaCoreProfile(
 
         LOGGER.log(Level.INFO, "Running application from directory: " + runtimeDirectory);
         LOGGER.log(Level.INFO, "Application is available at: http://localhost:"
-                + Integer.toString(configuration.getHttpPort()) 
+                + Integer.toString(configuration.getHttpPort())
                 + "/" + warFilename.getName().substring(0, warFilename.getName().lastIndexOf(".")));
     }
 
diff --git a/arquillian/jarcontainer/src/main/java/cloud/piranha/arquillian/jarcontainer/PiranhaJarContainerConfiguration.java b/arquillian/jarcontainer/src/main/java/cloud/piranha/arquillian/jarcontainer/PiranhaJarContainerConfiguration.java
index b581e98230..811e4a0b0d 100644
--- a/arquillian/jarcontainer/src/main/java/cloud/piranha/arquillian/jarcontainer/PiranhaJarContainerConfiguration.java
+++ b/arquillian/jarcontainer/src/main/java/cloud/piranha/arquillian/jarcontainer/PiranhaJarContainerConfiguration.java
@@ -27,6 +27,7 @@
  */
 package cloud.piranha.arquillian.jarcontainer;
 
+import static java.lang.System.Logger.Level.INFO;
 import me.alexpanov.net.FreePortFinder;
 import org.jboss.arquillian.container.spi.ConfigurationException;
 import org.jboss.arquillian.container.spi.client.container.ContainerConfiguration;
@@ -38,6 +39,11 @@
  */
 public class PiranhaJarContainerConfiguration implements ContainerConfiguration {
     
+    /**
+     * Stores the logger.
+     */
+    private static final System.Logger LOGGER = System.getLogger(PiranhaJarContainerConfiguration.class.getName());
+    
     /**
      * Stores the protocol.
      */
@@ -68,6 +74,15 @@ public int getHttpPort() {
     public String getProtocol() {
         return protocol;
     }
+    
+    /**
+     * Set the HTTP port.
+     * 
+     * @param httpPort the HTTP port.
+     */
+    public void setHttpPort(int httpPort) {
+        this.httpPort = httpPort;
+    }
 
     /**
      * Set the protocol.
@@ -80,5 +95,7 @@ public void setProtocol(String protocol) {
 
     @Override
     public void validate() throws ConfigurationException {
+        LOGGER.log(INFO, "Using protocol: {0}", getProtocol());
+        LOGGER.log(INFO, "Using port: {0}", getHttpPort());
     }
 }
diff --git a/arquillian/jarcontainer/src/main/java/module-info.java b/arquillian/jarcontainer/src/main/java/module-info.java
index 843e393f6b..1e84704806 100644
--- a/arquillian/jarcontainer/src/main/java/module-info.java
+++ b/arquillian/jarcontainer/src/main/java/module-info.java
@@ -42,6 +42,5 @@
     requires arquillian.container.spi;
     requires arquillian.core.spi;
     requires shrinkwrap.api;
-    requires shrinkwrap.descriptors.api.base;
     requires free.port.finder;
 }
diff --git a/external/tck/coreprofile/rest/rest-tck/src/test/resources/arquillian.xml b/external/tck/coreprofile/rest/rest-tck/src/test/resources/arquillian.xml
index bf4a6f1bef..f197532934 100644
--- a/external/tck/coreprofile/rest/rest-tck/src/test/resources/arquillian.xml
+++ b/external/tck/coreprofile/rest/rest-tck/src/test/resources/arquillian.xml
@@ -5,5 +5,9 @@
     xmlns="http://jboss.org/schema/arquillian"
     xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
     <defaultProtocol type="Servlet 5.0" />
-    <container qualifier="piranha" default="true"/>
+    <container qualifier="piranha" default="true">
+        <configuration>
+            <property name="httpPort">8080</property>
+        </configuration>
+    </container>
 </arquillian>