FISH-10574 Main Sync 18/02/2025

api/payara-bom/pom.xml

@@ -143,6 +143,12 @@
                 <artifactId>jakarta.data-api</artifactId>
                 <version>${jakarta.data-api.version}</version>
             </dependency>
+            <!-- Jakarta MVC, which isn't a part of the Jakarta Platform BOM -->
+            <dependency>
+                <groupId>jakarta.mvc</groupId>
+                <artifactId>jakarta.mvc-api</artifactId>
+                <version>${jakarta.mvc.version}</version>
+            </dependency>
 
             <!-- Microprofile API release aggregate. Can also be used as a BOM -->
             <dependency>
@@ -481,6 +487,17 @@
                 <version>${angus-activation.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.eclipse.krazo</groupId>
+                <artifactId>krazo-core</artifactId>
+                <version>${krazo.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.krazo</groupId>
+                <artifactId>krazo-jersey</artifactId>
+                <version>${krazo.version}</version>
+            </dependency>
+
             <!-- Other libraries -->
             <dependency>
                 <groupId>org.yaml</groupId>

appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/ContextSetupProviderImpl.java

@@ -374,9 +374,7 @@ public void reset(ContextHandle contextHandle) {
             restorer.endContext();
         }
 
-        if (handle.getContextClassLoader() != null) {
-            Utility.setContextClassLoader(handle.getContextClassLoader());
-        }
+        Utility.setContextClassLoader(handle.getContextClassLoader());
         if (handle.getSecurityContext() != null) {
             SecurityContext.setCurrent(handle.getSecurityContext());
         }

appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/ConnectorClassLoaderServiceImpl.java

@@ -37,22 +37,27 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
+// Portions Copyright [2024] [Payara Foundation and/or its affiliates]
 
 package com.sun.appserv.connectors.internal.api;
 
+import jakarta.inject.Provider;
+import org.glassfish.deployment.common.DeploymentUtils;
 import org.glassfish.internal.api.*;
+import org.glassfish.internal.deployment.Deployment;
 import org.jvnet.hk2.annotations.Service;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.UnaryOperator;
 import java.util.logging.Logger;
 import java.util.logging.Level;
 
 import com.sun.logging.LogDomains;
 
 import jakarta.inject.Inject;
-import jakarta.inject.Provider;
 
 /**
  * We support two policies:
@@ -72,13 +77,13 @@ public class ConnectorClassLoaderServiceImpl implements ConnectorClassLoaderServ
      * class loader for all applications. In other words, we make every
      * standalone RARs available to all applications.
      */
-    private volatile DelegatingClassLoader globalConnectorCL;
+    private final AtomicReference<DelegatingClassLoader> globalConnectorCL = new AtomicReference<>();
+    private final AtomicReference<DelegatingClassLoader> globalConnectorWithWarLibCL = new AtomicReference<>();
 
     @Inject
     private AppSpecificConnectorClassLoaderUtil appsSpecificCCLUtil;
-
     @Inject
-    private Provider<ClassLoaderHierarchy> classLoaderHierarchyProvider;
+    private Provider<ConnectorsClassLoaderUtil> connectorsClassLoaderUtil;
 
     private Logger logger = LogDomains.getLogger(ConnectorClassLoaderServiceImpl.class, LogDomains.RSR_LOGGER);
 
@@ -92,34 +97,8 @@ public class ConnectorClassLoaderServiceImpl implements ConnectorClassLoaderServ
     public DelegatingClassLoader getConnectorClassLoader(String appName) {
         DelegatingClassLoader loader = null;
 
-       // We do not have dependency on common-class-loader explicitly
-       // and also cannot initialize globalConnectorCL during postConstruct via ClassLoaderHierarchy
-       // which will result in circular dependency injection between kernel and connector module
-       // Hence initializing globalConnectorCL lazily
-        if (globalConnectorCL == null) {
-            synchronized (ConnectorClassLoaderServiceImpl.class) {
-                if (globalConnectorCL == null) {
-                    //[parent is assumed to be common-class-loader in ConnectorClassLoaderUtil.createRARClassLoader() also]
-                    final ClassLoader parent = getCommonClassLoader();
-                    globalConnectorCL = AccessController.doPrivileged(new PrivilegedAction<DelegatingClassLoader>() {
-                        public DelegatingClassLoader run() {
-                            DelegatingClassLoader dcl = new DelegatingClassLoader(parent);
-                            for (DelegatingClassLoader.ClassFinder cf : appsSpecificCCLUtil.getSystemRARClassLoaders()) {
-                                dcl.addDelegate(cf);
-                            }
-                            return dcl;
-                        }
-                    });
-
-                    for (DelegatingClassLoader.ClassFinder cf : appsSpecificCCLUtil.getSystemRARClassLoaders()) {
-                        globalConnectorCL.addDelegate(cf);
-                    }
-                }
-            }
-        }
         if (hasGlobalAccessForRARs(appName)) {
-            assert (globalConnectorCL != null);
-            loader = globalConnectorCL;
+            loader = getGlobalConnectorClassLoader();
         } else {
             appsSpecificCCLUtil.detectReferredRARs(appName);
             loader = createConnectorClassLoaderForApplication(appName);
@@ -133,14 +112,42 @@ private boolean hasGlobalAccessForRARs(String appName) {
                         (ConnectorConstants.RAR_VISIBILITY_GLOBAL_ACCESS);
     }
 
-    private ClassLoader getCommonClassLoader(){
-        return classLoaderHierarchyProvider.get().getCommonClassLoader();
+    private DelegatingClassLoader getGlobalConnectorClassLoader() {
+        // We do not have dependency on common-class-loader explicitly
+        // and also cannot initialize globalConnectorCL during postConstruct via ClassLoaderHierarchy
+        // which will result in circular dependency injection between kernel and connector module
+        // Hence initializing globalConnectorCL lazily
+        UnaryOperator<DelegatingClassLoader> updateOperator = currentValue -> {
+            if (currentValue == null) {
+                //[parent is assumed to be common-class-loader in ConnectorClassLoaderUtil.createRARClassLoader() also]
+                var newValue = AccessController.doPrivileged(new PrivilegedAction<DelegatingClassLoader>() {
+                    public DelegatingClassLoader run() {
+                        DelegatingClassLoader dcl = new DelegatingClassLoader(connectorsClassLoaderUtil.get().getCommonClassLoader());
+                        for (DelegatingClassLoader.ClassFinder cf : appsSpecificCCLUtil.getSystemRARClassLoaders()) {
+                            dcl.addDelegate(cf);
+                        }
+                        return dcl;
+                    }
+                });
+
+                for (DelegatingClassLoader.ClassFinder cf : appsSpecificCCLUtil.getSystemRARClassLoaders()) {
+                    newValue.addDelegate(cf);
+                }
+                return newValue;
+            }
+            return currentValue;
+        };
+        if (DeploymentUtils.useWarLibraries(DeploymentUtils.getCurrentDeploymentContext())) {
+            return globalConnectorWithWarLibCL.updateAndGet(updateOperator);
+        } else {
+            return globalConnectorCL.updateAndGet(updateOperator);
+        }
     }
 
     private DelegatingClassLoader createConnectorClassLoaderForApplication(String appName){
 
         DelegatingClassLoader appSpecificConnectorClassLoader =
-                new DelegatingClassLoader(getCommonClassLoader());
+                new DelegatingClassLoader(connectorsClassLoaderUtil.get().getCommonClassLoader());
 
         //add system ra classloaders
         for(DelegatingClassLoader.ClassFinder cf : appsSpecificCCLUtil.getSystemRARClassLoaders()){
@@ -178,7 +185,7 @@ private void addRarClassLoader(String appName, DelegatingClassLoader appSpecific
     }
 
     private DelegatingClassLoader.ClassFinder getClassFinder(String raName) {
-        List<DelegatingClassLoader.ClassFinder> delegates = globalConnectorCL.getDelegates();
+        List<DelegatingClassLoader.ClassFinder> delegates = getGlobalConnectorClassLoader().getDelegates();
         DelegatingClassLoader.ClassFinder classFinder = null;
         for(DelegatingClassLoader.ClassFinder cf : delegates){
             if(raName.equals(((ConnectorClassFinder)cf).getResourceAdapterName())){
@@ -188,5 +195,4 @@ private DelegatingClassLoader.ClassFinder getClassFinder(String raName) {
         }
         return classFinder;
     }
-
 }

appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/ConnectorsClassLoaderUtil.java

@@ -37,25 +37,33 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
+// Portions Copyright [2024] [Payara Foundation and/or its affiliates]
 
 package com.sun.appserv.connectors.internal.api;
 
+import com.sun.enterprise.loader.CurrentBeforeParentClassLoader;
+import org.glassfish.deployment.common.DeploymentUtils;
+import org.glassfish.deployment.common.InstalledLibrariesResolver;
 import org.glassfish.internal.api.ClassLoaderHierarchy;
 import org.glassfish.internal.api.DelegatingClassLoader;
 import org.glassfish.api.admin.*;
 import org.glassfish.api.event.Events;
 import org.glassfish.api.event.EventListener;
 import org.glassfish.api.event.EventTypes;
+import org.glassfish.internal.api.Globals;
+import org.glassfish.internal.deployment.Deployment;
 import org.jvnet.hk2.annotations.Service;
 
 import jakarta.inject.Singleton;
 
 import java.io.*;
 import java.net.MalformedURLException;
 import java.net.URI;
+import java.net.URL;
 import java.security.AccessController;
 import java.security.PrivilegedExceptionAction;
 import java.security.PrivilegedActionException;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.Collection;
@@ -81,7 +89,8 @@ public class ConnectorsClassLoaderUtil {
     @Inject
     private ClassLoaderHierarchy clh;
 
-    //private static List<ConnectorClassFinder> systemRARClassLoaders;
+    // warLibClassLoader is used to load libraries from the war file
+    private final AtomicReference<CurrentBeforeParentClassLoader> warLibClassLoader = new AtomicReference<>();
 
     private Logger _logger = LogDomains.getLogger(ConnectorRuntime.class, LogDomains.RSR_LOGGER);
 
@@ -209,7 +218,7 @@ public Collection<ConnectorClassFinder> getSystemRARClassLoaders() throws Connec
                     libraries = ConnectorsUtil.getInstalledLibrariesFromManifest(location, env);
                 }
 
-                ConnectorClassFinder ccf = createRARClassLoader(location, null, rarName, libraries);
+                ConnectorClassFinder ccf = createRARClassLoader(location, getCommonClassLoader(), rarName, libraries);
                 classLoaders.add(ccf);
             }
         //    systemRARClassLoaders = classLoaders;
@@ -218,6 +227,29 @@ public Collection<ConnectorClassFinder> getSystemRARClassLoaders() throws Connec
         return classLoaders;
     }
 
+    public ClassLoader getCommonClassLoader() {
+        if (DeploymentUtils.useWarLibraries(DeploymentUtils.getCurrentDeploymentContext())) {
+            return warLibClassLoader.updateAndGet(currentValue -> {
+                if (currentValue == null) {
+                    var newValue = new CurrentBeforeParentClassLoader(InstalledLibrariesResolver.getWarLibraries()
+                            .stream().map(uri -> {
+                                try {
+                                    return uri.toUri().toURL();
+                                } catch (MalformedURLException e) {
+                                    throw new RuntimeException(e);
+                                }
+                            })
+                            .toArray(URL[]::new), clh.getCommonClassLoader());
+                    newValue.enableCurrentBeforeParentUnconditional();
+                    return newValue;
+                }
+                return currentValue;
+            });
+        } else {
+            return clh.getCommonClassLoader();
+        }
+    }
+
 
     public ConnectorClassFinder getSystemRARClassLoader(String rarName) throws ConnectorRuntimeException {
         if (ConnectorsUtil.belongsToSystemRA(rarName)) {

appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ResourceHandler.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-2025] Payara Foundation and/or affiliates
  */
 
 package com.sun.enterprise.deployment.annotation.handlers;
@@ -46,6 +46,8 @@
 import com.sun.enterprise.deployment.util.DOLUtils;
 import com.sun.enterprise.deployment.annotation.context.ResourceContainerContext;
 import com.sun.enterprise.deployment.annotation.context.ResourceContainerContextImpl;
+import java.util.Arrays;
+import java.util.Optional;
 import org.glassfish.apf.AnnotationHandlerFor;
 import org.glassfish.apf.AnnotationInfo;
 import org.glassfish.apf.AnnotationProcessorException;
@@ -241,6 +243,14 @@ protected HandlerProcessingResult processResource(AnnotationInfo ainfo,
                 // set it using the resource type of field/method
                 desc.setInjectResourceType(resourceType.getName());
             }
+
+            //if value is empty we need to verify any other available descriptor that use same field with not empty value
+            if (target != null && target.getFieldName() != null && !ok(desc.getValue())) {
+                String valueFound = searchValueIfAvailable(target.getFieldName(), descriptors);
+                if (!valueFound.isEmpty()) {
+                    desc.setValue(valueFound);
+                }
+            }
 
             // merge description
             if (!ok(desc.getDescription()) && ok(resourceAn.description()))
@@ -291,6 +301,23 @@ protected HandlerProcessingResult processResource(AnnotationInfo ainfo,
         return getDefaultProcessedResult();
     }
 
+    /**
+     * Method to verify any other Environment Properties that contain same field name and return value if not empty
+     *
+     * @param fieldName   field to search
+     * @param descriptors available descriptors for EJB
+     * @return String value
+     */
+    private String searchValueIfAvailable(String fieldName, EnvironmentProperty[] descriptors) {
+        return Arrays.stream(descriptors)
+                .filter(d -> d.getDisplayName().equalsIgnoreCase(fieldName) ||
+                        fieldName.toLowerCase().contains(d.getDisplayName().toLowerCase()))
+                .filter(EnvironmentProperty::hasAValue)
+                .findFirst()
+                .map(EnvironmentProperty::getValue)
+                .orElse("");
+    }
+
     private EnvironmentProperty[] getDescriptors(Class resourceType,
         String logicalName, ResourceContainerContext[] rcContexts, Resource resourceAn) {
 

appserver/deployment/javaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarDeployer.java

@@ -37,6 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
+// Portions Copyright [2024] [Payara Foundation and/or its affiliates]
 
 package org.glassfish.javaee.full.deployment;
 
@@ -101,7 +102,7 @@
 @Service
 @PerLookup
 public class EarDeployer implements Deployer {
-
+    public static final String PER_BDA_METADATA_KEY = "[PerBDA]";
     //    private static final Class GLASSFISH_APPCLIENT_GROUP_FACADE_CLASS =
 //            org.glassfish.appclient.client.AppClientGroupFacade.class;
 // Currently using a string instead of a Class constant to avoid a circular
@@ -457,15 +458,21 @@ public <U extends OpsParams> U getCommandParameters(Class<U> commandParametersTy
         @Override
         public void addTransientAppMetaData(String metaDataKey,
                                             Object metaData) {
-            context.addTransientAppMetaData(metaDataKey,
-                metaData);
+            if (metaDataKey.startsWith(PER_BDA_METADATA_KEY)) {
+                super.addTransientAppMetaData(metaDataKey, metaData);
+            } else {
+                context.addTransientAppMetaData(metaDataKey, metaData);
+            }
         }
 
         @Override
         public <T> T getTransientAppMetaData(String metaDataKey,
                                              Class<T> metadataType) {
-            return context.getTransientAppMetaData(metaDataKey,
-                metadataType);
+            if (metaDataKey.startsWith(PER_BDA_METADATA_KEY)) {
+                return super.getTransientAppMetaData(metaDataKey, metadataType);
+            } else {
+                return context.getTransientAppMetaData(metaDataKey, metadataType);
+            }
         }
 
         @Override

appserver/extras/docker-images/micro/src/main/docker/Dockerfile

@@ -1,7 +1,7 @@
 #
 #    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-#    Copyright (c) 2023 Payara Foundation and/or its affiliates. All rights reserved.
+#    Copyright (c) 2023-2025 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
@@ -52,6 +52,9 @@ ENV PAYARA_DIR=${HOME_DIR} \
     MEM_MAX_RAM_PERCENTAGE="70.0" \
     MEM_XSS="512k"
 
+# Add Tini
+RUN apk add --no-cache tini
+
 RUN true \
     && mkdir -p "${HOME_DIR}" \
     && addgroup --gid 1000 payara \
@@ -69,5 +72,5 @@ WORKDIR ${HOME_DIR}
 COPY --chown=payara:payara maven/bin/* ${SCRIPT_DIR}/
 COPY --chown=payara:payara maven/artifacts/payara-micro.jar .
 
-ENTRYPOINT ["/bin/sh", "entrypoint.sh"]
-CMD ["--deploymentDir","/opt/payara/deployments"]
+ENTRYPOINT ["tini", "--", "/opt/payara/entrypoint.sh"]
+CMD ["--deploymentDir", "/opt/payara/deployments"]