--- /dev/null	2019-05-02 13:56:30.000000000 -0400
+++ new/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ModuleManager.java	2019-05-02 13:56:26.849265300 -0400
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.EnumSet;
+import java.util.List;
+
+final class ModuleManager {
+    private final List<String> folders = new ArrayList<String>();
+
+    enum SearchType {UnnamedJar, ModularJar, Jmod, ExplodedModule}
+
+    ModuleManager(String folders) {
+        super();
+        String lfolders = folders.replaceAll("^\"|\"$", "");
+        List<Path> paths = new ArrayList<Path>();
+
+        for (String folder :
+                Arrays.asList(lfolders.split(File.pathSeparator))) {
+            File file = new File(folder);
+            paths.add(file.toPath());
+        }
+
+        initialize(paths);
+    }
+
+    ModuleManager(List<Path> Paths) {
+        super();
+        initialize(Paths);
+    }
+
+    private void initialize(List<Path> Paths) {
+        for (Path path : Paths) {
+            folders.add(path.toString().replaceAll("^\"|\"$", ""));
+        }
+    }
+
+    List<ModFile> getModules() {
+        return getModules(EnumSet.of(SearchType.UnnamedJar,
+                SearchType.ModularJar, SearchType.Jmod,
+                SearchType.ExplodedModule));
+    }
+
+    List<ModFile> getModules(EnumSet<SearchType> Search) {
+        List<ModFile> result = new ArrayList<ModFile>();
+
+        for (String folder : folders) {
+            result.addAll(getAllModulesInDirectory(folder, Search));
+        }
+
+        return result;
+    }
+
+    private static List<ModFile> getAllModulesInDirectory(String folder,
+            EnumSet<SearchType> Search) {
+        List<ModFile> result = new ArrayList<ModFile>();
+        File lfolder = new File(folder);
+        File[] files = { lfolder };
+        if (lfolder.isDirectory()) {
+            files = lfolder.listFiles();
+        }
+
+        if (files != null) {
+            for (File file : files) {
+                ModFile modFile = new ModFile(file);
+
+                switch (modFile.getModType()) {
+                    case Unknown:
+                        break;
+                    case UnnamedJar:
+                        if (Search.contains(SearchType.UnnamedJar)) {
+                            result.add(modFile);
+                        }
+                        break;
+                    case ModularJar:
+                        if (Search.contains(SearchType.ModularJar)) {
+                            result.add(modFile);
+                        }
+                        break;
+                    case Jmod:
+                        if (Search.contains(SearchType.Jmod)) {
+                            result.add(modFile);
+                        }
+                        break;
+                    case ExplodedModule:
+                        if (Search.contains(SearchType.ExplodedModule)) {
+                            result.add(modFile);
+                        }
+                        break;
+                }
+            }
+        }
+        return result;
+    }
+}