From cad5697eacba36a6a7edc8851c3be52f3bcc2a00 Mon Sep 17 00:00:00 2001
From: Arjan Tijms <arjan.tijms@gmail.com>
Date: Wed, 25 Dec 2024 13:18:10 +0100
Subject: [PATCH] Add installer for Tags GF Runner

---
 glassfish-runner/tags-tck/pom.xml             | 175 ++---------------
 .../tags-tck/tags-tck-install/pom.xml         |  87 +++++++++
 .../tags-tck/{ => tags-tck-run}/j2ee.pass     |   0
 .../tags-tck/{ => tags-tck-run}/javajoe.pass  |   0
 .../tags-tck/{ => tags-tck-run}/password.txt  |   0
 .../tags-tck/tags-tck-run/pom.xml             | 183 ++++++++++++++++++
 .../sql/derby/derby.ddl.jstl.sql              |   0
 .../sql/derby/derby.dml.jstl.sql              |   0
 .../src/test/resources/arquillian.xml         |   0
 9 files changed, 284 insertions(+), 161 deletions(-)
 create mode 100644 glassfish-runner/tags-tck/tags-tck-install/pom.xml
 rename glassfish-runner/tags-tck/{ => tags-tck-run}/j2ee.pass (100%)
 rename glassfish-runner/tags-tck/{ => tags-tck-run}/javajoe.pass (100%)
 rename glassfish-runner/tags-tck/{ => tags-tck-run}/password.txt (100%)
 create mode 100644 glassfish-runner/tags-tck/tags-tck-run/pom.xml
 rename glassfish-runner/tags-tck/{ => tags-tck-run}/sql/derby/derby.ddl.jstl.sql (100%)
 rename glassfish-runner/tags-tck/{ => tags-tck-run}/sql/derby/derby.dml.jstl.sql (100%)
 rename glassfish-runner/tags-tck/{ => tags-tck-run}/src/test/resources/arquillian.xml (100%)

diff --git a/glassfish-runner/tags-tck/pom.xml b/glassfish-runner/tags-tck/pom.xml
index b6e330251f..9c525594af 100644
--- a/glassfish-runner/tags-tck/pom.xml
+++ b/glassfish-runner/tags-tck/pom.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2024 Contributors to the Eclipse Foundation.
-    Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2024  Contributors to the Eclipse Foundation.
+    Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
     http://www.eclipse.org/legal/epl-2.0.
-    
+
     This Source Code may also be made available under the following Secondary
     Licenses when the conditions for such availability set forth in the
     Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
     version 2 with the GNU Classpath Exception, which is available at
     https://www.gnu.org/software/classpath/license.html.
-    
+
     SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 -->
-<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/maven-v4_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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -22,162 +24,13 @@
         <artifactId>standalone-tck</artifactId>
         <version>11.0.0-SNAPSHOT</version>
     </parent>
-    <groupId>jakarta</groupId>
-    <artifactId>glassfish.jstl-tck</artifactId>
-    <version>11.0.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <properties>
-        <glassfish.home>${glassfish.root}/glassfish${glassfish.version.main}</glassfish.home>
-        <glassfish.root>${project.build.directory}</glassfish.root>
-        <glassfish.version>8.0.0-JDK17-M9</glassfish.version>
-        <glassfish.version.main>8</glassfish.version.main>
-        <jakarta.platform.version>11.0.0-M4</jakarta.platform.version>
-        <tck.version>4.0.0</tck.version>
-    </properties>
-
-    <dependencies>
-        <!-- Jakarta EE APIs -->
-        <dependency>
-            <groupId>jakarta.platform</groupId>
-            <artifactId>jakarta.jakartaee-api</artifactId>
-            <version>${jakarta.platform.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- The actual TCK containing the tests -->
-        <dependency>
-            <groupId>jakarta.tck</groupId>
-            <artifactId>jakarta-tags-tck</artifactId>
-            <version>${tck.version}</version>
-        </dependency>
-
-        <!-- Junit -->
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jboss.arquillian.junit5</groupId>
-            <artifactId>arquillian-junit5-container</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jboss.arquillian.container</groupId>
-            <artifactId>arquillian-container-test-spi</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>3.1</version>
-        </dependency>
-
-        <!--
-            The Arquillian connector that starts GlassFish and deploys archives to it.
-        -->
-        <dependency>
-            <groupId>org.omnifaces.arquillian</groupId>
-            <artifactId>arquillian-glassfish-server-managed</artifactId>
-            <version>1.7</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>1-download-gf</id>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.glassfish.main.distributions</groupId>
-                                    <artifactId>${glassfish-artifact-id}</artifactId>
-                                    <version>${glassfish.version}</version>
-                                    <type>zip</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>gf-tests</id>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                        <configuration>
-                            <groups>${testGroups}</groups>
-                            <dependenciesToScan>jakarta.tck:jakarta-tags-tck</dependenciesToScan>
-                            <systemPropertyVariables>
-                                <glassfish.home>${project.build.directory}/${glassfish.toplevel.dir}</glassfish.home>
-
-                                <glassfish.enableDerby>true</glassfish.enableDerby>
-                                <glassfish.derbyDatabaseName>${glassfish.home}/glassfish/domains/domain1/config/derbyDB;create=true</glassfish.derbyDatabaseName>
-                                <glassfish.derbySQLFile>${project.basedir}/sql/derby/derby.ddl.jstl.sql</glassfish.derbySQLFile>
-                                <glassfish.derbyUser>cts1</glassfish.derbyUser>
-                                <glassfish.derbyPasswordFile>${project.basedir}/password.txt</glassfish.derbyPasswordFile>
-
-                                <glassfish.postBootCommands>set server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=true
-                                    create-jvm-options -Djavax.xml.accessExternalStylesheet=all
-                                    create-jvm-options -Djavax.xml.accessExternalSchema=all
-                                    create-jvm-options -Djavax.xml.accessExternalDTD=file,http
-                                    restart-domain
-                                    create-file-user --groups staff:mgr --passwordfile ${project.basedir}/j2ee.pass j2ee
-                                    create-file-user --groups guest --passwordfile ${project.basedir}/javajoe.pass javajoe
-                                    list-file-users</glassfish.postBootCommands>
 
-                                <junit.log.traceflag>true</junit.log.traceflag>
-                                <jstl.db.name>${glassfish.home}/glassfish/domains/domain1/config/derbyDB</jstl.db.name>
-                                <jstl.db.server>localhost</jstl.db.server>
-                                <jstl.db.port>1527</jstl.db.port>
-                                <jstl.db.url>jdbc:derby://localhost:1527/${glassfish.home}/glassfish/domains/domain1/config/derbyDB</jstl.db.url>
-                                <jstl.db.driver>org.apache.derby.jdbc.ClientDriver</jstl.db.driver>
-                                <jstl.db.user>cts1</jstl.db.user>
-                                <jstl.db.password>cts1</jstl.db.password>
-                                <harness.log.traceflag>true</harness.log.traceflag>
-                                <cts.harness.debug>true</cts.harness.debug>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+    <artifactId>tags-tck</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-    <profiles>
-        <profile>
-            <id>full</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <glassfish-artifact-id>glassfish</glassfish-artifact-id>
-                <testGroups>platform</testGroups>
-            </properties>
-        </profile>
-        <profile>
-            <id>web</id>
-            <properties>
-                <glassfish-artifact-id>web</glassfish-artifact-id>
-                <testGroups>web</testGroups>
-            </properties>
-        </profile>
-    </profiles>
+    <modules>
+        <module>tags-tck-install</module>
+        <module>tags-tck-run</module>
+    </modules>
 </project>
diff --git a/glassfish-runner/tags-tck/tags-tck-install/pom.xml b/glassfish-runner/tags-tck/tags-tck-install/pom.xml
new file mode 100644
index 0000000000..43288dc92b
--- /dev/null
+++ b/glassfish-runner/tags-tck/tags-tck-install/pom.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<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>org.glassfish</groupId>
+        <artifactId>enterprise-beans-tck</artifactId>
+        <version>4.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>enterprise-beans-tck-install</artifactId>
+    <packaging>pom</packaging>
+    <name>TCK: Install Jakarta Enterprise-beans TCK</name>
+
+    <properties>
+        <tck.test.ejb.version>6.1.0</tck.test.ejb.version>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.googlecode.maven-download-plugin</groupId>
+                <artifactId>download-maven-plugin</artifactId>
+                <version>1.11.0</version>
+                <configuration>
+                    <unpack>true</unpack>
+                    <outputDirectory>${project.build.directory}</outputDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>download-ejb-tck</id>
+                        <goals>
+                            <goal>wget</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <excludes>**/extensions.xml</excludes>
+                            <url>https://github.com/jakartaee/platform-tck/archive/refs/heads/main.zip</url>
+                            <skipCache>true</skipCache>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-invoker-plugin</artifactId>
+                <version>3.8.0</version>
+                <executions>
+                    <execution>
+                        <id>ejb_source</id>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <phase>process-resources</phase>
+                        <configuration>
+                            <streamLogs>true</streamLogs>
+                            <projectsDirectory>${project.build.directory}/platform-tck-main</projectsDirectory>
+                            <pomIncludes>
+                                <pomInclude>pom.xml</pomInclude>
+                            </pomIncludes>
+                            <goals>clean install -pl ":jakarta-tags-tck" -am</goals>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/glassfish-runner/tags-tck/j2ee.pass b/glassfish-runner/tags-tck/tags-tck-run/j2ee.pass
similarity index 100%
rename from glassfish-runner/tags-tck/j2ee.pass
rename to glassfish-runner/tags-tck/tags-tck-run/j2ee.pass
diff --git a/glassfish-runner/tags-tck/javajoe.pass b/glassfish-runner/tags-tck/tags-tck-run/javajoe.pass
similarity index 100%
rename from glassfish-runner/tags-tck/javajoe.pass
rename to glassfish-runner/tags-tck/tags-tck-run/javajoe.pass
diff --git a/glassfish-runner/tags-tck/password.txt b/glassfish-runner/tags-tck/tags-tck-run/password.txt
similarity index 100%
rename from glassfish-runner/tags-tck/password.txt
rename to glassfish-runner/tags-tck/tags-tck-run/password.txt
diff --git a/glassfish-runner/tags-tck/tags-tck-run/pom.xml b/glassfish-runner/tags-tck/tags-tck-run/pom.xml
new file mode 100644
index 0000000000..b6e330251f
--- /dev/null
+++ b/glassfish-runner/tags-tck/tags-tck-run/pom.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2024 Contributors to the Eclipse Foundation.
+    Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved.
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+    
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+    
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+-->
+<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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.glassfish</groupId>
+        <artifactId>standalone-tck</artifactId>
+        <version>11.0.0-SNAPSHOT</version>
+    </parent>
+    <groupId>jakarta</groupId>
+    <artifactId>glassfish.jstl-tck</artifactId>
+    <version>11.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <properties>
+        <glassfish.home>${glassfish.root}/glassfish${glassfish.version.main}</glassfish.home>
+        <glassfish.root>${project.build.directory}</glassfish.root>
+        <glassfish.version>8.0.0-JDK17-M9</glassfish.version>
+        <glassfish.version.main>8</glassfish.version.main>
+        <jakarta.platform.version>11.0.0-M4</jakarta.platform.version>
+        <tck.version>4.0.0</tck.version>
+    </properties>
+
+    <dependencies>
+        <!-- Jakarta EE APIs -->
+        <dependency>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-api</artifactId>
+            <version>${jakarta.platform.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- The actual TCK containing the tests -->
+        <dependency>
+            <groupId>jakarta.tck</groupId>
+            <artifactId>jakarta-tags-tck</artifactId>
+            <version>${tck.version}</version>
+        </dependency>
+
+        <!-- Junit -->
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.arquillian.junit5</groupId>
+            <artifactId>arquillian-junit5-container</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.arquillian.container</groupId>
+            <artifactId>arquillian-container-test-spi</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
+        </dependency>
+
+        <!--
+            The Arquillian connector that starts GlassFish and deploys archives to it.
+        -->
+        <dependency>
+            <groupId>org.omnifaces.arquillian</groupId>
+            <artifactId>arquillian-glassfish-server-managed</artifactId>
+            <version>1.7</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>1-download-gf</id>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.glassfish.main.distributions</groupId>
+                                    <artifactId>${glassfish-artifact-id}</artifactId>
+                                    <version>${glassfish.version}</version>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>gf-tests</id>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                        <configuration>
+                            <groups>${testGroups}</groups>
+                            <dependenciesToScan>jakarta.tck:jakarta-tags-tck</dependenciesToScan>
+                            <systemPropertyVariables>
+                                <glassfish.home>${project.build.directory}/${glassfish.toplevel.dir}</glassfish.home>
+
+                                <glassfish.enableDerby>true</glassfish.enableDerby>
+                                <glassfish.derbyDatabaseName>${glassfish.home}/glassfish/domains/domain1/config/derbyDB;create=true</glassfish.derbyDatabaseName>
+                                <glassfish.derbySQLFile>${project.basedir}/sql/derby/derby.ddl.jstl.sql</glassfish.derbySQLFile>
+                                <glassfish.derbyUser>cts1</glassfish.derbyUser>
+                                <glassfish.derbyPasswordFile>${project.basedir}/password.txt</glassfish.derbyPasswordFile>
+
+                                <glassfish.postBootCommands>set server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=true
+                                    create-jvm-options -Djavax.xml.accessExternalStylesheet=all
+                                    create-jvm-options -Djavax.xml.accessExternalSchema=all
+                                    create-jvm-options -Djavax.xml.accessExternalDTD=file,http
+                                    restart-domain
+                                    create-file-user --groups staff:mgr --passwordfile ${project.basedir}/j2ee.pass j2ee
+                                    create-file-user --groups guest --passwordfile ${project.basedir}/javajoe.pass javajoe
+                                    list-file-users</glassfish.postBootCommands>
+
+                                <junit.log.traceflag>true</junit.log.traceflag>
+                                <jstl.db.name>${glassfish.home}/glassfish/domains/domain1/config/derbyDB</jstl.db.name>
+                                <jstl.db.server>localhost</jstl.db.server>
+                                <jstl.db.port>1527</jstl.db.port>
+                                <jstl.db.url>jdbc:derby://localhost:1527/${glassfish.home}/glassfish/domains/domain1/config/derbyDB</jstl.db.url>
+                                <jstl.db.driver>org.apache.derby.jdbc.ClientDriver</jstl.db.driver>
+                                <jstl.db.user>cts1</jstl.db.user>
+                                <jstl.db.password>cts1</jstl.db.password>
+                                <harness.log.traceflag>true</harness.log.traceflag>
+                                <cts.harness.debug>true</cts.harness.debug>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>full</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <glassfish-artifact-id>glassfish</glassfish-artifact-id>
+                <testGroups>platform</testGroups>
+            </properties>
+        </profile>
+        <profile>
+            <id>web</id>
+            <properties>
+                <glassfish-artifact-id>web</glassfish-artifact-id>
+                <testGroups>web</testGroups>
+            </properties>
+        </profile>
+    </profiles>
+</project>
diff --git a/glassfish-runner/tags-tck/sql/derby/derby.ddl.jstl.sql b/glassfish-runner/tags-tck/tags-tck-run/sql/derby/derby.ddl.jstl.sql
similarity index 100%
rename from glassfish-runner/tags-tck/sql/derby/derby.ddl.jstl.sql
rename to glassfish-runner/tags-tck/tags-tck-run/sql/derby/derby.ddl.jstl.sql
diff --git a/glassfish-runner/tags-tck/sql/derby/derby.dml.jstl.sql b/glassfish-runner/tags-tck/tags-tck-run/sql/derby/derby.dml.jstl.sql
similarity index 100%
rename from glassfish-runner/tags-tck/sql/derby/derby.dml.jstl.sql
rename to glassfish-runner/tags-tck/tags-tck-run/sql/derby/derby.dml.jstl.sql
diff --git a/glassfish-runner/tags-tck/src/test/resources/arquillian.xml b/glassfish-runner/tags-tck/tags-tck-run/src/test/resources/arquillian.xml
similarity index 100%
rename from glassfish-runner/tags-tck/src/test/resources/arquillian.xml
rename to glassfish-runner/tags-tck/tags-tck-run/src/test/resources/arquillian.xml