--runtimealtdd option overrides
glassfish-application.xml. For a standalone module, the
--runtimealtdd option overrides the top-level module descriptor such
-as glassfish-web.xml. Applies to \{product---name} deployment
-descriptors only (glassfish-*.xml); the name of the alternate
-deployment descriptor file must begin with glassfish-. Does not
-apply to sun-*.xml deployment descriptors, which are deprecated.
+as payara-web.xml. Applies to payara-web.xml and \{product---name}
+deployment descriptors only (glassfish-*.xml); the name of the alternate
+deployment descriptor file must be payara-web.xml or begin with
+glassfish-. Does not apply to sun-*.xml deployment
+descriptors, which are deprecated.
--deploymentorder--runtimealtdd option overrides
glassfish-application.xml. For a standalone module, the
--runtimealtdd option overrides the top-level module descriptor such
-as glassfish-web.xml. Applies to \{product---name} deployment
-descriptors only (glassfish-*.xml); the name of the alternate
-deployment descriptor file must begin with glassfish-. Does not
-apply to sun-*.xml deployment descriptors, which are deprecated.
+as payara-web.xml. Applies to payara-web.xml and \{product---name}
+deployment descriptors only (glassfish-*.xml); the name of the alternate
+deployment descriptor file must be payara-web.xml or begin with
+glassfish-. Does not apply to sun-*.xml deployment
+descriptors, which are deprecated.
--deploymentorder--runtimealtdd option overrides
glassfish-application.xml. For a standalone module, the
--runtimealtdd option overrides the top-level module descriptor such
-as glassfish-web.xml. Applies to \{product---name} deployment
-descriptors only (glassfish-*.xml); the name of the alternate
-deployment descriptor file must begin with glassfish-. Does not
-apply to sun-*.xml deployment descriptors, which are deprecated.
+as payara-web.xml. Applies to payara-web.xml and \{product---name}
+deployment descriptors only (glassfish-*.xml); the name of the alternate
+deployment descriptor file must be payara-web.xml or begin with
+glassfish-. Does not apply to sun-*.xml deployment
+descriptors, which are deprecated.
--deploymentorderJSESSIONIDSSO cookie inherits the Secure setting of the first session participating in SSO.
To set the Secure attribute of a JSESSIONID cookie, use the cookieSecure cookie-properties property in the sun-web.xml file.
To set the Secure attribute of a JSESSIONID cookie, use the cookieSecure cookie-properties property in the payara-web.xml file.
setCacheControlsecurePagesWithPragma
Set this property to false to ensure that for all web applications on this virtual server file downloads using SSL work properly in Internet Explorer.
Individual web applications may override this setting by using the sun-web-app element of the sun-web.xml file.
Individual web applications may override this setting by using the sun-web-app element of the payara-web.xml file.
The default value is true.
alternatedocroot_nThe value of each alternate docroot has two components: The first component, from, specifies the alternate docroot's URI pattern, and the second component, dir, specifies the alternate docroot's physical location (directory). Spaces are allowed in the dir component.
Individual web applications may override this setting by using the sun-web-app element of the sun-web.xml file.
Individual web applications may override this setting by using the sun-web-app element of the payara-web.xml file.
contextXmlDefaultallowLinkingIf true, 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 sun-web-app property allowLinking in the sun-web.xml file:
If true, 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 sun-web-app property allowLinking in the payara-web.xml file:
<sun-web-app>
<property name="allowLinking"
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/DescriptorConstants.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/DescriptorConstants.java
index 659d9034606..d602340fef7 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/DescriptorConstants.java
+++ b/appserver/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
deleted file mode 100755
index 93f67f6ff04..00000000000
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/DescriptorList.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License"). You
- * may not use this file except in compliance with the License. You can
- * obtain a copy of the License at
- * https://github.com/payara/Payara/blob/main/LICENSE.txt
- * See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at legal/OPEN-SOURCE-LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license." If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above. However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-
-package com.sun.enterprise.deployment.io;
-
-import org.glassfish.api.deployment.archive.ArchiveType;
-
-import com.sun.enterprise.deployment.util.DOLUtils;
-
-/**
- * Repository of descriptors
- * This class will evolve to provide a comprhensive list of
- * descriptors for any given type of j2ee application or
- * stand-alone module.
- *
- * @author Sreenivas Munnangi
- */
-
-public class DescriptorList {
-
- private final static String [] earList = {
- DescriptorConstants.APPLICATION_DD_ENTRY,
- DescriptorConstants.S1AS_APPLICATION_DD_ENTRY
- };
-
- private final static String [] ejbList = {
- DescriptorConstants.EJB_DD_ENTRY,
- DescriptorConstants.S1AS_EJB_DD_ENTRY,
- DescriptorConstants.S1AS_CMP_MAPPING_DD_ENTRY,
- DescriptorConstants.EJB_WEBSERVICES_JAR_ENTRY
- };
-
- private final static String [] warList = {
- DescriptorConstants.WEB_DD_ENTRY,
- DescriptorConstants.S1AS_WEB_DD_ENTRY,
- DescriptorConstants.WEB_WEBSERVICES_JAR_ENTRY,
- DescriptorConstants.JAXRPC_JAR_ENTRY
- };
-
- private final static String [] rarList = {
- DescriptorConstants.RAR_DD_ENTRY,
- DescriptorConstants.S1AS_RAR_DD_ENTRY
- };
-
- private final static String [] carList = {
- DescriptorConstants.APP_CLIENT_DD_ENTRY,
- DescriptorConstants.S1AS_APP_CLIENT_DD_ENTRY
- };
-
- public final static String [] getDescriptorsList (ArchiveType moduleType) {
- if (moduleType == null) return null;
- if (moduleType.equals(DOLUtils.earType())) {
- return (String[])earList.clone();
- } else if (moduleType.equals(DOLUtils.ejbType())) {
- return (String[])ejbList.clone();
- } else if (moduleType.equals(DOLUtils.warType())) {
- return (String[])warList.clone();
- } else if (moduleType.equals(DOLUtils.rarType())) {
- return (String[])rarList.clone();
- } else if (moduleType.equals(DOLUtils.carType())) {
- return (String[])carList.clone();
- }
- return null;
- }
-}
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/DOLUtils.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/DOLUtils.java
index 4a1f719dcd3..ac9a041b8a3 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/DOLUtils.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/DOLUtils.java
@@ -37,7 +37,7 @@
* only if the new code is made subject to such option by the copyright
* holder.
*/
-// Portions Copyright [2016-2024] [Payara Foundation and/or its affiliates]
+// Portions Copyright [2016-2026] [Payara Foundation and/or its affiliates]
package com.sun.enterprise.deployment.util;
@@ -118,7 +118,15 @@
* @version
*/
public class DOLUtils {
-
+ /** The system property to control the precedence between GF DD
+ // and WLS DD when they are both present. When this property is
+ // set to true, GF DD will have higher precedence over WLS DD. */
+ private static final String GFDD_OVER_WLSDD = "gfdd.over.wlsdd";
+
+ /** The system property to control whether we should just ignore
+ // WLS DD. When this property is set to true, WLS DD will be ignored.*/
+ private static final String IGNORE_WLSDD = "ignore.wlsdd";
+
public final static String W3C_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema";
public final static String SCHEMA_LOCATION_TAG = "xsi:schemaLocation";
@@ -374,26 +382,31 @@ public static ArchiveType getModuleType(String moduleType) {
// this list does not take consideration of what runtime files are
// present in the current archive */
private static List sortConfigurationDDFiles(List ddFiles, ArchiveType archiveType, ReadableArchive archive) {
+ ConfigurationDeploymentDescriptorFile wlsConfDD = null;
ConfigurationDeploymentDescriptorFile payaraConfDD = null;
ConfigurationDeploymentDescriptorFile gfConfDD = null;
ConfigurationDeploymentDescriptorFile sunConfDD = null;
+
for (ConfigurationDeploymentDescriptorFile ddFile : ddFiles) {
ddFile.setArchiveType(archiveType);
String ddPath = ddFile.getDeploymentDescriptorPath();
- if (ddPath.contains(DescriptorConstants.PAYARA_PREFIX)){
+ boolean isWebXML = ddPath.contains("-web.xml");
+
+ if (ddPath.contains(DescriptorConstants.WLS) && !isWebXML) {
+ wlsConfDD = ddFile;
+ } else if (ddPath.contains(DescriptorConstants.PAYARA_PREFIX)) {
payaraConfDD = ddFile;
- } else if (ddPath.contains(DescriptorConstants.GF_PREFIX)) {
+ } else if (ddPath.contains(DescriptorConstants.GF_PREFIX) && !isWebXML) {
gfConfDD = ddFile;
- } else if (ddPath.contains(DescriptorConstants.S1AS_PREFIX)) {
+ } else if (ddPath.contains(DescriptorConstants.S1AS_PREFIX) && !isWebXML) {
sunConfDD = ddFile;
}
}
+
List sortedConfDDFiles = new ArrayList<>();
-
// if there is external runtime alternate deployment descriptor
// specified, just use that
- File runtimeAltDDFile = archive.getArchiveMetaData(
- DeploymentProperties.RUNTIME_ALT_DD, File.class);
+ File runtimeAltDDFile = archive.getArchiveMetaData(DeploymentProperties.RUNTIME_ALT_DD, File.class);
if (runtimeAltDDFile != null && runtimeAltDDFile.exists() && runtimeAltDDFile.isFile()) {
String runtimeAltDDPath = runtimeAltDDFile.getPath();
validateRuntimeAltDDPath(runtimeAltDDPath);
@@ -409,11 +422,38 @@ private static List sortConfigurationDDFi
// sort the deployment descriptor files by precedence order
// when they are present in the same archive
- if (payaraConfDD != null){
- sortedConfDDFiles.add(payaraConfDD);
- }
- if (gfConfDD != null) {
- sortedConfDDFiles.add(gfConfDD);
+ if (Boolean.valueOf(System.getProperty(GFDD_OVER_WLSDD))) {
+ // if this property set, it means we need to make GF deployment
+ // descriptors higher precedence then weblogic
+ if (payaraConfDD != null){
+ sortedConfDDFiles.add(payaraConfDD);
+ }
+ if (gfConfDD != null) {
+ sortedConfDDFiles.add(gfConfDD);
+ }
+ if (wlsConfDD != null) {
+ sortedConfDDFiles.add(wlsConfDD);
+ }
+ } else if (Boolean.valueOf(System.getProperty(IGNORE_WLSDD))) {
+ // if this property set, it means we need to ignore
+ // WLS deployment descriptors
+ if (gfConfDD != null) {
+ sortedConfDDFiles.add(gfConfDD);
+ }
+ if (payaraConfDD != null){
+ sortedConfDDFiles.add(payaraConfDD);
+ }
+ } else {
+ // the default will be WLS DD has higher precedence
+ if (wlsConfDD != null) {
+ sortedConfDDFiles.add(wlsConfDD);
+ }
+ if (payaraConfDD != null){
+ sortedConfDDFiles.add(payaraConfDD);
+ }
+ if (gfConfDD != null) {
+ sortedConfDDFiles.add(gfConfDD);
+ }
}
if (sunConfDD != null) {
diff --git a/appserver/ejb/ejb-timer-service-app/src/main/webapp/WEB-INF/sun-web.xml b/appserver/ejb/ejb-timer-service-app/src/main/webapp/WEB-INF/payara-web.xml
similarity index 88%
rename from appserver/ejb/ejb-timer-service-app/src/main/webapp/WEB-INF/sun-web.xml
rename to appserver/ejb/ejb-timer-service-app/src/main/webapp/WEB-INF/payara-web.xml
index c90060609b9..018304a7dc6 100644
--- a/appserver/ejb/ejb-timer-service-app/src/main/webapp/WEB-INF/sun-web.xml
+++ b/appserver/ejb/ejb-timer-service-app/src/main/webapp/WEB-INF/payara-web.xml
@@ -40,8 +40,9 @@
holder.
-->
+
-
-
+
+
/ejb-timer-service-app
-
+
diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/PayaraResourcesCompositeSniffer.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/PayaraResourcesCompositeSniffer.java
index 0e3a0033146..9221b33b7c5 100644
--- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/PayaraResourcesCompositeSniffer.java
+++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/PayaraResourcesCompositeSniffer.java
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright (c) [2018] Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) [2018-2026] Payara Foundation and/or its affiliates. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
@@ -79,4 +79,9 @@ private static List initDeploymentConfigurationPaths() {
result.add(ResourceConstants.PAYARA_RESOURCES_LOCATION);
return result;
}
+
+ @Override
+ public List getDeploymentConfigurationPaths() {
+ return deploymentConfigurationPaths;
+ }
}
diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/PayaraResourcesSniffer.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/PayaraResourcesSniffer.java
index 285a178172c..a66f0a06ea7 100644
--- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/PayaraResourcesSniffer.java
+++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/PayaraResourcesSniffer.java
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright (c) [2018-2021] Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) [2018-2026] Payara Foundation and/or its affiliates. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
@@ -83,4 +83,9 @@ private static List initDeploymentConfigurationPaths() {
result.add(ResourceConstants.PAYARA_RESOURCES_LOCATION);
return result;
}
+
+ @Override
+ public List getDeploymentConfigurationPaths() {
+ return deploymentConfigurationPaths;
+ }
}
diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/ResourcesCompositeSniffer.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/ResourcesCompositeSniffer.java
index 5d0037a7187..856d29eec3b 100644
--- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/ResourcesCompositeSniffer.java
+++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/ResourcesCompositeSniffer.java
@@ -37,6 +37,7 @@
* only if the new code is made subject to such option by the copyright
* holder.
*/
+// Portions Copyright 2026 Payara Foundation and/or affiliates
package org.glassfish.resources.connector;
@@ -58,7 +59,7 @@
* Sniffer to detect glassfish-resources.xml(s) in composite archives
* @author Jagadish Ramu
*/
-@Service(name = ResourceConstants.GF_RESOURCES_MODULE_EAR)
+@Deprecated
public class ResourcesCompositeSniffer extends GenericSniffer {
//TODO ASR package name change ?
@@ -66,10 +67,6 @@ public class ResourcesCompositeSniffer extends GenericSniffer {
final String[] containerNames = {"org.glassfish.resources.module.ResourcesContainer"};
@Inject ServiceLocator locator;
-
- public ResourcesCompositeSniffer() {
- super(ResourceConstants.GF_RESOURCES_MODULE_EAR, ResourceConstants.GF_RESOURCES_LOCATION, null);
- }
//for PayaraResourcesCompositeSniffer
protected ResourcesCompositeSniffer(String containerName, String appStigma) {
@@ -85,7 +82,7 @@ protected ResourcesCompositeSniffer(String containerName, String appStigma) {
*/
@Override
public boolean handles(ReadableArchive archive) {
- return ResourceUtil.hasGlassfishResourcesXML(archive, locator);
+ return false;
}
/**
@@ -129,23 +126,4 @@ public boolean supportsArchiveType(ArchiveType archiveType) {
}
return false;
}
-
- private static final List deploymentConfigurationPaths =
- initDeploymentConfigurationPaths();
-
- private static List initDeploymentConfigurationPaths() {
- final List result = new ArrayList();
- result.add(ResourceConstants.GF_RESOURCES_LOCATION);
- return result;
- }
-
- /**
- * Returns the descriptor paths that might exist in an ear.
- *
- * @return list of the deployment descriptor paths
- */
- @Override
- protected List getDeploymentConfigurationPaths() {
- return deploymentConfigurationPaths;
- }
}
diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/ResourcesSniffer.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/ResourcesSniffer.java
index 9c02d3cd8f4..e83be02f02b 100644
--- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/ResourcesSniffer.java
+++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/ResourcesSniffer.java
@@ -37,7 +37,7 @@
* only if the new code is made subject to such option by the copyright
* holder.
*
- * Portions Copyright [2017-2021] Payara Foundation and/or affiliates
+ * Portions Copyright [2017-2026] Payara Foundation and/or affiliates
*/
package org.glassfish.resources.connector;
@@ -60,16 +60,12 @@
* Sniffer to detect glassfish-resources.xml in standalone archives
* @author Jagadish Ramu
*/
-@Service(name = ResourceConstants.GF_RESOURCES_MODULE)
+@Deprecated
public class ResourcesSniffer extends GenericSniffer {
//TODO ASR package name change ?
final String[] containerNames = {"org.glassfish.resources.module.ResourcesContainer"};
@Inject ServiceLocator locator;
-
- public ResourcesSniffer() {
- super(ResourceConstants.GF_RESOURCES_MODULE, ResourceConstants.GF_RESOURCES_LOCATION, null);
- }
//For Payara Resources sniffer
protected ResourcesSniffer(String containerName, String appStigma) {
@@ -85,8 +81,7 @@ protected ResourcesSniffer(String containerName, String appStigma) {
*/
@Override
public boolean handles(ReadableArchive archive) {
- return ResourceUtil.hasGlassfishResourcesXML(archive, locator)
- && archive.getParentArchive() == null;
+ return false;
}
/**
@@ -133,23 +128,4 @@ public boolean supportsArchiveType(ArchiveType archiveType) {
}
return false;
}
-
- private static final List deploymentConfigurationPaths =
- initDeploymentConfigurationPaths();
-
- private static List initDeploymentConfigurationPaths() {
- final List result = new ArrayList();
- result.add(ResourceConstants.GF_RESOURCES_LOCATION);
- return result;
- }
-
- /**
- * Returns the descriptor paths that might exist in a connector app.
- *
- * @return list of the deployment descriptor paths
- */
- @Override
- protected List getDeploymentConfigurationPaths() {
- return deploymentConfigurationPaths;
- }
}
diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/util/ResourceUtil.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/util/ResourceUtil.java
index 816097b3cd6..dcb8457d437 100644
--- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/util/ResourceUtil.java
+++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/util/ResourceUtil.java
@@ -37,7 +37,7 @@
* only if the new code is made subject to such option by the copyright
* holder.
*/
-// Portions Copyright [2018-2019] Payara Foundation and/or affiliates
+// Portions Copyright [2018-2026] Payara Foundation and/or affiliates
package org.glassfish.resources.util;
@@ -53,54 +53,9 @@
* @author Jagadish Ramu
*/
public class ResourceUtil {
-
- private static final String RESOURCES_XML_META_INF = "META-INF/glassfish-resources.xml";
- private static final String RESOURCES_XML_WEB_INF = "WEB-INF/glassfish-resources.xml";
private static final String PAYARA_RESOURCES_XML_META_INF = "META-INF/payara-resources.xml";
private static final String PAYARA_RESOURCES_XML_WEB_INF = "WEB-INF/payara-resources.xml";
-
-
- public static boolean hasGlassfishResourcesXML(ReadableArchive archive, ServiceLocator locator){
- boolean hasResourcesXML = false;
- if (archive != null) {
- try{
- if(DeploymentUtils.isArchiveOfType(archive, DOLUtils.earType(), locator)){
- //handle top-level META-INF/glassfish-resources.xml
- if(archive.exists(RESOURCES_XML_META_INF)){
- return true;
- }
-
- //check sub-module level META-INF/glassfish-resources.xml and WEB-INF/glassfish-resources.xml
- Enumeration entries = archive.entries();
- while(entries.hasMoreElements()){
- String element = entries.nextElement();
- if(element.endsWith(".jar") || element.endsWith(".war") || element.endsWith(".rar") ||
- element.endsWith("_jar") || element.endsWith("_war") || element.endsWith("_rar")){
- ReadableArchive subArchive = archive.getSubArchive(element);
- boolean answer = (subArchive != null && hasGlassfishResourcesXML(subArchive, locator));
- if (subArchive != null) {
- subArchive.close();
- }
- if (answer) {
- return true;
- }
- }
- }
- }else{
- if(DeploymentUtils.isArchiveOfType(archive, DOLUtils.warType(), locator)){
- return archive.exists(RESOURCES_XML_WEB_INF);
- }else {
- return archive.exists(RESOURCES_XML_META_INF);
- }
- }
- }catch(IOException ioe){
- //ignore
- }
- }
- return hasResourcesXML;
- }
-
public static boolean hasPayaraResourcesXML(ReadableArchive archive, ServiceLocator locator) {
boolean hasResourcesXML = false;
if (archive != null) {
diff --git a/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/module/ResourcesDeployer.java b/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/module/ResourcesDeployer.java
index b9f64779a4d..b211bd801c1 100644
--- a/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/module/ResourcesDeployer.java
+++ b/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/module/ResourcesDeployer.java
@@ -131,9 +131,7 @@ public class ResourcesDeployer extends JavaEEDeployer preservedApps = new HashMap();
private final static Logger _logger = LogDomains.getLogger(ResourcesDeployer.class, LogDomains.RSR_LOGGER);
-
- private static final String RESOURCES_XML_META_INF = "META-INF/glassfish-resources.xml";
- private static final String RESOURCES_XML_WEB_INF = "WEB-INF/glassfish-resources.xml";
+
private static final String PAYARA_RESOURCES_XML_META_INF = "META-INF/payara-resources.xml";
private static final String PAYARA_RESOURCES_XML_WEB_INF = "WEB-INF/payara-resources.xml";
@@ -197,9 +195,9 @@ public void getResources(ReadableArchive archive, String appName,
List connectorResources,
List nonConnectorResources,
Map resourceXmlParsers) {
- String processedFilename = "glassfish-resources.xml";
+ String processedFilename = "payara-resources.xml";
try {
- if (ResourceUtil.hasGlassfishResourcesXML(archive, locator) || ResourceUtil.hasPayaraResourcesXML(archive, locator)) {
+ if (ResourceUtil.hasPayaraResourcesXML(archive, locator)) {
Map> appScopedResources = new HashMap>();
Map fileNames = new HashMap();
//using appName as it is possible that "deploy --name=APPNAME" will
@@ -253,11 +251,11 @@ public void getResources(ReadableArchive archive, String appName,
private void processArchive(DeploymentContext dc) {
- String processedFilename = "glassfish-resources.xml";
+ String processedFilename = "payara-resources.xml";
try {
ReadableArchive archive = dc.getSource();
- if (ResourceUtil.hasGlassfishResourcesXML(archive, locator) || ResourceUtil.hasPayaraResourcesXML(archive, locator)) {
+ if (ResourceUtil.hasPayaraResourcesXML(archive, locator)) {
Map> appScopedResources = new HashMap<>();
Map> jndiNames = new HashMap<>();
@@ -742,16 +740,6 @@ public void retrieveAllResourcesXMLs(Map fileNames, ReadableArch
}
fileNames.put(actualArchiveName, fileName);
}
- //Look for top-level META-INF/glassfish-resources.xml
- if(archive.exists(RESOURCES_XML_META_INF)){
- String archivePath = archive.getURI().getPath();
- String fileName = archivePath + RESOURCES_XML_META_INF;
- if(_logger.isLoggable(Level.FINEST)){
- _logger.finest("GlassFish-Resources Deployer - fileName : " + fileName +
- " - parent : " + archive.getName());
- }
- fileNames.put(actualArchiveName, fileName);
- }
//Look for sub-module level META-INF/glassfish-resources.xml and WEB-INF/glassfish-resources.xml
// and also for payara-resources.xml
@@ -794,21 +782,6 @@ private void retrieveResourcesXMLFromArchive(Map fileNames, Read
_logger.log(Level.FINEST, "Payara-Resources Deployer - fileName : {0} - parent : {1}", new Object[]{fileName, archive.getName()});
}
- fileNames.put(actualArchiveName, fileName);
- }
- if(ResourceUtil.hasGlassfishResourcesXML(archive, locator)){
- String archivePath = archive.getURI().getPath();
- String fileName ;
- if(DeploymentUtils.isArchiveOfType(archive, DOLUtils.warType(), locator)){
- fileName = archivePath + RESOURCES_XML_WEB_INF;
- }else{
- fileName = archivePath + RESOURCES_XML_META_INF;
- }
- if(_logger.isLoggable(Level.FINEST)){
- _logger.finest("GlassFish-Resources Deployer - fileName : " + fileName +
- " - parent : " + archive.getName());
- }
-
fileNames.put(actualArchiveName, fileName);
}
}
diff --git a/appserver/tests/functional/payara-micro/src/test/java/fish/payara/functional/micro/DualSessionsIT.java b/appserver/tests/functional/payara-micro/src/test/java/fish/payara/functional/micro/DualSessionsIT.java
index f555817e691..a3b65b8dc0e 100644
--- a/appserver/tests/functional/payara-micro/src/test/java/fish/payara/functional/micro/DualSessionsIT.java
+++ b/appserver/tests/functional/payara-micro/src/test/java/fish/payara/functional/micro/DualSessionsIT.java
@@ -64,7 +64,7 @@ public class DualSessionsIT {
public static WebArchive createClusterJsp() {
WebArchive archive = ShrinkWrap.create(WebArchive.class, "clusterjsp.war")
- .addAsWebInfResource(new File("src/test/resources/clusterjsp/clusterjsp-war/web/WEB-INF/sun-web.xml"))
+ .addAsWebInfResource(new File("src/test/resources/clusterjsp/clusterjsp-war/web/WEB-INF/payara-web.xml"))
.addAsWebInfResource(new File("src/test/resources/clusterjsp/clusterjsp-war/web/WEB-INF/web.xml"))
.addAsWebResource(new File("src/test/resources/clusterjsp/clusterjsp-war/web/HaJsp.jsp"))
.addAsWebResource(new File("src/test/resources/clusterjsp/clusterjsp-war/web/ClearSession.jsp"))
diff --git a/appserver/tests/functional/payara-micro/src/test/resources/clusterjsp/clusterjsp-war/web/WEB-INF/sun-web.xml b/appserver/tests/functional/payara-micro/src/test/resources/clusterjsp/clusterjsp-war/web/WEB-INF/payara-web.xml
similarity index 84%
rename from appserver/tests/functional/payara-micro/src/test/resources/clusterjsp/clusterjsp-war/web/WEB-INF/sun-web.xml
rename to appserver/tests/functional/payara-micro/src/test/resources/clusterjsp/clusterjsp-war/web/WEB-INF/payara-web.xml
index da4bb1d71a6..6b69acde645 100644
--- a/appserver/tests/functional/payara-micro/src/test/resources/clusterjsp/clusterjsp-war/web/WEB-INF/sun-web.xml
+++ b/appserver/tests/functional/payara-micro/src/test/resources/clusterjsp/clusterjsp-war/web/WEB-INF/payara-web.xml
@@ -14,8 +14,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
-
+
+
+
+
+
diff --git a/appserver/tests/payara-samples/samples/clustered-singleton/clustered-singleton-test/src/main/webapp/WEB-INF/glassfish-web.xml b/appserver/tests/payara-samples/samples/clustered-singleton/clustered-singleton-test/src/main/webapp/WEB-INF/payara-web.xml
similarity index 53%
rename from appserver/tests/payara-samples/samples/clustered-singleton/clustered-singleton-test/src/main/webapp/WEB-INF/glassfish-web.xml
rename to appserver/tests/payara-samples/samples/clustered-singleton/clustered-singleton-test/src/main/webapp/WEB-INF/payara-web.xml
index 13e0059fffb..31e2e163641 100644
--- a/appserver/tests/payara-samples/samples/clustered-singleton/clustered-singleton-test/src/main/webapp/WEB-INF/glassfish-web.xml
+++ b/appserver/tests/payara-samples/samples/clustered-singleton/clustered-singleton-test/src/main/webapp/WEB-INF/payara-web.xml
@@ -1,10 +1,10 @@
-
-
+
+
Keep a copy of the generated servlet class' java code.
-
+
diff --git a/appserver/tests/payara-samples/samples/dynamic-roles/src/main/webapp/WEB-INF/glassfish-web.xml b/appserver/tests/payara-samples/samples/dynamic-roles/src/main/webapp/WEB-INF/payara-web.xml
similarity index 64%
rename from appserver/tests/payara-samples/samples/dynamic-roles/src/main/webapp/WEB-INF/glassfish-web.xml
rename to appserver/tests/payara-samples/samples/dynamic-roles/src/main/webapp/WEB-INF/payara-web.xml
index 89afc137aeb..1c7549f41e8 100644
--- a/appserver/tests/payara-samples/samples/dynamic-roles/src/main/webapp/WEB-INF/glassfish-web.xml
+++ b/appserver/tests/payara-samples/samples/dynamic-roles/src/main/webapp/WEB-INF/payara-web.xml
@@ -1,6 +1,6 @@
-
-
+
+
ROLE_ADMIN
@@ -14,4 +14,4 @@
+
diff --git a/appserver/tests/payara-samples/samples/dynamic-roles/src/test/java/fish/payara/samples/dynamic/roles/cdi/DynamicRolesCDITest.java b/appserver/tests/payara-samples/samples/dynamic-roles/src/test/java/fish/payara/samples/dynamic/roles/cdi/DynamicRolesCDITest.java
index 314069f8bc1..500208949df 100644
--- a/appserver/tests/payara-samples/samples/dynamic-roles/src/test/java/fish/payara/samples/dynamic/roles/cdi/DynamicRolesCDITest.java
+++ b/appserver/tests/payara-samples/samples/dynamic-roles/src/test/java/fish/payara/samples/dynamic/roles/cdi/DynamicRolesCDITest.java
@@ -86,7 +86,7 @@ public static WebArchive createDeployment() {
return ShrinkWrap.create(WebArchive.class, "DynamicRolesCDITest.war")
.addPackage(DynamicRolesCDITest.class.getPackage())
.addPackage(AuthoritiesConstants.class.getPackage())
- .addAsWebInfResource(new File(WEBAPP_SOURCE, "WEB-INF/glassfish-web.xml"))
+ .addAsWebInfResource(new File(WEBAPP_SOURCE, "WEB-INF/payara-web.xml"))
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"));
}
diff --git a/appserver/tests/payara-samples/samples/dynamic-roles/src/test/java/fish/payara/samples/dynamic/roles/ejb/DynamicRolesEJBTest.java b/appserver/tests/payara-samples/samples/dynamic-roles/src/test/java/fish/payara/samples/dynamic/roles/ejb/DynamicRolesEJBTest.java
index 313aa8abebb..53d53ad72f0 100644
--- a/appserver/tests/payara-samples/samples/dynamic-roles/src/test/java/fish/payara/samples/dynamic/roles/ejb/DynamicRolesEJBTest.java
+++ b/appserver/tests/payara-samples/samples/dynamic-roles/src/test/java/fish/payara/samples/dynamic/roles/ejb/DynamicRolesEJBTest.java
@@ -87,7 +87,7 @@ public static WebArchive createDeployment() {
return ShrinkWrap.create(WebArchive.class, "DynamicRolesEJBTest.war")
.addPackage(DynamicRolesEJBTest.class.getPackage())
.addPackage(AuthoritiesConstants.class.getPackage())
- .addAsWebInfResource(new File(WEBAPP_SOURCE, "WEB-INF/glassfish-web.xml"))
+ .addAsWebInfResource(new File(WEBAPP_SOURCE, "WEB-INF/payara-web.xml"))
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"));
}
diff --git a/appserver/tests/payara-samples/samples/dynamic-roles/src/test/java/fish/payara/samples/dynamic/roles/rest/DynamicRolesRESTTest.java b/appserver/tests/payara-samples/samples/dynamic-roles/src/test/java/fish/payara/samples/dynamic/roles/rest/DynamicRolesRESTTest.java
index be2a380f5d4..888f55ddbc9 100644
--- a/appserver/tests/payara-samples/samples/dynamic-roles/src/test/java/fish/payara/samples/dynamic/roles/rest/DynamicRolesRESTTest.java
+++ b/appserver/tests/payara-samples/samples/dynamic-roles/src/test/java/fish/payara/samples/dynamic/roles/rest/DynamicRolesRESTTest.java
@@ -86,7 +86,7 @@ public static WebArchive createDeployment() {
return ShrinkWrap.create(WebArchive.class, "DynamicRolesRESTTest.war")
.addPackage(DynamicRolesRESTTest.class.getPackage())
.addPackage(AuthoritiesConstants.class.getPackage())
- .addAsWebInfResource(new File(WEBAPP_SOURCE, "WEB-INF/glassfish-web.xml"))
+ .addAsWebInfResource(new File(WEBAPP_SOURCE, "WEB-INF/payara-web.xml"))
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"));
}
diff --git a/appserver/tests/payara-samples/samples/openid/src/main/webapp/WEB-INF/glassfish-web.xml b/appserver/tests/payara-samples/samples/openid/src/main/webapp/WEB-INF/payara-web.xml
similarity index 57%
rename from appserver/tests/payara-samples/samples/openid/src/main/webapp/WEB-INF/glassfish-web.xml
rename to appserver/tests/payara-samples/samples/openid/src/main/webapp/WEB-INF/payara-web.xml
index e9d67f70f21..51afc451e97 100644
--- a/appserver/tests/payara-samples/samples/openid/src/main/webapp/WEB-INF/glassfish-web.xml
+++ b/appserver/tests/payara-samples/samples/openid/src/main/webapp/WEB-INF/payara-web.xml
@@ -1,6 +1,6 @@
-
-
+
+
/oauthtest
@@ -8,4 +8,4 @@
Keep a copy of the generated servlet class' java code.
-
+
diff --git a/appserver/tests/payara-samples/samples/rolesPermitted/src/main/webapp/WEB-INF/glassfish-web.xml b/appserver/tests/payara-samples/samples/rolesPermitted/src/main/webapp/WEB-INF/payara-web.xml
similarity index 65%
rename from appserver/tests/payara-samples/samples/rolesPermitted/src/main/webapp/WEB-INF/glassfish-web.xml
rename to appserver/tests/payara-samples/samples/rolesPermitted/src/main/webapp/WEB-INF/payara-web.xml
index f027d56b9de..c7fc7bf946c 100644
--- a/appserver/tests/payara-samples/samples/rolesPermitted/src/main/webapp/WEB-INF/glassfish-web.xml
+++ b/appserver/tests/payara-samples/samples/rolesPermitted/src/main/webapp/WEB-INF/payara-web.xml
@@ -1,6 +1,6 @@
-
-
+
+
payaraAdmin
@@ -14,4 +14,4 @@
+
diff --git a/appserver/tests/payara-samples/samples/rolesPermitted/src/test/java/fish/payara/samples/rolespermitted/RolesPermittedTest.java b/appserver/tests/payara-samples/samples/rolesPermitted/src/test/java/fish/payara/samples/rolespermitted/RolesPermittedTest.java
index 67867ac29e9..a72ba501170 100644
--- a/appserver/tests/payara-samples/samples/rolesPermitted/src/test/java/fish/payara/samples/rolespermitted/RolesPermittedTest.java
+++ b/appserver/tests/payara-samples/samples/rolesPermitted/src/test/java/fish/payara/samples/rolespermitted/RolesPermittedTest.java
@@ -92,7 +92,7 @@ public static WebArchive createDeployment() {
return ShrinkWrap.create(WebArchive.class, "rolesPermitted.war")
.addPackage("fish.payara.samples.rolespermitted")
.addAsWebInfResource(new File(WEBAPP_SOURCE, "WEB-INF/web.xml"))
- .addAsWebInfResource(new File(WEBAPP_SOURCE, "WEB-INF/glassfish-web.xml"));
+ .addAsWebInfResource(new File(WEBAPP_SOURCE, "WEB-INF/payara-web.xml"));
}
@BeforeClass
diff --git a/appserver/tests/quicklook/web/strutsbasic/metadata/sun-web.xml b/appserver/tests/quicklook/bean-validator/integration-test-servlet/metadata/payara-web.xml
similarity index 89%
rename from appserver/tests/quicklook/web/strutsbasic/metadata/sun-web.xml
rename to appserver/tests/quicklook/bean-validator/integration-test-servlet/metadata/payara-web.xml
index 57ea644b51e..e709c2d61c0 100644
--- a/appserver/tests/quicklook/web/strutsbasic/metadata/sun-web.xml
+++ b/appserver/tests/quicklook/bean-validator/integration-test-servlet/metadata/payara-web.xml
@@ -40,14 +40,15 @@
holder.
-->
+
-
+
-
+
+
diff --git a/appserver/tests/quicklook/bean-validator/integration-test-servlet/metadata/sun-web.xml b/appserver/tests/quicklook/bean-validator/simple-bv-servlet/metadata/payara-web.xml
similarity index 89%
rename from appserver/tests/quicklook/bean-validator/integration-test-servlet/metadata/sun-web.xml
rename to appserver/tests/quicklook/bean-validator/simple-bv-servlet/metadata/payara-web.xml
index 57ea644b51e..e709c2d61c0 100644
--- a/appserver/tests/quicklook/bean-validator/integration-test-servlet/metadata/sun-web.xml
+++ b/appserver/tests/quicklook/bean-validator/simple-bv-servlet/metadata/payara-web.xml
@@ -40,14 +40,15 @@
holder.
-->
+
-
+
-
+
+
diff --git a/appserver/tests/quicklook/ejb/cmp/metadata/sun-web.xml b/appserver/tests/quicklook/ejb/cmp/metadata/payara-web.xml
similarity index 88%
rename from appserver/tests/quicklook/ejb/cmp/metadata/sun-web.xml
rename to appserver/tests/quicklook/ejb/cmp/metadata/payara-web.xml
index 49ea48390fb..0e11862c2cc 100644
--- a/appserver/tests/quicklook/ejb/cmp/metadata/sun-web.xml
+++ b/appserver/tests/quicklook/ejb/cmp/metadata/payara-web.xml
@@ -1,5 +1,4 @@
-
+
-
-
+
+
+
ejb/SimpleRoster
SimpleRoster
-
-
+
+
diff --git a/appserver/tests/quicklook/jdbc/jdbcusertx/metadata/sun-web.xml b/appserver/tests/quicklook/jdbc/jdbcusertx/metadata/payara-web.xml
similarity index 89%
rename from appserver/tests/quicklook/jdbc/jdbcusertx/metadata/sun-web.xml
rename to appserver/tests/quicklook/jdbc/jdbcusertx/metadata/payara-web.xml
index 406486a1d69..69b571afd19 100644
--- a/appserver/tests/quicklook/jdbc/jdbcusertx/metadata/sun-web.xml
+++ b/appserver/tests/quicklook/jdbc/jdbcusertx/metadata/payara-web.xml
@@ -40,10 +40,10 @@
holder.
-->
+
-
-
+
+
@@ -51,4 +51,4 @@
jdbc/__default
jdbc/__default
-
+
diff --git a/appserver/tests/quicklook/security/basicauth/metadata/sun-web.xml b/appserver/tests/quicklook/security/basicauth/metadata/payara-web.xml
similarity index 89%
rename from appserver/tests/quicklook/security/basicauth/metadata/sun-web.xml
rename to appserver/tests/quicklook/security/basicauth/metadata/payara-web.xml
index 2bd229fc5b2..9ec73a4cb7e 100644
--- a/appserver/tests/quicklook/security/basicauth/metadata/sun-web.xml
+++ b/appserver/tests/quicklook/security/basicauth/metadata/payara-web.xml
@@ -1,5 +1,4 @@
-
+
-
+
+
TestRoleOne
testgroup5
testuser3
-
+
diff --git a/appserver/tests/quicklook/security/helloworld/metadata/sun-web.xml b/appserver/tests/quicklook/security/helloworld/metadata/payara-web.xml
similarity index 90%
rename from appserver/tests/quicklook/security/helloworld/metadata/sun-web.xml
rename to appserver/tests/quicklook/security/helloworld/metadata/payara-web.xml
index 3d25543aedf..85f1f4dba70 100644
--- a/appserver/tests/quicklook/security/helloworld/metadata/sun-web.xml
+++ b/appserver/tests/quicklook/security/helloworld/metadata/payara-web.xml
@@ -40,10 +40,10 @@
holder.
-->
+
-
-
-
+
+
@@ -53,5 +53,5 @@
+
diff --git a/appserver/tests/quicklook/web/helloworld/metadata/sun-web.xml b/appserver/tests/quicklook/web/helloworld/metadata/payara-web.xml
similarity index 89%
rename from appserver/tests/quicklook/web/helloworld/metadata/sun-web.xml
rename to appserver/tests/quicklook/web/helloworld/metadata/payara-web.xml
index 57ea644b51e..01bbf49a14c 100644
--- a/appserver/tests/quicklook/web/helloworld/metadata/sun-web.xml
+++ b/appserver/tests/quicklook/web/helloworld/metadata/payara-web.xml
@@ -40,14 +40,14 @@
holder.
-->
+
-
-
-
+
+
+
diff --git a/appserver/tests/quicklook/bean-validator/simple-bv-servlet/metadata/sun-web.xml b/appserver/tests/quicklook/web/strutsbasic/metadata/payara-web.xml
similarity index 89%
rename from appserver/tests/quicklook/bean-validator/simple-bv-servlet/metadata/sun-web.xml
rename to appserver/tests/quicklook/web/strutsbasic/metadata/payara-web.xml
index 57ea644b51e..01bbf49a14c 100644
--- a/appserver/tests/quicklook/bean-validator/simple-bv-servlet/metadata/sun-web.xml
+++ b/appserver/tests/quicklook/web/strutsbasic/metadata/payara-web.xml
@@ -40,14 +40,14 @@
holder.
-->
+
-
-
-
+
+
+
diff --git a/appserver/tests/quicklook/weld/extensions/metadata/sun-web.xml b/appserver/tests/quicklook/weld/extensions/metadata/payara-web.xml
similarity index 89%
rename from appserver/tests/quicklook/weld/extensions/metadata/sun-web.xml
rename to appserver/tests/quicklook/weld/extensions/metadata/payara-web.xml
index 9a8c4cc3203..e8c1684bcaa 100644
--- a/appserver/tests/quicklook/weld/extensions/metadata/sun-web.xml
+++ b/appserver/tests/quicklook/weld/extensions/metadata/payara-web.xml
@@ -1,5 +1,4 @@
-
+
-
+
+
/extensions
@@ -50,4 +51,4 @@
Keep a copy of the generated servlet class' java code.
-
+
diff --git a/appserver/tests/quicklook/weld/numberguess/metadata/payara-web.xml b/appserver/tests/quicklook/weld/numberguess/metadata/payara-web.xml
new file mode 100644
index 00000000000..01bbf49a14c
--- /dev/null
+++ b/appserver/tests/quicklook/weld/numberguess/metadata/payara-web.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/appserver/tests/quicklook/weld/numberguess/metadata/sun-web.xml b/appserver/tests/quicklook/weld/numberguess/metadata/sun-web.xml
deleted file mode 100644
index 57ea644b51e..00000000000
--- a/appserver/tests/quicklook/weld/numberguess/metadata/sun-web.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/appserver/tests/quicklook/weld/osgiweld/metadata/sun-web.xml b/appserver/tests/quicklook/weld/osgiweld/metadata/payara-web.xml
similarity index 89%
rename from appserver/tests/quicklook/weld/osgiweld/metadata/sun-web.xml
rename to appserver/tests/quicklook/weld/osgiweld/metadata/payara-web.xml
index d5018ccb1a4..f02533b0b98 100644
--- a/appserver/tests/quicklook/weld/osgiweld/metadata/sun-web.xml
+++ b/appserver/tests/quicklook/weld/osgiweld/metadata/payara-web.xml
@@ -1,5 +1,4 @@
-
+
-
+
+
/osgiweld
@@ -50,4 +51,4 @@
Keep a copy of the generated servlet class' java code.
-
+
diff --git a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/sniffer/WebSniffer.java b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/sniffer/WebSniffer.java
index 49bc9561db4..88d731b803f 100644
--- a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/sniffer/WebSniffer.java
+++ b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/sniffer/WebSniffer.java
@@ -37,7 +37,7 @@
* only if the new code is made subject to such option by the copyright
* holder.
*/
-// Portions Copyright 2018-2025 Payara Foundation and/or its affiliates
+// Portions Copyright 2018-2026 Payara Foundation and/or its affiliates
package org.glassfish.web.sniffer;
@@ -52,11 +52,8 @@
import org.jvnet.hk2.annotations.Service;
import jakarta.inject.Singleton;
-import java.util.ArrayList;
import java.util.List;
-
-
/**
* Implementation of the Sniffer for the web container.
*
@@ -128,17 +125,7 @@ public boolean isJavaEE() {
return true;
}
- private static final List deploymentConfigurationPaths =
- initDeploymentConfigurationPaths();
-
- private static List initDeploymentConfigurationPaths() {
- final List result = new ArrayList();
- result.add("WEB-INF/web.xml");
- result.add("WEB-INF/sun-web.xml");
- result.add("WEB-INF/glassfish-web.xml");
- result.add("WEB-INF/payara-web.xml");
- return result;
- }
+ private static final List deploymentConfigurationPaths = List.of("WEB-INF/payara-web.xml");
/**
* Returns the web-oriented descriptor paths that might exist in a web
diff --git a/appserver/web/war-util/src/main/java/com/sun/enterprise/glassfish/web/WarHandler.java b/appserver/web/war-util/src/main/java/com/sun/enterprise/glassfish/web/WarHandler.java
index 38170935cf5..90d9684a080 100644
--- a/appserver/web/war-util/src/main/java/com/sun/enterprise/glassfish/web/WarHandler.java
+++ b/appserver/web/war-util/src/main/java/com/sun/enterprise/glassfish/web/WarHandler.java
@@ -37,7 +37,7 @@
* only if the new code is made subject to such option by the copyright
* holder.
*/
-// Portions Copyright 2016-2025 Payara Foundation and/or its affiliates
+// Portions Copyright 2016-2026 Payara Foundation and/or its affiliates
package com.sun.enterprise.glassfish.web;
@@ -51,6 +51,7 @@
import java.io.File;
import java.io.FileFilter;
import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
@@ -78,7 +79,6 @@
import org.glassfish.api.deployment.DeploymentContext;
import org.glassfish.api.deployment.archive.ArchiveDetector;
import org.glassfish.api.deployment.archive.ReadableArchive;
-import org.glassfish.deployment.common.DeploymentProperties;
import org.glassfish.loader.util.ASClassLoaderUtil;
import org.glassfish.web.loader.LogFacade;
import org.glassfish.web.loader.WebappClassLoader;
@@ -105,8 +105,8 @@
@Service(name= WarDetector.ARCHIVE_TYPE)
public class WarHandler extends AbstractArchiveHandler {
- private static final String GLASSFISH_WEB_XML = "WEB-INF/glassfish-web.xml";
private static final String PAYARA_WEB_XML = "WEB-INF/payara-web.xml";
+ @Deprecated
private static final String SUN_WEB_XML = "WEB-INF/sun-web.xml";
private static final String WAR_CONTEXT_XML = "META-INF/context.xml";
private static final String DEFAULT_CONTEXT_XML = "config/context.xml";
@@ -135,9 +135,7 @@ public String getVersionIdentifier(ReadableArchive archive) {
try {
WebXmlParser webXmlParser = getWebXmlParser(archive, Application.createApplication());
versionIdentifierValue = webXmlParser.getVersionIdentifier();
- } catch (XMLStreamException e) {
- logger.log(Level.SEVERE, e.getMessage());
- } catch (IOException e) {
+ } catch (XMLStreamException | IOException e) {
logger.log(Level.SEVERE, e.getMessage());
}
return versionIdentifierValue;
@@ -218,21 +216,8 @@ public WebappClassLoader run() {
protected WebXmlParser getWebXmlParser(ReadableArchive archive, Application application)
throws XMLStreamException, IOException {
-
- WebXmlParser webXmlParser = null;
- File runtimeAltDDFile = archive.getArchiveMetaData(DeploymentProperties.RUNTIME_ALT_DD, File.class);
- if (runtimeAltDDFile != null && "glassfish-web.xml".equals(runtimeAltDDFile.getPath()) && runtimeAltDDFile.isFile()) {
- webXmlParser = new GlassFishWebXmlParser(archive, application);
- } else if (archive.exists(PAYARA_WEB_XML)){
- webXmlParser = new PayaraWebXmlParser(archive, application);
- } else if (archive.exists(GLASSFISH_WEB_XML)) {
- webXmlParser = new GlassFishWebXmlParser(archive, application);
- } else if (archive.exists(SUN_WEB_XML)) {
- webXmlParser = new SunWebXmlParser(archive, application);
- } else { // default
- webXmlParser = new GlassFishWebXmlParser(archive, application);
- }
- return webXmlParser;
+
+ return new PayaraWebXmlParser(archive, application);
}
protected void configureLoaderAttributes(WebappClassLoader cloader,
@@ -508,7 +493,8 @@ String getVersionIdentifier() {
public abstract String getCookieSameSiteValue();
}
-
+
+ @Deprecated
protected class SunWebXmlParser extends WebXmlParser {
//XXX need to compute the default delegate depending on the version of dtd
/*
@@ -638,25 +624,7 @@ protected void read(InputStream input) throws XMLStreamException {
protected void readCookieConfig() throws XMLStreamException {}
}
- protected class GlassFishWebXmlParser extends SunWebXmlParser {
- GlassFishWebXmlParser(ReadableArchive archive, Application application)
- throws XMLStreamException, IOException {
-
- super(archive, application);
- }
-
- @Override
- protected String getXmlFileName() {
- return GLASSFISH_WEB_XML;
- }
-
- @Override
- protected String getRootElementName() {
- return "glassfish-web-app";
- }
- }
-
- protected class PayaraWebXmlParser extends GlassFishWebXmlParser {
+ protected class PayaraWebXmlParser extends SunWebXmlParser {
private String cookieSameSiteValue;
PayaraWebXmlParser(ReadableArchive archive, Application application)
diff --git a/appserver/web/war-util/src/main/resources/com/sun/logging/enterprise/system/container/web/LogStrings.properties b/appserver/web/war-util/src/main/resources/com/sun/logging/enterprise/system/container/web/LogStrings.properties
index e9549afa865..e9bd789d2e2 100644
--- a/appserver/web/war-util/src/main/resources/com/sun/logging/enterprise/system/container/web/LogStrings.properties
+++ b/appserver/web/war-util/src/main/resources/com/sun/logging/enterprise/system/container/web/LogStrings.properties
@@ -37,6 +37,7 @@
# only if the new code is made subject to such option by the copyright
# holder.
#
+# Portions Copyright 2026 Payara Foundation and/or its affiliates
# Log messages used by the javax.enterprise.system.container.web logger
# LogDomains.WEB_LOGGER, subsystem WEB.
@@ -63,14 +64,14 @@ webcontainer.altDDName=WEB0116: Using alternate deployment descriptor [{0}] for
# START S1AS8PE 4817642
webcontainer.sessionIDsReused=WEB0121: Enabled session ID reuse for web module [{0}] deployed on virtual server [{1}]
WEB0121.diag.cause.1=Use caution before enabling this feature, because it puts the burden of creating unpredictable session ids on the client, which may not be trusted
-WEB0121.diag.check.1=Check your sun-web.xml for a property with name reuseSessionID, and set it to false if you do not want to enable this feature
+WEB0121.diag.check.1=Check your payara-web.xml for a property with name reuseSessionID, and set it to false if you do not want to enable this feature
# END S1AS8PE 4817642
webcontainer.exceptionDuringEmbeddedStart=WEB0122: Unable to start web container
webcontainer.exceptionDuringEmbeddedStop=WEB0123: Unable to stop web container
-webcontainer.nullWebProperty=WEB0124: Property element in sun-web.xml has null 'name' or 'value'
-webcontainer.dynamicReloadInterval=WEB0125: class-loader attribute dynamic-reload-interval in sun-web.xml not supported
-webcontainer.invalidServletPoolSize=WEB0126: Failed to parse sun-web.xml singleThreadedServletPoolSize property value ({0}) of web module deployed at {1}, using default ({2})
-WEB0126.diag.cause.1=The value of the singleThreadedServletPoolSize property in the sun-web.xml deployment descriptor cannot be parsed as an Integer
+webcontainer.nullWebProperty=WEB0124: Property element in payara-web.xml has null 'name' or 'value'
+webcontainer.dynamicReloadInterval=WEB0125: class-loader attribute dynamic-reload-interval in payara-web.xml not supported
+webcontainer.invalidServletPoolSize=WEB0126: Failed to parse payara-web.xml singleThreadedServletPoolSize property value ({0}) of web module deployed at {1}, using default ({2})
+WEB0126.diag.cause.1=The value of the singleThreadedServletPoolSize property in the payara-web.xml deployment descriptor cannot be parsed as an Integer
WEB0126.diag.check.1=Make sure to specify an Integer as the value of the singleThreadedServletPoolSize property
webcontainer.moduleNotLoadedToVS=WEB0127: Web module [{0}] is not loaded in virtual server [{1}]
WEB0127.diag.cause.1=The virtual server specified does not exist.
@@ -219,9 +220,9 @@ webcontainer.unableToDelete=WEB0361: Unable to delete {0}
#
# com.sun.enterprise.web.connector.coyote
#
-request.unableToSetEncodingFromSunWebXml=WEB0400: Unable to set request encoding [{0}] determined from sun-web.xml deployment descriptor of web application [{1}]
-WEB0400.diag.cause.1=The sun-web.xml deployment descriptor specifies an invalid request encoding
-WEB0400.diag.check.1=Check the form-hint-field, default-charset, and locale-charset-map configuration in the sun-web.xml deployment descriptor and make sure it specifies a valid request encoding
+request.unableToSetEncodingFromSunWebXml=WEB0400: Unable to set request encoding [{0}] determined from payara-web.xml deployment descriptor of web application [{1}]
+WEB0400.diag.cause.1=The payara-web.xml deployment descriptor specifies an invalid request encoding
+WEB0400.diag.check.1=Check the form-hint-field, default-charset, and locale-charset-map configuration in the payara-web.xml deployment descriptor and make sure it specifies a valid request encoding
request.postTooLarge=WEB0402: POST data too large
#
diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/io/runtime/GFWebRuntimeDDFile.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/io/runtime/GFWebRuntimeDDFile.java
deleted file mode 100644
index 9aa714e244d..00000000000
--- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/io/runtime/GFWebRuntimeDDFile.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2010-2012 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License"). You
- * may not use this file except in compliance with the License. You can
- * obtain a copy of the License at
- * https://github.com/payara/Payara/blob/main/LICENSE.txt
- * See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at legal/OPEN-SOURCE-LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license." If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above. However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-// Portions Copyright [2018] [Payara Foundation and/or its affiliates]
-package org.glassfish.web.deployment.io.runtime;
-
-import static com.sun.enterprise.deployment.io.DescriptorConstants.GF_WEB_JAR_ENTRY;
-import static org.glassfish.web.sniffer.WarType.ARCHIVE_TYPE;
-
-import java.util.List;
-import java.util.Map;
-
-import org.glassfish.deployment.common.Descriptor;
-import org.glassfish.hk2.api.PerLookup;
-import org.glassfish.web.sniffer.WarType;
-import org.glassfish.web.deployment.descriptor.WebBundleDescriptorImpl;
-import org.glassfish.web.deployment.node.runtime.gf.GFWebBundleRuntimeNode;
-import org.jvnet.hk2.annotations.Service;
-
-import com.sun.enterprise.deployment.io.ConfigurationDeploymentDescriptorFile;
-import com.sun.enterprise.deployment.io.ConfigurationDeploymentDescriptorFileFor;
-import com.sun.enterprise.deployment.node.RootXMLNode;
-
-/**
- * This class is responsible for handling the XML configuration information for the Glassfish Web Container
- */
-@ConfigurationDeploymentDescriptorFileFor(ARCHIVE_TYPE)
-@Service
-@PerLookup
-public class GFWebRuntimeDDFile extends ConfigurationDeploymentDescriptorFile {
-
- /**
- * @return the location of the DeploymentDescriptor file for a particular type of J2EE Archive
- */
- @Override
- public String getDeploymentDescriptorPath() {
- return GF_WEB_JAR_ENTRY;
- }
-
- /**
- * @return a RootXMLNode responsible for handling the deployment descriptors associated with this J2EE module
- *
- * @param descriptor the descriptor for which we need the node
- */
- @Override
- public RootXMLNode getRootXMLNode(Descriptor descriptor) {
- if (descriptor instanceof WebBundleDescriptorImpl) {
- return new GFWebBundleRuntimeNode((WebBundleDescriptorImpl) descriptor);
- }
-
- return null;
- }
-
- @Override
- public void registerBundle(Map> registerMap, Map publicIDToDTD, Map>> versionUpgrades) {
- registerMap.put(GFWebBundleRuntimeNode.registerBundle(publicIDToDTD, versionUpgrades), GFWebBundleRuntimeNode.class);
- }
-}
diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/io/runtime/WebRuntimeDDFile.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/io/runtime/WebRuntimeDDFile.java
deleted file mode 100644
index d8e87a2daf5..00000000000
--- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/io/runtime/WebRuntimeDDFile.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License"). You
- * may not use this file except in compliance with the License. You can
- * obtain a copy of the License at
- * https://github.com/payara/Payara/blob/main/LICENSE.txt
- * See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at legal/OPEN-SOURCE-LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license." If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above. However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-// Portions Copyright [2018] [Payara Foundation and/or its affiliates]
-package org.glassfish.web.deployment.io.runtime;
-
-import static com.sun.enterprise.deployment.io.DescriptorConstants.S1AS_WEB_JAR_ENTRY;
-
-import java.util.List;
-import java.util.Map;
-
-import org.glassfish.deployment.common.Descriptor;
-import org.glassfish.hk2.api.PerLookup;
-import org.glassfish.web.sniffer.WarType;
-import org.glassfish.web.deployment.descriptor.WebBundleDescriptorImpl;
-import org.glassfish.web.deployment.node.runtime.gf.WebBundleRuntimeNode;
-import org.jvnet.hk2.annotations.Service;
-
-import com.sun.enterprise.deployment.io.ConfigurationDeploymentDescriptorFile;
-import com.sun.enterprise.deployment.io.ConfigurationDeploymentDescriptorFileFor;
-import com.sun.enterprise.deployment.node.RootXMLNode;
-
-/**
- * This class is responsible for handling the XML configuration information for the SunOne AppServer Web Container
- *
- * @author Jerome Dochez
- */
-@ConfigurationDeploymentDescriptorFileFor(WarType.ARCHIVE_TYPE)
-@Service
-@PerLookup
-public class WebRuntimeDDFile extends ConfigurationDeploymentDescriptorFile {
-
- /**
- * @return the location of the DeploymentDescriptor file for a particular type of EE Archive
- */
- @Override
- public String getDeploymentDescriptorPath() {
- return S1AS_WEB_JAR_ENTRY;
- }
-
- /**
- * @return a RootXMLNode responsible for handling the deployment descriptors associated with this J2EE module
- *
- * @param descriptor the descriptor for which we need the node
- */
- @Override
- public RootXMLNode getRootXMLNode(Descriptor descriptor) {
- if (descriptor instanceof WebBundleDescriptorImpl) {
- return new WebBundleRuntimeNode((WebBundleDescriptorImpl) descriptor);
- }
-
- return null;
- }
-
- @Override
- public void registerBundle(Map> rootNodesMap, Map publicIDToDTDMap, Map>> versionUpgrades) {
- rootNodesMap.put(WebBundleRuntimeNode.registerBundle(publicIDToDTDMap, versionUpgrades), WebBundleRuntimeNode.class);
- }
-}
diff --git a/nucleus/deployment/admin/src/main/manpages/org/glassfish/deployment/admin/deploy.1 b/nucleus/deployment/admin/src/main/manpages/org/glassfish/deployment/admin/deploy.1
index 3ce85ec435d..b2b4268e4af 100644
--- a/nucleus/deployment/admin/src/main/manpages/org/glassfish/deployment/admin/deploy.1
+++ b/nucleus/deployment/admin/src/main/manpages/org/glassfish/deployment/admin/deploy.1
@@ -183,7 +183,7 @@ OPTIONS
module descriptor such as web.xml.
--runtimealtdd
- Deploys the application using a GlassFish Server runtime deployment
+ Deploys the application using a Payara Server runtime deployment
descriptor that resides outside of the application archive. Specify
an absolute path or a relative path to the alternate deployment
descriptor file. The alternate deployment descriptor overrides the
@@ -191,10 +191,11 @@ OPTIONS
example, for an EAR, the --runtimealtdd option overrides
glassfish-application.xml. For a standalone module, the
--runtimealtdd option overrides the top-level module descriptor
- such as glassfish-web.xml. Applies to GlassFish Server deployment
- descriptors only (glassfish-*.xml); the name of the alternate
- deployment descriptor file must begin with glassfish-. Does not
- apply to sun-*.xml deployment descriptors, which are deprecated.
+ such as payara-web.xml. Applies to payara-web.xml and GlassFish Server
+ deployment descriptors only (glassfish-*.xml); the name of the
+ alternate deployment descriptor file must be payara-web.xml or begin
+ with glassfish-. Does not apply to sun-*.xml deployment descriptors,
+ which are deprecated.
--deploymentorder
Specifies the deployment order of the application. This is useful
diff --git a/nucleus/deployment/admin/src/main/manpages/org/glassfish/deployment/admin/deploydir.1 b/nucleus/deployment/admin/src/main/manpages/org/glassfish/deployment/admin/deploydir.1
index 2c4b237a7da..43e063abda6 100644
--- a/nucleus/deployment/admin/src/main/manpages/org/glassfish/deployment/admin/deploydir.1
+++ b/nucleus/deployment/admin/src/main/manpages/org/glassfish/deployment/admin/deploydir.1
@@ -168,7 +168,7 @@ OPTIONS
module descriptor such as web.xml.
--runtimealtdd
- Deploys the application using a GlassFish Server runtime deployment
+ Deploys the application using a Payara Server runtime deployment
descriptor that resides outside of the application archive. Specify
an absolute path or a relative path to the alternate deployment
descriptor file. The alternate deployment descriptor overrides the
@@ -176,10 +176,11 @@ OPTIONS
example, for an EAR, the --runtimealtdd option overrides
glassfish-application.xml. For a standalone module, the
--runtimealtdd option overrides the top-level module descriptor
- such as glassfish-web.xml. Applies to GlassFish Server deployment
- descriptors only (glassfish-*.xml); the name of the alternate
- deployment descriptor file must begin with glassfish-. Does not
- apply to sun-*.xml deployment descriptors, which are deprecated.
+ such as payara-web.xml. Applies to payara-web.xml and GlassFish Server
+ deployment descriptors only (glassfish-*.xml); the name of the
+ alternate deployment descriptor file must be payara-web.xml or begin
+ with glassfish-. Does not apply to sun-*.xml deployment descriptors,
+ which are deprecated.
--deploymentorder
Specifies the deployment order of the application. This is useful
diff --git a/nucleus/deployment/admin/src/main/manpages/org/glassfish/deployment/admin/redeploy.1 b/nucleus/deployment/admin/src/main/manpages/org/glassfish/deployment/admin/redeploy.1
index 0de605ed925..28c3ed831c2 100644
--- a/nucleus/deployment/admin/src/main/manpages/org/glassfish/deployment/admin/redeploy.1
+++ b/nucleus/deployment/admin/src/main/manpages/org/glassfish/deployment/admin/redeploy.1
@@ -165,7 +165,7 @@ OPTIONS
module descriptor such as web.xml.
--runtimealtdd
- Deploys the application using a GlassFish Server runtime deployment
+ Deploys the application using a Payara Server runtime deployment
descriptor that resides outside of the application archive. Specify
an absolute path or a relative path to the alternate deployment
descriptor file. The alternate deployment descriptor overrides the
@@ -173,10 +173,11 @@ OPTIONS
example, for an EAR, the --runtimealtdd option overrides
glassfish-application.xml. For a standalone module, the
--runtimealtdd option overrides the top-level module descriptor
- such as glassfish-web.xml. Applies to GlassFish Server deployment
- descriptors only (glassfish-*.xml); the name of the alternate
- deployment descriptor file must begin with glassfish-. Does not
- apply to sun-*.xml deployment descriptors, which are deprecated.
+ such as payara-web.xml. Applies to payara-web.xml and GlassFish Server
+ deployment descriptors only (glassfish-*.xml); the name of the
+ alternate deployment descriptor file must be payara-web.xml or begin
+ with glassfish-. Does not apply to sun-*.xml deployment descriptors,
+ which are deprecated.
--deploymentorder
Specifies the deployment order of the application. This is useful
diff --git a/nucleus/deployment/common/src/main/java/com/sun/enterprise/deployment/deploy/shared/DeploymentPlanArchive.java b/nucleus/deployment/common/src/main/java/com/sun/enterprise/deployment/deploy/shared/DeploymentPlanArchive.java
index 24829ca9af9..a0f19829211 100644
--- a/nucleus/deployment/common/src/main/java/com/sun/enterprise/deployment/deploy/shared/DeploymentPlanArchive.java
+++ b/nucleus/deployment/common/src/main/java/com/sun/enterprise/deployment/deploy/shared/DeploymentPlanArchive.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 affiliates
package com.sun.enterprise.deployment.deploy.shared;
@@ -185,9 +185,9 @@ public Enumeration entries() {
String prefix = "META-INF/";
ArchiveType warType = locator.getService(ArchiveType.class, "war");
boolean isWar = DeploymentUtils.isArchiveOfType(getParentArchive(), warType, locator);
- if (entryName.contains("sun-web.xml") || entryName.contains("glassfish-web.xml") || entryName.contains("payara-web.xml")) {
+ if (entryName.contains("payara-web.xml")) {
prefix = "WEB-INF/";
- } else if ((entryName.contains("glassfish-resources.xml") || entryName.contains("payara-resources.xml"))&& isWar) {
+ } else if (entryName.contains("payara-resources.xml") && isWar) {
prefix = "WEB-INF/";
} else if (entryName.contains("glassfish-services.xml") && isWar) {
prefix = "WEB-INF/";
diff --git a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/api/ResourceConstants.java b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/api/ResourceConstants.java
index e58ee47512a..20587ebeb53 100644
--- a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/api/ResourceConstants.java
+++ b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/api/ResourceConstants.java
@@ -37,7 +37,7 @@
* only if the new code is made subject to such option by the copyright
* holder.
*/
-// Portions Copyright [2018-2022] Payara Foundation and/or affiliates
+// Portions Copyright [2018-2026] Payara Foundation and/or affiliates
package org.glassfish.resourcebase.resources.api;
@@ -112,11 +112,6 @@ public interface ResourceConstants {
* Represents the payara-resources.xml handling module name / type for standalone application
*/
public static final String PY_RESOURCES_MODULE = "payara-resources";
-
- /**
- * Represents the location where glassfish-resources.xml will be present in an archive
- */
- public static final String GF_RESOURCES_LOCATION ="META-INF/glassfish-resources.xml";
/**
* Represents the location where glassfish-resources.xml will be present in an archive