merged ee10 to ee11

jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/AsyncContextEvent.java

@@ -20,6 +20,7 @@
 import jakarta.servlet.ServletResponse;
 import jakarta.servlet.http.HttpServletRequest;
 import org.eclipse.jetty.http.HttpURI;
+import org.eclipse.jetty.util.ExceptionUtil;
 import org.eclipse.jetty.util.thread.Scheduler;
 
 public class AsyncContextEvent extends AsyncEvent implements Runnable
@@ -149,9 +150,6 @@ public void run()
 
     public void addThrowable(Throwable e)
     {
-        if (_throwable == null)
-            _throwable = e;
-        else if (e != _throwable)
-            _throwable.addSuppressed(e);
+        _throwable = ExceptionUtil.combine(_throwable, e);
     }
 }

jetty-ee11/jetty-ee11-webapp/src/main/java/org/eclipse/jetty/ee11/webapp/AbstractConfiguration.java

@@ -19,13 +19,15 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.eclipse.jetty.util.ClassMatcher;
+
 public class AbstractConfiguration implements Configuration
 {
     private final boolean _enabledByDefault;
     private final List<String> _after;
     private final List<String> _before;
-    private final ClassMatcher _system;
-    private final ClassMatcher _server;
+    private final ClassMatcher _protected;
+    private final ClassMatcher _hidden;
 
     public static class Builder
     {
@@ -88,7 +90,7 @@ public Builder addDependents(Class<?>... classes)
 
         /**
          * Protect classes from modification by the web application by adding them
-         * to the {@link WebAppConfiguration#getSystemClasses()}
+         * to the {@link WebAppConfiguration#getProtectedClasses()}
          *
          * @param classes classname or package pattern
          */
@@ -100,7 +102,7 @@ public Builder protect(String... classes)
 
         /**
          * Hide classes from the web application by adding them
-         * to the {@link WebAppConfiguration#getServerClasses()}
+         * to the {@link WebAppConfiguration#getHiddenClasses()}
          *
          * @param classes classname or package pattern
          */
@@ -112,7 +114,7 @@ public Builder hide(String... classes)
 
         /**
          * Expose classes to the web application by adding them
-         * as exclusions to the {@link WebAppConfiguration#getServerClasses()}
+         * as exclusions to the {@link WebAppConfiguration#getHiddenClasses()}
          *
          * @param classes classname or package pattern
          */
@@ -129,9 +131,9 @@ public Builder expose(String... classes)
 
         /**
          * Protect classes from modification by the web application by adding them
-         * to the {@link WebAppConfiguration#getSystemClasses()} and
+         * to the {@link WebAppConfiguration#getProtectedClasses()} and
          * expose them to the web application by adding them
-         * as exclusions to the {@link WebAppConfiguration#getServerClasses()}
+         * as exclusions to the {@link WebAppConfiguration#getHiddenClasses()}
          *
          * @param classes classname or package pattern
          */
@@ -154,8 +156,8 @@ protected AbstractConfiguration(Builder builder)
         _enabledByDefault = builder._enabledByDefault;
         _after = List.copyOf(builder._after);
         _before = List.copyOf(builder._before);
-        _system = new ClassMatcher(builder._system).asImmutable();
-        _server = new ClassMatcher(builder._server).asImmutable();
+        _protected = new ClassMatcher(builder._system).asImmutable();
+        _hidden = new ClassMatcher(builder._server).asImmutable();
     }
 
     @Override
@@ -171,15 +173,15 @@ public Collection<String> getDependencies()
     }
 
     @Override
-    public ClassMatcher getSystemClasses()
+    public ClassMatcher getProtectedClasses()
     {
-        return _system;
+        return _protected;
     }
 
     @Override
-    public ClassMatcher getServerClasses()
+    public ClassMatcher getHiddenClasses()
     {
-        return _server;
+        return _hidden;
     }
 
     @Override

jetty-ee11/jetty-ee11-webapp/src/main/java/org/eclipse/jetty/ee11/webapp/Configuration.java

@@ -17,6 +17,7 @@
 import java.util.Collections;
 import java.util.ServiceLoader;
 
+import org.eclipse.jetty.util.ClassMatcher;
 import org.eclipse.jetty.util.TopologicalSort;
 
 /**
@@ -43,8 +44,8 @@
  * (eg {@link JndiConfiguration}, {@link JaasConfiguration}} etc.) can be added or removed without concern
  * for ordering.
  * </p>
- * <p>Also since Jetty-9.4, Configurations are responsible for providing {@link #getServerClasses()} and
- * {@link #getSystemClasses()} to configure the {@link WebAppClassLoader} for each context.
+ * <p>Also since Jetty-9.4, Configurations are responsible for providing {@link #getHiddenClasses()} and
+ * {@link #getProtectedClasses()} to configure the {@link WebAppClassLoader} for each context.
  * </p>
  */
 public interface Configuration
@@ -93,21 +94,21 @@ default Collection<String> getDependents()
     }
 
     /**
-     * Get the system classes associated with this Configuration.
+     * Get the system (protected) classes associated with this Configuration.
      *
      * @return ClassMatcher of system classes.
      */
-    default ClassMatcher getSystemClasses()
+    default ClassMatcher getProtectedClasses()
     {
         return new ClassMatcher();
     }
 
     /**
-     * Get the system classes associated with this Configuration.
+     * Get the server (hidden) classes associated with this Configuration.
      *
      * @return ClassMatcher of server classes.
      */
-    default ClassMatcher getServerClasses()
+    default ClassMatcher getHiddenClasses()
     {
         return new ClassMatcher();
     }

jetty-ee11/jetty-ee11-webapp/src/main/java/org/eclipse/jetty/ee11/webapp/WebAppClassLoader.java

@@ -521,7 +521,6 @@ protected Class<?> loadAsResource(final String name, boolean checkSystemResource
 
         if (webappUrl != null && (!checkSystemResource || !_context.isProtectedResource(name, webappUrl)))
         {
-
             webappClass = this.foundClass(name, webappUrl);
             resolveClass(webappClass);
             if (LOG.isDebugEnabled())