From 4efb2b2099857e7d2fe5edfea35ae7e5efec4e2c Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Thu, 5 Feb 2026 11:37:14 +0000
Subject: [PATCH] FISH-10759: Replace glassfish-web.xml

---
 .../microprofile/jwtauth/tck/ArquillianArchiveProcessor.java | 2 +-
 .../src/main/resources/glassfish-web.xml                     | 5 -----
 .../src/main/resources/payara-web.xml                        | 5 +++++
 3 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 MicroProfile-JWT-Auth/tck-arquillian-extension/src/main/resources/glassfish-web.xml
 create mode 100644 MicroProfile-JWT-Auth/tck-arquillian-extension/src/main/resources/payara-web.xml

diff --git a/MicroProfile-JWT-Auth/tck-arquillian-extension/src/main/java/fish/payara/microprofile/jwtauth/tck/ArquillianArchiveProcessor.java b/MicroProfile-JWT-Auth/tck-arquillian-extension/src/main/java/fish/payara/microprofile/jwtauth/tck/ArquillianArchiveProcessor.java
index acf3613c..21849123 100644
--- a/MicroProfile-JWT-Auth/tck-arquillian-extension/src/main/java/fish/payara/microprofile/jwtauth/tck/ArquillianArchiveProcessor.java
+++ b/MicroProfile-JWT-Auth/tck-arquillian-extension/src/main/java/fish/payara/microprofile/jwtauth/tck/ArquillianArchiveProcessor.java
@@ -80,7 +80,7 @@ public void process(Archive<?> archive, TestClass testClass) {
             webArchive.addAsResource("payara-mp-jwt.properties");
         }
         webArchive.addAsWebInfResource("web.xml")
-                .addAsWebInfResource("glassfish-web.xml");
+                .addAsWebInfResource("payara-web.xml");
 
         LOGGER.log(INFO, "Augmenting virtual web archive: {0}", archive);
         LOGGER.log(INFO, "Virtually augmented web archive: \n{0}", webArchive.toString(true));
diff --git a/MicroProfile-JWT-Auth/tck-arquillian-extension/src/main/resources/glassfish-web.xml b/MicroProfile-JWT-Auth/tck-arquillian-extension/src/main/resources/glassfish-web.xml
deleted file mode 100644
index db59875a..00000000
--- a/MicroProfile-JWT-Auth/tck-arquillian-extension/src/main/resources/glassfish-web.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
-<glassfish-web-app error-url="">
-  <context-root>/</context-root>
-</glassfish-web-app>
diff --git a/MicroProfile-JWT-Auth/tck-arquillian-extension/src/main/resources/payara-web.xml b/MicroProfile-JWT-Auth/tck-arquillian-extension/src/main/resources/payara-web.xml
new file mode 100644
index 00000000..62e4fe6a
--- /dev/null
+++ b/MicroProfile-JWT-Auth/tck-arquillian-extension/src/main/resources/payara-web.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE payara-web-app PUBLIC "-//Payara.fish//DTD Payara Server 4 Servlet 3.0//EN" "https://docs.payara.fish/schemas/payara-web-app_4.dtd">
+<payara-web-app error-url="">
+  <context-root>/</context-root>
+</payara-web-app>