diff options
author | Joakim Erdfelt | 2015-02-24 01:05:19 +0000 |
---|---|---|
committer | Joakim Erdfelt | 2015-02-24 01:05:19 +0000 |
commit | a32c9ed79c78c2e00d91956d1066c5c9cd865815 (patch) | |
tree | fb6416878aecbac42a08492838ec1775032e1b94 /jetty-start | |
parent | 5d6bb9f5d01a62cffa6035065a29b81701e8b49c (diff) | |
parent | 2141cc2dc34160cc76d9919e6c41b26fca19078c (diff) | |
download | org.eclipse.jetty.project-a32c9ed79c78c2e00d91956d1066c5c9cd865815.tar.gz org.eclipse.jetty.project-a32c9ed79c78c2e00d91956d1066c5c9cd865815.tar.xz org.eclipse.jetty.project-a32c9ed79c78c2e00d91956d1066c5c9cd865815.zip |
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
Diffstat (limited to 'jetty-start')
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*"); |