payara · Viii3 · Feb 2, 2026 · Feb 2, 2026 · Feb 5, 2026 · Feb 5, 2026
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -236,8 +236,8 @@ pipeline {
                     steps{
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Checking out MP TCK Runners  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
                         checkout changelog: false, poll: false, scm: [$class: 'GitSCM',
-                            branches: [[name: "*/microprofile-6.1-Payara7"]],
-                            userRemoteConfigs: [[url: "https://github.com/payara/MicroProfile-TCK-Runners.git"]]]
+                            branches: [[name: "*/FISH-10759-Deployment-Descriptors"]],
+                            userRemoteConfigs: [[url: "https://github.com/Viii3/MicroProfile-TCK-Runners.git"]]]
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Checked out MP TCK Runners  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
 
                         setupDomain()
@@ -493,8 +493,8 @@ pipeline {
                     steps{
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Checking out cargoTracker tests  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
                         checkout changelog: false, poll: false, scm: [$class: 'GitSCM',
-                            branches: [[name: "*/Payara7"]],
-                            userRemoteConfigs: [[url: "https://github.com/payara/cargoTracker.git"]]]
+                            branches: [[name: "*/FISH-10759-Deployment-Descriptors"]],
+                            userRemoteConfigs: [[url: "https://github.com/Viii3/cargotracker.git"]]]
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Checked out cargoTracker tests  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
 
                         setupDomain()
@@ -531,8 +531,8 @@ pipeline {
                     steps{
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Checking out EE7 tests  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
                         checkout changelog: false, poll: false, scm: [$class: 'GitSCM',
-                            branches: [[name: "*/Payara7"]],
-                            userRemoteConfigs: [[url: "https://github.com/payara/patched-src-javaee7-samples.git"]]]
+                            branches: [[name: "*/FISH-10759-Deployment-Descriptors"]],
+                            userRemoteConfigs: [[url: "https://github.com/Viii3/patched-src-javaee7-samples.git"]]]
                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Checked out EE7 tests  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
 
                         setupDomain()

diff --git a/appserver/admingui/reference-manual/src/main/help/en/help/reference/deploy.html b/appserver/admingui/reference-manual/src/main/help/en/help/reference/deploy.html
@@ -17,7 +17,7 @@
     SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 
 -->
-<!-- Portions Copyright [2019] [Payara Foundation and/or its affiliates] -->
+<!-- Portions Copyright 2019-2026 Payara Foundation and/or its affiliates -->
 <html lang="en">
   <head>
     <meta charset="utf-8"/>
@@ -310,10 +310,11 @@ <h2 id="_deploy">deploy</h2>
 for an EAR, the <code>--runtimealtdd</code> option overrides
 <code>glassfish-application.xml</code>. For a standalone module, the
 <code>--runtimealtdd</code> option overrides the top-level module descriptor such
-as <code>glassfish-web.xml</code>. Applies to \{product---name} deployment
-descriptors only (<code>glassfish-*.xml</code>); the name of the alternate
-deployment descriptor file must begin with <code>glassfish-</code>. Does not
-apply to <code>sun-*.xml</code> deployment descriptors, which are deprecated.</p>
+as <code>payara-web.xml</code>. Applies to <code>payara-web.xml</code> and \{product---name}
+deployment descriptors only (<code>glassfish-*.xml</code>); the name of the alternate
+deployment descriptor file must be <code>payara-web.xml</code> or begin with
+<code>glassfish-</code>. Does not apply to <code>sun-*.xml</code> deployment
+descriptors, which are deprecated.</p>
 </dd>
 <dt class="hdlist1"><code>--deploymentorder</code></dt>
 <dd>

diff --git a/appserver/admingui/reference-manual/src/main/help/en/help/reference/deploydir.html b/appserver/admingui/reference-manual/src/main/help/en/help/reference/deploydir.html
@@ -17,7 +17,7 @@
     SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 
 -->
-<!-- Portions Copyright [2019] [Payara Foundation and/or its affiliates] -->
+<!-- Portions Copyright 2019-2026 Payara Foundation and/or its affiliates -->
 <html lang="en">
   <head>
     <meta charset="utf-8"/>
@@ -302,10 +302,11 @@ <h2 id="_deploydir">deploydir</h2>
 for an EAR, the <code>--runtimealtdd</code> option overrides
 <code>glassfish-application.xml</code>. For a standalone module, the
 <code>--runtimealtdd</code> option overrides the top-level module descriptor such
-as <code>glassfish-web.xml</code>. Applies to \{product---name} deployment
-descriptors only (<code>glassfish-*.xml</code>); the name of the alternate
-deployment descriptor file must begin with <code>glassfish-</code>. Does not
-apply to <code>sun-*.xml</code> deployment descriptors, which are deprecated.</p>
+as <code>payara-web.xml</code>. Applies to <code>payara-web.xml</code> and \{product---name}
+deployment descriptors only (<code>glassfish-*.xml</code>); the name of the alternate
+deployment descriptor file must be <code>payara-web.xml</code> or begin with
+<code>glassfish-</code>. Does not apply to <code>sun-*.xml</code> deployment
+descriptors, which are deprecated.</p>
 </dd>
 <dt class="hdlist1"><code>--deploymentorder</code></dt>
 <dd>

diff --git a/appserver/admingui/reference-manual/src/main/help/en/help/reference/redeploy.html b/appserver/admingui/reference-manual/src/main/help/en/help/reference/redeploy.html
@@ -17,7 +17,7 @@
     SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 
 -->
-<!-- Portions Copyright [2019] [Payara Foundation and/or its affiliates] -->
+<!-- Portions Copyright 2019-2026 Payara Foundation and/or its affiliates -->
 <html lang="en">
   <head>
     <meta charset="utf-8"/>
@@ -289,10 +289,11 @@ <h2 id="_redeploy">redeploy</h2>
 for an EAR, the <code>--runtimealtdd</code> option overrides
 <code>glassfish-application.xml</code>. For a standalone module, the
 <code>--runtimealtdd</code> option overrides the top-level module descriptor such
-as <code>glassfish-web.xml</code>. Applies to \{product---name} deployment
-descriptors only (<code>glassfish-*.xml</code>); the name of the alternate
-deployment descriptor file must begin with <code>glassfish-</code>. Does not
-apply to <code>sun-*.xml</code> deployment descriptors, which are deprecated.</p>
+as <code>payara-web.xml</code>. Applies to <code>payara-web.xml</code> and \{product---name}
+deployment descriptors only (<code>glassfish-*.xml</code>); the name of the alternate
+deployment descriptor file must be <code>payara-web.xml</code> or begin with
+<code>glassfish-</code>. Does not apply to <code>sun-*.xml</code> deployment
+descriptors, which are deprecated.</p>
 </dd>
 <dt class="hdlist1"><code>--deploymentorder</code></dt>
 <dd>

diff --git a/appserver/admingui/war/pom.xml b/appserver/admingui/war/pom.xml
@@ -85,13 +85,13 @@
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
-                    <warSourceExcludes>WEB-INF/sun-web.xml</warSourceExcludes>
+                    <warSourceExcludes>WEB-INF/payara-web.xml</warSourceExcludes>
                     <webResources>
                         <resource>
                             <directory>src/main/webapp</directory>
                             <filtering>true</filtering>
                             <includes>
-                                <include>WEB-INF/sun-web.xml</include>
+                                <include>WEB-INF/payara-web.xml</include>
                             </includes>
                         </resource>
                         <resource>

diff --git a/...i/war/src/main/webapp/WEB-INF/sun-web.xml → ...ar/src/main/webapp/WEB-INF/payara-web.xml b/...i/war/src/main/webapp/WEB-INF/sun-web.xml → ...ar/src/main/webapp/WEB-INF/payara-web.xml
@@ -39,11 +39,11 @@
     only if the new code is made subject to such option by the copyright
     holder.
 -->
-<!-- Portions Copyright [2016-2019] [Payara Foundation and/or its affiliates] -->
+<!-- Portions Copyright 2016-2026 Payara Foundation and/or its affiliates -->
 
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 7.0 Servlet 2.3//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_3-0.dtd'>
+<!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">
 
-<sun-web-app httpservlet-security-provider="GFConsoleAuthModule">
+<payara-web-app httpservlet-security-provider="GFConsoleAuthModule">
     <security-role-mapping>
         <role-name>admin</role-name>
         <principal-name>admin</principal-name>
@@ -62,4 +62,4 @@
     <class-loader delegate="true"
         extra-class-path="WEB-INF/extra/woodstock-webui-jsf-suntheme-${woodstock-jsf-suntheme.version}${enterprise.theme.classifier}.jar:WEB-INF/extra/dojo-${woodstock-external.dojo.version}.jar:WEB-INF/extra/woodstock-webui-jsf-${woodstock-jsf.version}.jar:WEB-INF/extra/commons-io-${commons-io.version}.jar:WEB-INF/extra/json-${woodstock-json.version}.jar:WEB-INF/extra/prototype-${woodstock-external.prototype.version}.jar"/>
     <property name="useBundledJsf" value="true"/>
-</sun-web-app>
+</payara-web-app>
diff --git a/appserver/admingui/web/src/main/help/en/help/ref-virtualserverprops.html b/appserver/admingui/web/src/main/help/en/help/ref-virtualserverprops.html
@@ -16,7 +16,7 @@
     SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 
 -->
-<!-- Portions Copyright [2019] [Payara Foundation and/or its affiliates] -->
+<!-- Portions Copyright 2019-2026 Payara Foundation and/or its affiliates -->
 
 <p><a id="ref-virtualserverprops" name="ref-virtualserverprops"></a><a id="GHWEB00012" name="GHWEB00012"></a></p>
 
@@ -51,7 +51,7 @@ <h4><a id="sthref125" name="sthref125"></a><a id="sthref126" name="sthref126"></
 <p>The <code>JSESSIONIDSSO</code> cookie inherits the <code>Secure</code> setting of the first session participating in SSO.</p>
 </dd>
 </dl>
-<p>To set the Secure attribute of a <code>JSESSIONID</code> cookie, use the <code>cookieSecure</code> <code>cookie-properties</code> property in the <code>sun-web.xml</code> file.</p>
+<p>To set the Secure attribute of a <code>JSESSIONID</code> cookie, use the <code>cookieSecure</code> <code>cookie-properties</code> property in the <code>payara-web.xml</code> file.</p>
 </dd>
 <dt><code>setCacheControl</code></dt>
 <dd>
@@ -89,7 +89,7 @@ <h4><a id="sthref125" name="sthref125"></a><a id="sthref126" name="sthref126"></
 <dt><code>securePagesWithPragma</code></dt>
 <dd>
 <p>Set this property to <code>false</code> to ensure that for all web applications on this virtual server file downloads using SSL work properly in Internet Explorer.</p>
-<p>Individual web applications may override this setting by using the <code>sun-web-app</code> element of the <code>sun-web.xml</code> file.</p>
+<p>Individual web applications may override this setting by using the <code>sun-web-app</code> element of the <code>payara-web.xml</code> file.</p>
 <p>The default value is <code>true</code>.</p>
 </dd>
 <dt><code>alternatedocroot_</code><i>n</i></dt>
@@ -117,15 +117,15 @@ <h4><a id="sthref125" name="sthref125"></a><a id="sthref126" name="sthref126"></
    value="from=/jpg/* dir=/src/images"/&gt;
 </pre>
 <p>The <code>value</code> of each alternate docroot has two components: The first component, <code>from</code>, specifies the alternate docroot's URI pattern, and the second component, <code>dir</code>, specifies the alternate docroot's physical location (directory). Spaces are allowed in the <code>dir</code> component.</p>
-<p>Individual web applications may override this setting by using the <code>sun-web-app</code> element of the <code>sun-web.xml</code> file.</p>
+<p>Individual web applications may override this setting by using the <code>sun-web-app</code> element of the <code>payara-web.xml</code> file.</p>
 </dd>
 <dt><code>contextXmlDefault</code></dt>
 <dd>
 <p>Specifies the location, relative to <i>domain-dir</i>, of the <code>context.xml</code> file for this virtual server, if one is used.xml</code> file, see The Context Container (<code><a href="http://tomcat.apache.org/tomcat-5.5-doc/config/context.html">http://tomcat.apache.org/tomcat-5.5-doc/config/context.html</a></code>).</p>
 </dd>
 <dt><code>allowLinking</code></dt>
 <dd>
-<p>If <code>true</code>, resources that are symbolic links will be served for all web applications deployed on this virtual server. Individual web applications may override this setting by using the <code>sun-web-app</code> property <code>allowLinking</code> in the <code>sun-web.xml</code> file:</p>
+<p>If <code>true</code>, resources that are symbolic links will be served for all web applications deployed on this virtual server. Individual web applications may override this setting by using the <code>sun-web-app</code> property <code>allowLinking</code> in the <code>payara-web.xml</code> file:</p>
 <pre>
 &lt;sun-web-app&gt;
    &lt;property name="allowLinking" 

diff --git a/...er/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/DescriptorConstants.java b/...er/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/DescriptorConstants.java
@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-// Portions Copyright [2018] Payara Foundation and/or affiliates
+// Portions Copyright 2018-2026 Payara Foundation and/or its affiliates
 
 package com.sun.enterprise.deployment.io;
 
@@ -57,6 +57,11 @@ public interface DescriptorConstants {
     /** Prefix used for S1AS Cmp xmls */
     String S1AS_CMP_PREFIX = "sun-cmp-";
 
+    String WLS = "weblogic";
+
+    /** Prefix used for WebLogic xmls */
+    String WLS_PREFIX = "weblogic-";
+
     /** Prefix used for GF xmls */
     String GF_PREFIX = "glassfish-";
 
@@ -102,12 +107,6 @@ public interface DescriptorConstants {
     /** The name of the deployment descriptor entry in web fragment jar. */
     String WEB_FRAGMENT_JAR_ENTRY = "META-INF/web-fragment.xml";
 
-    /** The name of the S1AS deployment descriptor entry in web module. */
-    String S1AS_WEB_DD_ENTRY = "WEB-INF" + File.separator + S1AS_PREFIX+"web.xml";
-
-    /** The name of the S1AS deployment descriptor entry in web jar. */
-    String S1AS_WEB_JAR_ENTRY = "WEB-INF/" + S1AS_PREFIX + "web.xml";
-
     /** The name of the deployment descriptor entry in the rar module. */
     String RAR_DD_ENTRY = "META-INF" + File.separator + "ra.xml";
 
@@ -124,9 +123,6 @@ public interface DescriptorConstants {
     String GF_APPLICATION_JAR_ENTRY = "META-INF/" + GF_PREFIX +
         "application.xml";
 
-    /** The name of the glassfish deployment descriptor entry in web jar. */
-    String GF_WEB_JAR_ENTRY = "WEB-INF/" + GF_PREFIX + "web.xml";
-
     /** The name of the glassfish deployment descriptor entry in the ejb jar. */
     String GF_EJB_JAR_ENTRY = "META-INF/" + GF_PREFIX + "ejb-jar.xml";
 

diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/DescriptorList.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/DescriptorList.java