Merge pull request #17 from atdixon/cp-includes-path-exceptions

#18 Include path exceptions at end of cp
openjfx · Jun 18, 2019 · 25a0b89 · 25a0b89
2 parents 0c4e010 + 6e610bd
commit 25a0b89
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -99,6 +99,9 @@ Optionally, the configuration can be modified with:
 - `outputFile` File to redirect the process output
 - `options`: A list of VM options passed to the executable.
 - `commandlineArgs`: Arguments separated by space for the executed program
+- `includePathExceptionsInClasspath`: When resolving the module-path, setting this value to true will include the 
+dependencies that generate path exceptions in the classpath. By default the value is false, and these dependencies 
+won't be included.
 
 For instance, the following configuration adds some VM options and a command line argument:
 

diff --git a/src/main/java/org/openjfx/JavaFXBaseMojo.java b/src/main/java/org/openjfx/JavaFXBaseMojo.java
@@ -145,6 +145,9 @@ abstract class JavaFXBaseMojo extends AbstractMojo {
     @Parameter(property = "javafx.release", defaultValue = "11")
     private String release;
 
+    @Parameter(property = "javafx.includePathExceptionsInClasspath", defaultValue = "false")
+    private boolean includePathExceptionsInClasspath;
+
     List<String> classpathElements;
     List<String> modulepathElements;
     Map<String, JavaModuleDescriptor> pathElements;
@@ -195,13 +198,22 @@ void preparePaths() throws MojoExecutionException, MojoFailureException {
             }
             resolvePathsResult = locationManager.resolvePaths(fileResolvePathsRequest);
 
-            for (Map.Entry<File, Exception> pathException : resolvePathsResult.getPathExceptions().entrySet()) {
-                Throwable cause = pathException.getValue();
-                while (cause.getCause() != null) {
-                    cause = cause.getCause();
+            if (!resolvePathsResult.getPathExceptions().isEmpty()) {
+                // for each path exception, show a warning to plugin user...
+                for (Map.Entry<File, Exception> pathException : resolvePathsResult.getPathExceptions().entrySet()) {
+                    Throwable cause = pathException.getValue();
+                    while (cause.getCause() != null) {
+                        cause = cause.getCause();
+                    }
+                    String fileName = pathException.getKey().getName();
+                    getLog().warn("Can't extract module name from " + fileName + ": " + cause.getMessage());
+                }
+                // ...if includePathExceptionsInClasspath is NOT enabled; provide configuration hint to plugin user
+                if (!includePathExceptionsInClasspath) {
+                    getLog().warn("Some dependencies encountered issues while attempting to be resolved as modules" +
+                        " and will not be included in the classpath; you can change this behavior via the " +
+                        " 'includePathExceptionsInClasspath' configuration parameter.");
                 }
-                String fileName = pathException.getKey().getName();
-                getLog().warn("Can't extract module name from " + fileName + ": " + cause.getMessage());
             }
 
             if (moduleDescriptorPath != null) {
@@ -234,6 +246,11 @@ void preparePaths() throws MojoExecutionException, MojoFailureException {
             resolvePathsResult.getModulepathElements().keySet()
                     .forEach(file -> modulepathElements.add(file.getPath()));
 
+            if (includePathExceptionsInClasspath) {
+                resolvePathsResult.getPathExceptions().keySet()
+                    .forEach(file -> classpathElements.add(file.getPath()));
+            }
+
             if (moduleDescriptorPath == null) {
                 pathElements.forEach((k, v) -> {
                     if (v != null && v.name() != null) {