Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #2191 - JPMS Support. 

Using BaseHome.getPaths() to resolve paths for patches modules.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2018-09-26 13:21:40 +02:00
parent 22cbbdc900
commit 81d02893dc
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
View File

@ -554,7 +554,7 @@ public class StartArgs
} }
} }
void expandJPMS(List<Module> activeModules) void expandJPMS(List<Module> activeModules) throws IOException
{ {
for (Module module : activeModules) for (Module module : activeModules)
{ {
@ -569,19 +569,19 @@ public class StartArgs
} }
else if (line.startsWith(directive = "patch-module:")) else if (line.startsWith(directive = "patch-module:"))
{ {
parseJPMSKeyValue(module, line, directive, File.pathSeparator, jmodPatch); parseJPMSKeyValue(module, line, directive, true, jmodPatch);
} }
else if (line.startsWith(directive = "add-opens:")) else if (line.startsWith(directive = "add-opens:"))
{ {
parseJPMSKeyValue(module, line, directive, ",", jmodOpens); parseJPMSKeyValue(module, line, directive, false, jmodOpens);
} }
else if (line.startsWith(directive = "add-exports:")) else if (line.startsWith(directive = "add-exports:"))
{ {
parseJPMSKeyValue(module, line, directive, ",", jmodExports); parseJPMSKeyValue(module, line, directive, false, jmodExports);
} }
else if (line.startsWith(directive = "add-reads:")) else if (line.startsWith(directive = "add-reads:"))
{ {
parseJPMSKeyValue(module, line, directive, ",", jmodReads); parseJPMSKeyValue(module, line, directive, false, jmodReads);
} }
else else
{ {
@ -593,16 +593,29 @@ public class StartArgs
jmodAdds, jmodPatch, jmodOpens, jmodExports, jmodReads); jmodAdds, jmodPatch, jmodOpens, jmodExports, jmodReads);
} }
private void parseJPMSKeyValue(Module module, String line, String directive, String delimiter, Map<String, Set<String>> output) private void parseJPMSKeyValue(Module module, String line, String directive, boolean valueIsFile, Map<String, Set<String>> output) throws IOException
{ {
String value = line.substring(directive.length()); String valueString = line.substring(directive.length());
int equals = value.indexOf('='); int equals = valueString.indexOf('=');
if (equals <= 0) if (equals <= 0)
throw new IllegalArgumentException("Invalid [jpms] directive " + directive + " in module " + module.getName() + ": " + line); throw new IllegalArgumentException("Invalid [jpms] directive " + directive + " in module " + module.getName() + ": " + line);
String key = value.substring(0, equals).trim(); String delimiter = valueIsFile ? File.pathSeparator : ",";
List<String> values = Arrays.asList(value.substring(equals + 1).split(delimiter)); String key = valueString.substring(0, equals).trim();
values = values.stream().map(String::trim).collect(Collectors.toList()); String[] values = valueString.substring(equals + 1).split(delimiter);
output.computeIfAbsent(key, k -> new LinkedHashSet<>()).addAll(values); Set<String> result = output.computeIfAbsent(key, k -> new LinkedHashSet<>());
for (String value : values)
{
value = value.trim();
if (valueIsFile)
{
List<Path> paths = baseHome.getPaths(value);
paths.stream().map(Path::toAbsolutePath).map(Path::toString).collect(Collectors.toCollection(() -> result));
}
else
{
result.add(value);
}
}
} }
public List<String> getStartModules() public List<String> getStartModules()