From 1610a17381d6ad965befd852ee6d9e207325ad57 Mon Sep 17 00:00:00 2001 From: Rhys Williams <170514543+Viii3@users.noreply.github.com> Date: Thu, 5 Feb 2026 10:38:56 +0000 Subject: [PATCH 1/2] FISH-10759: Replace glassfish-web.xml with payara-web.xml --- .../WEB-INF/{glassfish-web.xml => payara-web.xml} | 6 +++--- .../WEB-INF/{glassfish-web.xml => payara-web.xml} | 6 +++--- .../WEB-INF/{glassfish-web.xml => payara-web.xml} | 6 +++--- .../WEB-INF/{glassfish-web.xml => payara-web.xml} | 6 +++--- .../src/main/webapp/WEB-INF/glassfish-web.xml | 12 ------------ .../src/main/webapp/WEB-INF/payara-web.xml | 12 ++++++++++++ .../src/main/webapp/WEB-INF/glassfish-web.xml | 12 ------------ .../src/main/webapp/WEB-INF/payara-web.xml | 12 ++++++++++++ .../src/main/webapp/WEB-INF/glassfish-web.xml | 12 ------------ .../src/main/webapp/WEB-INF/payara-web.xml | 12 ++++++++++++ .../src/main/webapp/WEB-INF/glassfish-web.xml | 12 ------------ .../src/main/webapp/WEB-INF/payara-web.xml | 12 ++++++++++++ .../src/main/webapp/WEB-INF/glassfish-web.xml | 12 ------------ .../src/main/webapp/WEB-INF/payara-web.xml | 12 ++++++++++++ .../src/main/webapp/WEB-INF/glassfish-web.xml | 12 ------------ .../src/main/webapp/WEB-INF/payara-web.xml | 12 ++++++++++++ .../src/main/webapp/WEB-INF/glassfish-web.xml | 12 ------------ .../lifecycle/src/main/webapp/WEB-INF/payara-web.xml | 12 ++++++++++++ .../src/main/webapp/WEB-INF/glassfish-web.xml | 12 ------------ .../src/main/webapp/WEB-INF/payara-web.xml | 12 ++++++++++++ .../src/main/webapp/WEB-INF/glassfish-web.xml | 12 ------------ .../src/main/webapp/WEB-INF/payara-web.xml | 12 ++++++++++++ .../src/main/webapp/WEB-INF/glassfish-web.xml | 12 ------------ .../src/main/webapp/WEB-INF/payara-web.xml | 12 ++++++++++++ .../src/main/webapp/WEB-INF/glassfish-web.xml | 12 ------------ .../wrapping/src/main/webapp/WEB-INF/payara-web.xml | 12 ++++++++++++ .../WEB-INF/{glassfish-web.xml => payara-web.xml} | 6 +++--- .../WEB-INF/{glassfish-web.xml => payara-web.xml} | 6 +++--- .../WEB-INF/{glassfish-web.xml => payara-web.xml} | 6 +++--- .../WEB-INF/{glassfish-web.xml => payara-web.xml} | 6 +++--- .../WEB-INF/{glassfish-web.xml => payara-web.xml} | 6 +++--- .../WEB-INF/{glassfish-web.xml => payara-web.xml} | 6 +++--- .../src/main/webapp/WEB-INF/glassfish-web.xml | 8 -------- .../src/main/webapp/WEB-INF/payara-web.xml | 8 ++++++++ .../WEB-INF/{glassfish-web.xml => payara-web.xml} | 6 +++--- .../WEB-INF/{glassfish-web.xml => payara-web.xml} | 6 +++--- .../src/main/webapp/WEB-INF/glassfish-web.xml | 9 --------- .../src/main/webapp/WEB-INF/payara-web.xml | 9 +++++++++ 38 files changed, 185 insertions(+), 185 deletions(-) rename jacc/contexts/src/main/webapp/WEB-INF/{glassfish-web.xml => payara-web.xml} (53%) rename jaspic/async-authentication/src/main/webapp/WEB-INF/{glassfish-web.xml => payara-web.xml} (53%) rename jaspic/basic-authentication/src/main/webapp/WEB-INF/{glassfish-web.xml => payara-web.xml} (53%) rename jaspic/custom-principal/src/main/webapp/WEB-INF/{glassfish-web.xml => payara-web.xml} (53%) delete mode 100644 jaspic/dispatching-jsf-cdi/src/main/webapp/WEB-INF/glassfish-web.xml create mode 100644 jaspic/dispatching-jsf-cdi/src/main/webapp/WEB-INF/payara-web.xml delete mode 100644 jaspic/dispatching/src/main/webapp/WEB-INF/glassfish-web.xml create mode 100644 jaspic/dispatching/src/main/webapp/WEB-INF/payara-web.xml delete mode 100644 jaspic/ejb-propagation/src/main/webapp/WEB-INF/glassfish-web.xml create mode 100644 jaspic/ejb-propagation/src/main/webapp/WEB-INF/payara-web.xml delete mode 100644 jaspic/ejb-register-session/src/main/webapp/WEB-INF/glassfish-web.xml create mode 100644 jaspic/ejb-register-session/src/main/webapp/WEB-INF/payara-web.xml delete mode 100644 jaspic/invoke-ejb-cdi/src/main/webapp/WEB-INF/glassfish-web.xml create mode 100644 jaspic/invoke-ejb-cdi/src/main/webapp/WEB-INF/payara-web.xml delete mode 100644 jaspic/jacc-propagation/src/main/webapp/WEB-INF/glassfish-web.xml create mode 100644 jaspic/jacc-propagation/src/main/webapp/WEB-INF/payara-web.xml delete mode 100644 jaspic/lifecycle/src/main/webapp/WEB-INF/glassfish-web.xml create mode 100644 jaspic/lifecycle/src/main/webapp/WEB-INF/payara-web.xml delete mode 100644 jaspic/programmatic-authentication/src/main/webapp/WEB-INF/glassfish-web.xml create mode 100644 jaspic/programmatic-authentication/src/main/webapp/WEB-INF/payara-web.xml delete mode 100644 jaspic/register-session/src/main/webapp/WEB-INF/glassfish-web.xml create mode 100644 jaspic/register-session/src/main/webapp/WEB-INF/payara-web.xml delete mode 100644 jaspic/status-codes/src/main/webapp/WEB-INF/glassfish-web.xml create mode 100644 jaspic/status-codes/src/main/webapp/WEB-INF/payara-web.xml delete mode 100644 jaspic/wrapping/src/main/webapp/WEB-INF/glassfish-web.xml create mode 100644 jaspic/wrapping/src/main/webapp/WEB-INF/payara-web.xml rename servlet/security-annotated/src/main/webapp/WEB-INF/{glassfish-web.xml => payara-web.xml} (90%) rename servlet/security-basicauth-omission/src/main/webapp/WEB-INF/{glassfish-web.xml => payara-web.xml} (90%) rename servlet/security-basicauth/src/main/webapp/WEB-INF/{glassfish-web.xml => payara-web.xml} (90%) rename servlet/security-clientcert-parent/security-clientcert-common-name/src/main/webapp/WEB-INF/{glassfish-web.xml => payara-web.xml} (56%) rename servlet/security-clientcert-parent/security-clientcert-jce/src/main/webapp/WEB-INF/{glassfish-web.xml => payara-web.xml} (56%) rename servlet/security-clientcert-parent/security-clientcert/src/main/webapp/WEB-INF/{glassfish-web.xml => payara-web.xml} (70%) delete mode 100644 servlet/security-deny-uncovered/src/main/webapp/WEB-INF/glassfish-web.xml create mode 100644 servlet/security-deny-uncovered/src/main/webapp/WEB-INF/payara-web.xml rename servlet/security-digest/src/main/webapp/WEB-INF/{glassfish-web.xml => payara-web.xml} (91%) rename servlet/security-form-based/src/main/webapp/WEB-INF/{glassfish-web.xml => payara-web.xml} (90%) delete mode 100644 servlet/security-programmatic/src/main/webapp/WEB-INF/glassfish-web.xml create mode 100644 servlet/security-programmatic/src/main/webapp/WEB-INF/payara-web.xml diff --git a/jacc/contexts/src/main/webapp/WEB-INF/glassfish-web.xml b/jacc/contexts/src/main/webapp/WEB-INF/payara-web.xml similarity index 53% rename from jacc/contexts/src/main/webapp/WEB-INF/glassfish-web.xml rename to jacc/contexts/src/main/webapp/WEB-INF/payara-web.xml index 26559e3f6..360fdc460 100644 --- a/jacc/contexts/src/main/webapp/WEB-INF/glassfish-web.xml +++ b/jacc/contexts/src/main/webapp/WEB-INF/payara-web.xml @@ -1,6 +1,6 @@ - - + + architect @@ -9,4 +9,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/jaspic/async-authentication/src/main/webapp/WEB-INF/glassfish-web.xml b/jaspic/async-authentication/src/main/webapp/WEB-INF/payara-web.xml similarity index 53% rename from jaspic/async-authentication/src/main/webapp/WEB-INF/glassfish-web.xml rename to jaspic/async-authentication/src/main/webapp/WEB-INF/payara-web.xml index 26559e3f6..360fdc460 100644 --- a/jaspic/async-authentication/src/main/webapp/WEB-INF/glassfish-web.xml +++ b/jaspic/async-authentication/src/main/webapp/WEB-INF/payara-web.xml @@ -1,6 +1,6 @@ - - + + architect @@ -9,4 +9,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/jaspic/basic-authentication/src/main/webapp/WEB-INF/glassfish-web.xml b/jaspic/basic-authentication/src/main/webapp/WEB-INF/payara-web.xml similarity index 53% rename from jaspic/basic-authentication/src/main/webapp/WEB-INF/glassfish-web.xml rename to jaspic/basic-authentication/src/main/webapp/WEB-INF/payara-web.xml index 26559e3f6..360fdc460 100644 --- a/jaspic/basic-authentication/src/main/webapp/WEB-INF/glassfish-web.xml +++ b/jaspic/basic-authentication/src/main/webapp/WEB-INF/payara-web.xml @@ -1,6 +1,6 @@ - - + + architect @@ -9,4 +9,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/jaspic/custom-principal/src/main/webapp/WEB-INF/glassfish-web.xml b/jaspic/custom-principal/src/main/webapp/WEB-INF/payara-web.xml similarity index 53% rename from jaspic/custom-principal/src/main/webapp/WEB-INF/glassfish-web.xml rename to jaspic/custom-principal/src/main/webapp/WEB-INF/payara-web.xml index 26559e3f6..360fdc460 100644 --- a/jaspic/custom-principal/src/main/webapp/WEB-INF/glassfish-web.xml +++ b/jaspic/custom-principal/src/main/webapp/WEB-INF/payara-web.xml @@ -1,6 +1,6 @@ - - + + architect @@ -9,4 +9,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/jaspic/dispatching-jsf-cdi/src/main/webapp/WEB-INF/glassfish-web.xml b/jaspic/dispatching-jsf-cdi/src/main/webapp/WEB-INF/glassfish-web.xml deleted file mode 100644 index 26559e3f6..000000000 --- a/jaspic/dispatching-jsf-cdi/src/main/webapp/WEB-INF/glassfish-web.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - architect - architect - - - - - \ No newline at end of file diff --git a/jaspic/dispatching-jsf-cdi/src/main/webapp/WEB-INF/payara-web.xml b/jaspic/dispatching-jsf-cdi/src/main/webapp/WEB-INF/payara-web.xml new file mode 100644 index 000000000..360fdc460 --- /dev/null +++ b/jaspic/dispatching-jsf-cdi/src/main/webapp/WEB-INF/payara-web.xml @@ -0,0 +1,12 @@ + + + + + + architect + architect + + + + + \ No newline at end of file diff --git a/jaspic/dispatching/src/main/webapp/WEB-INF/glassfish-web.xml b/jaspic/dispatching/src/main/webapp/WEB-INF/glassfish-web.xml deleted file mode 100644 index 26559e3f6..000000000 --- a/jaspic/dispatching/src/main/webapp/WEB-INF/glassfish-web.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - architect - architect - - - - - \ No newline at end of file diff --git a/jaspic/dispatching/src/main/webapp/WEB-INF/payara-web.xml b/jaspic/dispatching/src/main/webapp/WEB-INF/payara-web.xml new file mode 100644 index 000000000..360fdc460 --- /dev/null +++ b/jaspic/dispatching/src/main/webapp/WEB-INF/payara-web.xml @@ -0,0 +1,12 @@ + + + + + + architect + architect + + + + + \ No newline at end of file diff --git a/jaspic/ejb-propagation/src/main/webapp/WEB-INF/glassfish-web.xml b/jaspic/ejb-propagation/src/main/webapp/WEB-INF/glassfish-web.xml deleted file mode 100644 index 26559e3f6..000000000 --- a/jaspic/ejb-propagation/src/main/webapp/WEB-INF/glassfish-web.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - architect - architect - - - - - \ No newline at end of file diff --git a/jaspic/ejb-propagation/src/main/webapp/WEB-INF/payara-web.xml b/jaspic/ejb-propagation/src/main/webapp/WEB-INF/payara-web.xml new file mode 100644 index 000000000..360fdc460 --- /dev/null +++ b/jaspic/ejb-propagation/src/main/webapp/WEB-INF/payara-web.xml @@ -0,0 +1,12 @@ + + + + + + architect + architect + + + + + \ No newline at end of file diff --git a/jaspic/ejb-register-session/src/main/webapp/WEB-INF/glassfish-web.xml b/jaspic/ejb-register-session/src/main/webapp/WEB-INF/glassfish-web.xml deleted file mode 100644 index 26559e3f6..000000000 --- a/jaspic/ejb-register-session/src/main/webapp/WEB-INF/glassfish-web.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - architect - architect - - - - - \ No newline at end of file diff --git a/jaspic/ejb-register-session/src/main/webapp/WEB-INF/payara-web.xml b/jaspic/ejb-register-session/src/main/webapp/WEB-INF/payara-web.xml new file mode 100644 index 000000000..360fdc460 --- /dev/null +++ b/jaspic/ejb-register-session/src/main/webapp/WEB-INF/payara-web.xml @@ -0,0 +1,12 @@ + + + + + + architect + architect + + + + + \ No newline at end of file diff --git a/jaspic/invoke-ejb-cdi/src/main/webapp/WEB-INF/glassfish-web.xml b/jaspic/invoke-ejb-cdi/src/main/webapp/WEB-INF/glassfish-web.xml deleted file mode 100644 index 26559e3f6..000000000 --- a/jaspic/invoke-ejb-cdi/src/main/webapp/WEB-INF/glassfish-web.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - architect - architect - - - - - \ No newline at end of file diff --git a/jaspic/invoke-ejb-cdi/src/main/webapp/WEB-INF/payara-web.xml b/jaspic/invoke-ejb-cdi/src/main/webapp/WEB-INF/payara-web.xml new file mode 100644 index 000000000..360fdc460 --- /dev/null +++ b/jaspic/invoke-ejb-cdi/src/main/webapp/WEB-INF/payara-web.xml @@ -0,0 +1,12 @@ + + + + + + architect + architect + + + + + \ No newline at end of file diff --git a/jaspic/jacc-propagation/src/main/webapp/WEB-INF/glassfish-web.xml b/jaspic/jacc-propagation/src/main/webapp/WEB-INF/glassfish-web.xml deleted file mode 100644 index 26559e3f6..000000000 --- a/jaspic/jacc-propagation/src/main/webapp/WEB-INF/glassfish-web.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - architect - architect - - - - - \ No newline at end of file diff --git a/jaspic/jacc-propagation/src/main/webapp/WEB-INF/payara-web.xml b/jaspic/jacc-propagation/src/main/webapp/WEB-INF/payara-web.xml new file mode 100644 index 000000000..360fdc460 --- /dev/null +++ b/jaspic/jacc-propagation/src/main/webapp/WEB-INF/payara-web.xml @@ -0,0 +1,12 @@ + + + + + + architect + architect + + + + + \ No newline at end of file diff --git a/jaspic/lifecycle/src/main/webapp/WEB-INF/glassfish-web.xml b/jaspic/lifecycle/src/main/webapp/WEB-INF/glassfish-web.xml deleted file mode 100644 index 26559e3f6..000000000 --- a/jaspic/lifecycle/src/main/webapp/WEB-INF/glassfish-web.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - architect - architect - - - - - \ No newline at end of file diff --git a/jaspic/lifecycle/src/main/webapp/WEB-INF/payara-web.xml b/jaspic/lifecycle/src/main/webapp/WEB-INF/payara-web.xml new file mode 100644 index 000000000..360fdc460 --- /dev/null +++ b/jaspic/lifecycle/src/main/webapp/WEB-INF/payara-web.xml @@ -0,0 +1,12 @@ + + + + + + architect + architect + + + + + \ No newline at end of file diff --git a/jaspic/programmatic-authentication/src/main/webapp/WEB-INF/glassfish-web.xml b/jaspic/programmatic-authentication/src/main/webapp/WEB-INF/glassfish-web.xml deleted file mode 100644 index 26559e3f6..000000000 --- a/jaspic/programmatic-authentication/src/main/webapp/WEB-INF/glassfish-web.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - architect - architect - - - - - \ No newline at end of file diff --git a/jaspic/programmatic-authentication/src/main/webapp/WEB-INF/payara-web.xml b/jaspic/programmatic-authentication/src/main/webapp/WEB-INF/payara-web.xml new file mode 100644 index 000000000..360fdc460 --- /dev/null +++ b/jaspic/programmatic-authentication/src/main/webapp/WEB-INF/payara-web.xml @@ -0,0 +1,12 @@ + + + + + + architect + architect + + + + + \ No newline at end of file diff --git a/jaspic/register-session/src/main/webapp/WEB-INF/glassfish-web.xml b/jaspic/register-session/src/main/webapp/WEB-INF/glassfish-web.xml deleted file mode 100644 index 26559e3f6..000000000 --- a/jaspic/register-session/src/main/webapp/WEB-INF/glassfish-web.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - architect - architect - - - - - \ No newline at end of file diff --git a/jaspic/register-session/src/main/webapp/WEB-INF/payara-web.xml b/jaspic/register-session/src/main/webapp/WEB-INF/payara-web.xml new file mode 100644 index 000000000..360fdc460 --- /dev/null +++ b/jaspic/register-session/src/main/webapp/WEB-INF/payara-web.xml @@ -0,0 +1,12 @@ + + + + + + architect + architect + + + + + \ No newline at end of file diff --git a/jaspic/status-codes/src/main/webapp/WEB-INF/glassfish-web.xml b/jaspic/status-codes/src/main/webapp/WEB-INF/glassfish-web.xml deleted file mode 100644 index 26559e3f6..000000000 --- a/jaspic/status-codes/src/main/webapp/WEB-INF/glassfish-web.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - architect - architect - - - - - \ No newline at end of file diff --git a/jaspic/status-codes/src/main/webapp/WEB-INF/payara-web.xml b/jaspic/status-codes/src/main/webapp/WEB-INF/payara-web.xml new file mode 100644 index 000000000..360fdc460 --- /dev/null +++ b/jaspic/status-codes/src/main/webapp/WEB-INF/payara-web.xml @@ -0,0 +1,12 @@ + + + + + + architect + architect + + + + + \ No newline at end of file diff --git a/jaspic/wrapping/src/main/webapp/WEB-INF/glassfish-web.xml b/jaspic/wrapping/src/main/webapp/WEB-INF/glassfish-web.xml deleted file mode 100644 index 26559e3f6..000000000 --- a/jaspic/wrapping/src/main/webapp/WEB-INF/glassfish-web.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - architect - architect - - - - - \ No newline at end of file diff --git a/jaspic/wrapping/src/main/webapp/WEB-INF/payara-web.xml b/jaspic/wrapping/src/main/webapp/WEB-INF/payara-web.xml new file mode 100644 index 000000000..360fdc460 --- /dev/null +++ b/jaspic/wrapping/src/main/webapp/WEB-INF/payara-web.xml @@ -0,0 +1,12 @@ + + + + + + architect + architect + + + + + \ No newline at end of file diff --git a/servlet/security-annotated/src/main/webapp/WEB-INF/glassfish-web.xml b/servlet/security-annotated/src/main/webapp/WEB-INF/payara-web.xml similarity index 90% rename from servlet/security-annotated/src/main/webapp/WEB-INF/glassfish-web.xml rename to servlet/security-annotated/src/main/webapp/WEB-INF/payara-web.xml index 565b61e9c..21ca27b07 100644 --- a/servlet/security-annotated/src/main/webapp/WEB-INF/glassfish-web.xml +++ b/servlet/security-annotated/src/main/webapp/WEB-INF/payara-web.xml @@ -40,10 +40,10 @@ * holder. */ --> - - + + g1 g1 - + diff --git a/servlet/security-basicauth-omission/src/main/webapp/WEB-INF/glassfish-web.xml b/servlet/security-basicauth-omission/src/main/webapp/WEB-INF/payara-web.xml similarity index 90% rename from servlet/security-basicauth-omission/src/main/webapp/WEB-INF/glassfish-web.xml rename to servlet/security-basicauth-omission/src/main/webapp/WEB-INF/payara-web.xml index a3d43b27f..de256a745 100644 --- a/servlet/security-basicauth-omission/src/main/webapp/WEB-INF/glassfish-web.xml +++ b/servlet/security-basicauth-omission/src/main/webapp/WEB-INF/payara-web.xml @@ -40,11 +40,11 @@ * holder. */ --> - - + + g1 g1 g1 - + diff --git a/servlet/security-basicauth/src/main/webapp/WEB-INF/glassfish-web.xml b/servlet/security-basicauth/src/main/webapp/WEB-INF/payara-web.xml similarity index 90% rename from servlet/security-basicauth/src/main/webapp/WEB-INF/glassfish-web.xml rename to servlet/security-basicauth/src/main/webapp/WEB-INF/payara-web.xml index 565b61e9c..21ca27b07 100644 --- a/servlet/security-basicauth/src/main/webapp/WEB-INF/glassfish-web.xml +++ b/servlet/security-basicauth/src/main/webapp/WEB-INF/payara-web.xml @@ -40,10 +40,10 @@ * holder. */ --> - - + + g1 g1 - + diff --git a/servlet/security-clientcert-parent/security-clientcert-common-name/src/main/webapp/WEB-INF/glassfish-web.xml b/servlet/security-clientcert-parent/security-clientcert-common-name/src/main/webapp/WEB-INF/payara-web.xml similarity index 56% rename from servlet/security-clientcert-parent/security-clientcert-common-name/src/main/webapp/WEB-INF/glassfish-web.xml rename to servlet/security-clientcert-parent/security-clientcert-common-name/src/main/webapp/WEB-INF/payara-web.xml index e1c14ca38..844235932 100644 --- a/servlet/security-clientcert-parent/security-clientcert-common-name/src/main/webapp/WEB-INF/glassfish-web.xml +++ b/servlet/security-clientcert-parent/security-clientcert-common-name/src/main/webapp/WEB-INF/payara-web.xml @@ -2,8 +2,8 @@ - - + + g2 @@ -11,4 +11,4 @@ foo - + diff --git a/servlet/security-clientcert-parent/security-clientcert-jce/src/main/webapp/WEB-INF/glassfish-web.xml b/servlet/security-clientcert-parent/security-clientcert-jce/src/main/webapp/WEB-INF/payara-web.xml similarity index 56% rename from servlet/security-clientcert-parent/security-clientcert-jce/src/main/webapp/WEB-INF/glassfish-web.xml rename to servlet/security-clientcert-parent/security-clientcert-jce/src/main/webapp/WEB-INF/payara-web.xml index e78edc96a..e5a320e06 100644 --- a/servlet/security-clientcert-parent/security-clientcert-jce/src/main/webapp/WEB-INF/glassfish-web.xml +++ b/servlet/security-clientcert-parent/security-clientcert-jce/src/main/webapp/WEB-INF/payara-web.xml @@ -2,8 +2,8 @@ - - + + g1 @@ -11,4 +11,4 @@ CN=u1 - + diff --git a/servlet/security-clientcert-parent/security-clientcert/src/main/webapp/WEB-INF/glassfish-web.xml b/servlet/security-clientcert-parent/security-clientcert/src/main/webapp/WEB-INF/payara-web.xml similarity index 70% rename from servlet/security-clientcert-parent/security-clientcert/src/main/webapp/WEB-INF/glassfish-web.xml rename to servlet/security-clientcert-parent/security-clientcert/src/main/webapp/WEB-INF/payara-web.xml index cb41fb804..3798c757d 100644 --- a/servlet/security-clientcert-parent/security-clientcert/src/main/webapp/WEB-INF/glassfish-web.xml +++ b/servlet/security-clientcert-parent/security-clientcert/src/main/webapp/WEB-INF/payara-web.xml @@ -2,8 +2,8 @@ - - + + g1 @@ -15,4 +15,4 @@ C=UK,ST=lak,L=zak,O=kaz,OU=bar,CN=lfoo - + diff --git a/servlet/security-deny-uncovered/src/main/webapp/WEB-INF/glassfish-web.xml b/servlet/security-deny-uncovered/src/main/webapp/WEB-INF/glassfish-web.xml deleted file mode 100644 index 54e3db333..000000000 --- a/servlet/security-deny-uncovered/src/main/webapp/WEB-INF/glassfish-web.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - g1 - g1 - - diff --git a/servlet/security-deny-uncovered/src/main/webapp/WEB-INF/payara-web.xml b/servlet/security-deny-uncovered/src/main/webapp/WEB-INF/payara-web.xml new file mode 100644 index 000000000..42c885027 --- /dev/null +++ b/servlet/security-deny-uncovered/src/main/webapp/WEB-INF/payara-web.xml @@ -0,0 +1,8 @@ + + + + + g1 + g1 + + diff --git a/servlet/security-digest/src/main/webapp/WEB-INF/glassfish-web.xml b/servlet/security-digest/src/main/webapp/WEB-INF/payara-web.xml similarity index 91% rename from servlet/security-digest/src/main/webapp/WEB-INF/glassfish-web.xml rename to servlet/security-digest/src/main/webapp/WEB-INF/payara-web.xml index 0ef896eaa..4762f95de 100644 --- a/servlet/security-digest/src/main/webapp/WEB-INF/glassfish-web.xml +++ b/servlet/security-digest/src/main/webapp/WEB-INF/payara-web.xml @@ -40,12 +40,12 @@ * holder. */ --> - - + + g1 g1 - + diff --git a/servlet/security-form-based/src/main/webapp/WEB-INF/glassfish-web.xml b/servlet/security-form-based/src/main/webapp/WEB-INF/payara-web.xml similarity index 90% rename from servlet/security-form-based/src/main/webapp/WEB-INF/glassfish-web.xml rename to servlet/security-form-based/src/main/webapp/WEB-INF/payara-web.xml index 565b61e9c..21ca27b07 100644 --- a/servlet/security-form-based/src/main/webapp/WEB-INF/glassfish-web.xml +++ b/servlet/security-form-based/src/main/webapp/WEB-INF/payara-web.xml @@ -40,10 +40,10 @@ * holder. */ --> - - + + g1 g1 - + diff --git a/servlet/security-programmatic/src/main/webapp/WEB-INF/glassfish-web.xml b/servlet/security-programmatic/src/main/webapp/WEB-INF/glassfish-web.xml deleted file mode 100644 index 9db4badbc..000000000 --- a/servlet/security-programmatic/src/main/webapp/WEB-INF/glassfish-web.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - g1 - g1 - g1 - - diff --git a/servlet/security-programmatic/src/main/webapp/WEB-INF/payara-web.xml b/servlet/security-programmatic/src/main/webapp/WEB-INF/payara-web.xml new file mode 100644 index 000000000..247a10a3e --- /dev/null +++ b/servlet/security-programmatic/src/main/webapp/WEB-INF/payara-web.xml @@ -0,0 +1,9 @@ + + + + + g1 + g1 + g1 + + From 01b05ca0df9ad4a81717daf9a041fc9b73d9df8f Mon Sep 17 00:00:00 2001 From: Rhys Williams <170514543+Viii3@users.noreply.github.com> Date: Thu, 5 Feb 2026 10:45:16 +0000 Subject: [PATCH 2/2] FISH-10759: Change glassfish-web.xml references in test classes --- .../src/main/java/org/javaee7/jaspic/common/ArquillianBase.java | 2 +- .../security/clientcert/SecureServletWithCommonNameTest.java | 2 +- .../servlet/security/clientcert/jce/SecureServletTest.java | 2 +- .../javaee7/servlet/security/clientcert/SecureServletTest.java | 2 +- .../java/org/javaee7/servlet/security/form/based/FormTest.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jaspic/common/src/main/java/org/javaee7/jaspic/common/ArquillianBase.java b/jaspic/common/src/main/java/org/javaee7/jaspic/common/ArquillianBase.java index 1fee77bdf..f90c0084e 100644 --- a/jaspic/common/src/main/java/org/javaee7/jaspic/common/ArquillianBase.java +++ b/jaspic/common/src/main/java/org/javaee7/jaspic/common/ArquillianBase.java @@ -75,7 +75,7 @@ public static WebArchive defaultWebArchive() { .deleteClass(ArquillianBase.class) .addAsWebInfResource(resource("web.xml")) .addAsWebInfResource(resource("jboss-web.xml")) - .addAsWebInfResource(resource("glassfish-web.xml")); + .addAsWebInfResource(resource("payara-web.xml")); } public static Archive tryWrapEAR(WebArchive webArchive) { diff --git a/servlet/security-clientcert-parent/security-clientcert-common-name/src/test/java/org/javaee7/servlet/security/clientcert/SecureServletWithCommonNameTest.java b/servlet/security-clientcert-parent/security-clientcert-common-name/src/test/java/org/javaee7/servlet/security/clientcert/SecureServletWithCommonNameTest.java index 68cb92c60..88286ff0d 100644 --- a/servlet/security-clientcert-parent/security-clientcert-common-name/src/test/java/org/javaee7/servlet/security/clientcert/SecureServletWithCommonNameTest.java +++ b/servlet/security-clientcert-parent/security-clientcert-common-name/src/test/java/org/javaee7/servlet/security/clientcert/SecureServletWithCommonNameTest.java @@ -139,7 +139,7 @@ public static WebArchive createDeployment() throws FileNotFoundException, IOExce return create(WebArchive.class) .addClasses(SecureServletWithCommonName.class) .addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "web.xml"))) - .addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "glassfish-web.xml"))); + .addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "payara-web.xml"))); } @Before diff --git a/servlet/security-clientcert-parent/security-clientcert-jce/src/test/java/org/javaee7/servlet/security/clientcert/jce/SecureServletTest.java b/servlet/security-clientcert-parent/security-clientcert-jce/src/test/java/org/javaee7/servlet/security/clientcert/jce/SecureServletTest.java index aa5f38862..125228935 100644 --- a/servlet/security-clientcert-parent/security-clientcert-jce/src/test/java/org/javaee7/servlet/security/clientcert/jce/SecureServletTest.java +++ b/servlet/security-clientcert-parent/security-clientcert-jce/src/test/java/org/javaee7/servlet/security/clientcert/jce/SecureServletTest.java @@ -164,7 +164,7 @@ public static WebArchive createDeployment() throws FileNotFoundException, IOExce .addClasses(SecureServlet.class) .addClasses(MyJCECertificateFactory.class, MyJCEX509Certificate.class) .addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "web.xml"))) - .addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "glassfish-web.xml"))); + .addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "payara-web.xml"))); } @Before diff --git a/servlet/security-clientcert-parent/security-clientcert/src/test/java/org/javaee7/servlet/security/clientcert/SecureServletTest.java b/servlet/security-clientcert-parent/security-clientcert/src/test/java/org/javaee7/servlet/security/clientcert/SecureServletTest.java index e2485396a..95c10a864 100644 --- a/servlet/security-clientcert-parent/security-clientcert/src/test/java/org/javaee7/servlet/security/clientcert/SecureServletTest.java +++ b/servlet/security-clientcert-parent/security-clientcert/src/test/java/org/javaee7/servlet/security/clientcert/SecureServletTest.java @@ -128,7 +128,7 @@ public static WebArchive createDeployment() throws FileNotFoundException, IOExce return create(WebArchive.class) .addClasses(SecureServlet.class) .addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "web.xml"))) - .addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "glassfish-web.xml"))); + .addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "payara-web.xml"))); } @Before diff --git a/servlet/security-form-based/src/test/java/org/javaee7/servlet/security/form/based/FormTest.java b/servlet/security-form-based/src/test/java/org/javaee7/servlet/security/form/based/FormTest.java index d74896668..be996e5f4 100644 --- a/servlet/security-form-based/src/test/java/org/javaee7/servlet/security/form/based/FormTest.java +++ b/servlet/security-form-based/src/test/java/org/javaee7/servlet/security/form/based/FormTest.java @@ -45,7 +45,7 @@ public static WebArchive createDeployment() { .addAsWebResource(new File(WEBAPP_SRC, "loginerror.jsp")) .addAsWebResource(new File(WEBAPP_SRC, "loginform.jsp")) .addAsWebInfResource(new File(WEBAPP_SRC + "/WEB-INF", "web.xml")) - .addAsWebInfResource(new File(WEBAPP_SRC + "/WEB-INF", "glassfish-web.xml")); + .addAsWebInfResource(new File(WEBAPP_SRC + "/WEB-INF", "payara-web.xml")); } @Before