From b055366f87fc3fc7a8b134124a8e0df9364a5f4f Mon Sep 17 00:00:00 2001
From: Arjan Tijms <arjan.tijms@gmail.com>
Date: Fri, 17 Jan 2025 12:19:08 +0100
Subject: [PATCH] Use term "extra" for Pages and add installer for prebuild TCK
 jar

---
 .../pages-platform-extra-tck-install/pom.xml  | 87 +++++++++++++++++++
 .../pages-platform-extra-tck-run}/j2ee.pass   |  0
 .../javajoe.pass                              |  0
 .../pages-platform-extra-tck-run}/pom.xml     |  2 +-
 .../GlassfishApplicationArchiveProcessor.java |  0
 .../core/tck/GlassfishLoadableExtension.java  |  0
 ...boss.arquillian.core.spi.LoadableExtension |  0
 .../jsp_sec_secbasic_web.war.sun-web.xml      |  0
 .../jsp_sec_secform_web.war.sun-web.xml       |  0
 ..._resource_httplistener_web.war.sun-web.xml |  0
 ...gext_resource_listener_web.war.sun-web.xml |  0
 ...xt_resource_taghandler_web.war.sun-web.xml |  0
 .../src/test/resources/arquillian.xml         |  0
 .../pages-platform-extra-tck/pom.xml          | 37 ++++++++
 14 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-install/pom.xml
 rename glassfish-runner/{pages-platform-tck => pages-platform-extra-tck/pages-platform-extra-tck-run}/j2ee.pass (100%)
 rename glassfish-runner/{pages-platform-tck => pages-platform-extra-tck/pages-platform-extra-tck-run}/javajoe.pass (100%)
 rename glassfish-runner/{pages-platform-tck => pages-platform-extra-tck/pages-platform-extra-tck-run}/pom.xml (99%)
 rename glassfish-runner/{pages-platform-tck => pages-platform-extra-tck/pages-platform-extra-tck-run}/src/main/java/org/glassfish/pages/core/tck/GlassfishApplicationArchiveProcessor.java (100%)
 rename glassfish-runner/{pages-platform-tck => pages-platform-extra-tck/pages-platform-extra-tck-run}/src/main/java/org/glassfish/pages/core/tck/GlassfishLoadableExtension.java (100%)
 rename glassfish-runner/{pages-platform-tck => pages-platform-extra-tck/pages-platform-extra-tck-run}/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension (100%)
 rename glassfish-runner/{pages-platform-tck => pages-platform-extra-tck/pages-platform-extra-tck-run}/src/main/resources/jsp_sec_secbasic_web.war.sun-web.xml (100%)
 rename glassfish-runner/{pages-platform-tck => pages-platform-extra-tck/pages-platform-extra-tck-run}/src/main/resources/jsp_sec_secform_web.war.sun-web.xml (100%)
 rename glassfish-runner/{pages-platform-tck => pages-platform-extra-tck/pages-platform-extra-tck-run}/src/main/resources/jsp_tagext_resource_httplistener_web.war.sun-web.xml (100%)
 rename glassfish-runner/{pages-platform-tck => pages-platform-extra-tck/pages-platform-extra-tck-run}/src/main/resources/jsp_tagext_resource_listener_web.war.sun-web.xml (100%)
 rename glassfish-runner/{pages-platform-tck => pages-platform-extra-tck/pages-platform-extra-tck-run}/src/main/resources/jsp_tagext_resource_taghandler_web.war.sun-web.xml (100%)
 rename glassfish-runner/{pages-platform-tck => pages-platform-extra-tck/pages-platform-extra-tck-run}/src/test/resources/arquillian.xml (100%)
 create mode 100644 glassfish-runner/pages-platform-extra-tck/pom.xml

diff --git a/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-install/pom.xml b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-install/pom.xml
new file mode 100644
index 0000000000..4fb0e4c66f
--- /dev/null
+++ b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-install/pom.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2021, 2025 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.eclipse.ee4j</groupId>
+        <artifactId>project</artifactId>
+        <version>1.0.9</version>
+        <relativePath />
+    </parent>
+
+    <artifactId>pages-extra-tck-install</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>TCK: Install Jakarta Pages Platform Extra TCK</name>
+
+    <properties>
+        <tck.test.pages-extra.file>jakarta-pages-extra-tck-${tck.test.pages-extra.version}.zip</tck.test.pages-extra.file>
+        <tck.test.pages-extra.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee11/staged/eftl/${tck.test.pages-extra.file}</tck.test.pages-extra.url>
+        <tck.test.pages-extra.version>4.0.0-M1</tck.test.pages-extra.version>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.googlecode.maven-download-plugin</groupId>
+                <artifactId>download-maven-plugin</artifactId>
+                <version>1.13.0</version>
+                <configuration>
+                    <url>${tck.test.pages-extra.url}</url>
+                    <unpack>true</unpack>
+                    <outputDirectory>${project.build.directory}</outputDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>download-pages-extra-tck</id>
+                        <goals>
+                            <goal>wget</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>3.1.3</version>
+                <executions>
+                    <execution>
+                        <id>install-pages-extra-tck-pom</id>
+                        <goals>
+                            <goal>install-file</goal>
+                        </goals>
+                        <phase>process-resources</phase>
+                        <configuration>
+                            <file>${project.build.directory}/jakarta-pages-extra-tck-${tck.test.pages-extra.version}.jar</file>
+                            <sources>${project.build.directory}/jakarta-pages-extra-tck-${tck.test.pages-extra.version}-sources.jar</sources>
+                            <groupId>jakarta.tck</groupId>
+                            <artifactId>pages-platform-tck</artifactId>
+                            <version>${tck.test.pages-extra.version}</version>
+                            <packaging>jar</packaging>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+
+</project>
diff --git a/glassfish-runner/pages-platform-tck/j2ee.pass b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/j2ee.pass
similarity index 100%
rename from glassfish-runner/pages-platform-tck/j2ee.pass
rename to glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/j2ee.pass
diff --git a/glassfish-runner/pages-platform-tck/javajoe.pass b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/javajoe.pass
similarity index 100%
rename from glassfish-runner/pages-platform-tck/javajoe.pass
rename to glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/javajoe.pass
diff --git a/glassfish-runner/pages-platform-tck/pom.xml b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/pom.xml
similarity index 99%
rename from glassfish-runner/pages-platform-tck/pom.xml
rename to glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/pom.xml
index ccfdd8a1a7..98cb18a278 100644
--- a/glassfish-runner/pages-platform-tck/pom.xml
+++ b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/pom.xml
@@ -34,7 +34,7 @@
         <jakarta.platform.version>11.0.0-M4</jakarta.platform.version>
         <junit.jupiter.version>5.9.1</junit.jupiter.version>
         <tck.artifactId>pages-platform-tck</tck.artifactId>
-        <tck.version>11.0.0-SNAPSHOT</tck.version>
+        <tck.version>4.0.0-M1</tck.version>
     </properties>
 
     <!-- The Junit5 test frameworks -->
diff --git a/glassfish-runner/pages-platform-tck/src/main/java/org/glassfish/pages/core/tck/GlassfishApplicationArchiveProcessor.java b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/java/org/glassfish/pages/core/tck/GlassfishApplicationArchiveProcessor.java
similarity index 100%
rename from glassfish-runner/pages-platform-tck/src/main/java/org/glassfish/pages/core/tck/GlassfishApplicationArchiveProcessor.java
rename to glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/java/org/glassfish/pages/core/tck/GlassfishApplicationArchiveProcessor.java
diff --git a/glassfish-runner/pages-platform-tck/src/main/java/org/glassfish/pages/core/tck/GlassfishLoadableExtension.java b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/java/org/glassfish/pages/core/tck/GlassfishLoadableExtension.java
similarity index 100%
rename from glassfish-runner/pages-platform-tck/src/main/java/org/glassfish/pages/core/tck/GlassfishLoadableExtension.java
rename to glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/java/org/glassfish/pages/core/tck/GlassfishLoadableExtension.java
diff --git a/glassfish-runner/pages-platform-tck/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
similarity index 100%
rename from glassfish-runner/pages-platform-tck/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
rename to glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
diff --git a/glassfish-runner/pages-platform-tck/src/main/resources/jsp_sec_secbasic_web.war.sun-web.xml b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/resources/jsp_sec_secbasic_web.war.sun-web.xml
similarity index 100%
rename from glassfish-runner/pages-platform-tck/src/main/resources/jsp_sec_secbasic_web.war.sun-web.xml
rename to glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/resources/jsp_sec_secbasic_web.war.sun-web.xml
diff --git a/glassfish-runner/pages-platform-tck/src/main/resources/jsp_sec_secform_web.war.sun-web.xml b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/resources/jsp_sec_secform_web.war.sun-web.xml
similarity index 100%
rename from glassfish-runner/pages-platform-tck/src/main/resources/jsp_sec_secform_web.war.sun-web.xml
rename to glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/resources/jsp_sec_secform_web.war.sun-web.xml
diff --git a/glassfish-runner/pages-platform-tck/src/main/resources/jsp_tagext_resource_httplistener_web.war.sun-web.xml b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/resources/jsp_tagext_resource_httplistener_web.war.sun-web.xml
similarity index 100%
rename from glassfish-runner/pages-platform-tck/src/main/resources/jsp_tagext_resource_httplistener_web.war.sun-web.xml
rename to glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/resources/jsp_tagext_resource_httplistener_web.war.sun-web.xml
diff --git a/glassfish-runner/pages-platform-tck/src/main/resources/jsp_tagext_resource_listener_web.war.sun-web.xml b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/resources/jsp_tagext_resource_listener_web.war.sun-web.xml
similarity index 100%
rename from glassfish-runner/pages-platform-tck/src/main/resources/jsp_tagext_resource_listener_web.war.sun-web.xml
rename to glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/resources/jsp_tagext_resource_listener_web.war.sun-web.xml
diff --git a/glassfish-runner/pages-platform-tck/src/main/resources/jsp_tagext_resource_taghandler_web.war.sun-web.xml b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/resources/jsp_tagext_resource_taghandler_web.war.sun-web.xml
similarity index 100%
rename from glassfish-runner/pages-platform-tck/src/main/resources/jsp_tagext_resource_taghandler_web.war.sun-web.xml
rename to glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/main/resources/jsp_tagext_resource_taghandler_web.war.sun-web.xml
diff --git a/glassfish-runner/pages-platform-tck/src/test/resources/arquillian.xml b/glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/test/resources/arquillian.xml
similarity index 100%
rename from glassfish-runner/pages-platform-tck/src/test/resources/arquillian.xml
rename to glassfish-runner/pages-platform-extra-tck/pages-platform-extra-tck-run/src/test/resources/arquillian.xml
diff --git a/glassfish-runner/pages-platform-extra-tck/pom.xml b/glassfish-runner/pages-platform-extra-tck/pom.xml
new file mode 100644
index 0000000000..55b897f9df
--- /dev/null
+++ b/glassfish-runner/pages-platform-extra-tck/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2024, 2025 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/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.eclipse.ee4j</groupId>
+        <artifactId>project</artifactId>
+        <version>1.0.9</version>
+        <relativePath />
+    </parent>
+
+    <artifactId>pages-platform-extra-tck</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>pages-platform-extra-tck-install</module>
+        <module>pages-platform-extra-tck-run</module>
+    </modules>
+</project>