Merge branch 'jetty-9.2.x'

Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-start/src/main/java/org/eclipse/jetty/start/Module.java

3 files changed, 19 insertions, 2 deletions

diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/BaseBuilder.java b/jetty-start/src/main/java/org/eclipse/jetty/start/BaseBuilder.java
index fbd81bd4e6..440b9f4867 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/BaseBuilder.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/BaseBuilder.java
@@ -107,7 +107,10 @@ public class BaseBuilder
                 Licensing licensing = new Licensing();
                 for (Module module : startArgs.getAllModules().getSelected())
                 {
-                    licensing.addModule(module);
+                    if (!module.hasFiles(baseHome))
+                    {
+                        licensing.addModule(module);
+                    }
                 }
 
                 if (licensing.hasLicenses())
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Licensing.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Licensing.java
index e37f1faf28..eb5149bc81 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/Licensing.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Licensing.java
@@ -40,7 +40,7 @@ public class Licensing
             // skip, no license
             return;
         }
-
+        
         if (licenseMap.containsKey(module.getName()))
         {
             // skip, already being tracked
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Module.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Module.java
index ba7fe2e412..33d9a082e5 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/Module.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Module.java
@@ -208,6 +208,20 @@ public class Module extends Node<Module>
         return !getName().equals(fileRef);
     }
 
+    public boolean hasFiles(BaseHome baseHome)
+    {
+        for (String ref : getFiles())
+        {
+            FileArg farg = new FileArg(this,ref);
+            Path refPath = baseHome.getBasePath(farg.location);
+            if (!Files.exists(refPath))
+            {
+                return false;
+            }
+        }
+        return true;
+    }
+
     public void process(BaseHome basehome) throws FileNotFoundException, IOException
     {
         Pattern section = Pattern.compile("\\s*\\[([^]]*)\\]\\s*");