Issue #10164 - MetaInfConfiguration Overhaul

jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/NullMap.java

@@ -0,0 +1,106 @@
+//
+// ========================================================================
+// Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+package org.eclipse.jetty.util;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * A Map Implementation that never has entries.
+ *
+ * @param <K> the key type
+ * @param <V> the value type
+ */
+public class NullMap<K, V> implements Map<K, V>
+{
+    @Override
+    public int size()
+    {
+        // always empty
+        return 0;
+    }
+
+    @Override
+    public boolean isEmpty()
+    {
+        // always empty
+        return true;
+    }
+
+    @Override
+    public boolean containsKey(Object key)
+    {
+        // always false
+        return false;
+    }
+
+    @Override
+    public boolean containsValue(Object value)
+    {
+        // always false
+        return false;
+    }
+
+    @Override
+    public V get(Object key)
+    {
+        // always null
+        return null;
+    }
+
+    @Override
+    public V put(K key, V value)
+    {
+        // no-op
+        return null;
+    }
+
+    @Override
+    public V remove(Object key)
+    {
+        return null;
+    }
+
+    @Override
+    public void putAll(Map<? extends K, ? extends V> m)
+    {
+        // no-op
+    }
+
+    @Override
+    public void clear()
+    {
+        // no-op
+    }
+
+    @Override
+    public Set<K> keySet()
+    {
+        return Collections.emptySet();
+    }
+
+    @Override
+    public Collection<V> values()
+    {
+        return Collections.emptySet();
+    }
+
+    @Override
+    public Set<Entry<K, V>> entrySet()
+    {
+        return Collections.emptySet();
+    }
+}

jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/URIUtil.java

@@ -15,6 +15,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -1841,6 +1842,28 @@ public static URI toURI(String resource)
             : Paths.get(resource).toUri();
     }
 
+    /**
+     * <p>Convert a URI to a URL without checked exceptions</p>
+     *
+     * @param uri the URI to convert from
+     * @return The {@link URL} of the URI
+     * @throws RuntimeException if unable to convert the URI to URL
+     * @see URI#toURL()
+     */
+    public static URL toURL(URI uri)
+    {
+        Objects.requireNonNull(uri);
+
+        try
+        {
+            return uri.toURL();
+        }
+        catch (MalformedURLException e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+
     /**
      * <p>
      * Unwrap a URI to expose its container path reference.

jetty-ee10/jetty-ee10-annotations/src/main/java/org/eclipse/jetty/ee10/annotations/AnnotationConfiguration.java

@@ -692,7 +692,7 @@ protected Resource getJarFor(WebAppContext context, ServletContainerInitializer
     }
 
     /**
-     * Check to see if the ServletContainerIntializer loaded via the ServiceLoader came
+     * Check to see if the ServletContainerInitializer loaded via the ServiceLoader came
      * from a jar that is excluded by the fragment ordering. See ServletSpec 3.0 p.85.
      *
      * @param context the context for the jars
@@ -754,7 +754,7 @@ public boolean isFromExcludedJar(WebAppContext context, ServletContainerInitiali
         boolean included = false;
         for (Resource r : orderedJars)
         {
-            included = r.equals(sciResource);
+            included = r.isContainedIn(sciResource);
             if (included)
                 break;
         }
@@ -968,7 +968,7 @@ else if (entry.getValue() == null) //can't work out provenance of SCI, so can't
                 {
                     for (Map.Entry<ServletContainerInitializer, Resource> entry : sciResourceMap.entrySet())
                     {
-                        if (webInfJar.equals(entry.getValue()))
+                        if (webInfJar.isContainedIn(entry.getValue()))
                             nonExcludedInitializers.add(entry.getKey());
                     }
                 }

jetty-ee10/jetty-ee10-annotations/src/main/java/org/eclipse/jetty/ee10/annotations/AnnotationParser.java

@@ -550,7 +550,7 @@ public void parse(final Set<? extends Handler> handlers, Resource r) throws Exce
         if (!r.exists())
             return;
 
-        if (FileID.isJavaArchive(r.getPath()))
+        if (FileID.isJavaArchive(r.getPath())) // TODO: this is now always false, as all Resource objects are directories
         {
             parseJar(handlers, r);
             return;

jetty-ee10/jetty-ee10-maven-plugin/src/main/java/org/eclipse/jetty/ee10/maven/plugin/MavenMetaInfConfiguration.java

@@ -44,16 +44,15 @@ public Class<? extends Configuration> replaces()
     }
 
     /**
-     * Get the jars to examine from the files from which we have
+     * Get the webapp paths (jars &amp; dirs) to examine from the files from which we have
      * synthesized the classpath. Note that the classpath is not
      * set at this point, so we cannot get them from the classpath.
      *
      * @param context the web app context
-     * @return the list of jars found
+     * @return the list of webapp resources found
      */
     @Override
-    protected List<Resource> findJars(WebAppContext context)
-        throws Exception
+    protected List<Resource> getWebAppPaths(WebAppContext context) throws Exception
     {
         List<Resource> list = new ArrayList<>();
         MavenWebAppContext jwac = (MavenWebAppContext)context;
@@ -77,7 +76,7 @@ protected List<Resource> findJars(WebAppContext context)
             });
         }
 
-        List<Resource> superList = super.findJars(context);
+        List<Resource> superList = super.getWebAppPaths(context);
         if (superList != null)
             list.addAll(superList);
         return list;
@@ -87,7 +86,7 @@ protected List<Resource> findJars(WebAppContext context)
      * Add in the classes dirs from test/classes and target/classes
      */
     @Override
-    protected List<Resource> findClassDirs(WebAppContext context) throws Exception
+    protected List<Resource> findClassesDirs(WebAppContext context) throws Exception
     {
         List<Resource> list = new ArrayList<>();
 
@@ -113,7 +112,7 @@ protected List<Resource> findClassDirs(WebAppContext context) throws Exception
             });
         }
 
-        List<Resource> classesDirs = super.findClassDirs(context);
+        List<Resource> classesDirs = super.findClassesDirs(context);
         if (classesDirs != null)
             list.addAll(classesDirs);
         return list;

jetty-ee10/jetty-ee10-maven-plugin/src/main/java/org/eclipse/jetty/ee10/maven/plugin/MavenWebInfConfiguration.java

@@ -19,6 +19,7 @@
 import org.eclipse.jetty.ee10.webapp.WebAppClassLoader;
 import org.eclipse.jetty.ee10.webapp.WebAppContext;
 import org.eclipse.jetty.ee10.webapp.WebInfConfiguration;
+import org.eclipse.jetty.util.URIUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -59,7 +60,28 @@ public void configure(WebAppContext context) throws Exception
                 LOG.debug("Setting up classpath ...");
             for (URI uri : jwac.getClassPathUris())
             {
-                loader.addClassPath(uri.toASCIIString());
+                // Not all Resource types supported by Jetty can be supported by WebAppClassLoader
+                String scheme = uri.getScheme();
+                if (scheme == null || scheme.equals("file"))
+                {
+                    // no scheme? or "file" scheme, assume it is just a path.
+                    loader.addClassPath(uri.getPath());
+                    continue;
+                }
+
+                if (scheme.equals("jar"))
+                {
+                    URI container = URIUtil.unwrapContainer(uri);
+                    if (container.getScheme().equals("file"))
+                    {
+                        // Just add a reference to the
+                        loader.addClassPath(container.getPath());
+                        continue;
+                    }
+                }
+
+                // Anything else is a warning
+                LOG.warn("Skipping unsupported URI on ClassPath: {}", uri);
             }
         }