--- /dev/null	2018-10-22 10:39:33.000000000 -0400
+++ new/src/jdk.packager/share/classes/jdk/packager/internal/RelativeFileSet.java	2018-10-22 10:39:31.585292400 -0400
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2012, 2018, 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.packager.internal;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+/**
+ * RelativeFileSet
+ *
+ * A class encapsulating a directory and a set of files within it.
+ */
+public class RelativeFileSet {
+
+    private String mode;
+    private String os;
+    private String arch;
+
+    private File basedir;
+    private Set<String> files = new LinkedHashSet<>();
+
+    public RelativeFileSet(RelativeFileSet copy) {
+        mode = copy.mode;
+        os = copy.os;
+        arch = copy.arch;
+        basedir = copy.basedir;
+        files = new LinkedHashSet<>(copy.files);
+    }
+
+    public RelativeFileSet(File base, Collection<File> files) {
+        basedir = base;
+        String baseAbsolute = basedir.getAbsolutePath();
+        for (File f: files) {
+            String absolute = f.getAbsolutePath();
+            if (!absolute.startsWith(baseAbsolute)) {
+                throw new RuntimeException("File " + f.getAbsolutePath() +
+                        " does not belong to " + baseAbsolute);
+            }
+            if (!absolute.equals(baseAbsolute)) {
+                    // possible in jpackager case
+                this.files.add(absolute.substring(baseAbsolute.length()+1));
+            }
+        }
+    }
+
+    public void upshift() {
+        String root = basedir.getName();
+        basedir = basedir.getParentFile();
+        Set<String> newFiles = new LinkedHashSet<>();
+        for (String s : files) {
+            newFiles.add(root + File.separator + s);
+        }
+        files = newFiles;
+    }
+
+    public RelativeFileSet(File base, Set<File> files) {
+        this(base, (Collection<File>) files);
+    }
+
+    public boolean contains(String[] requiredFiles) {
+        boolean result = true;
+
+        for(String fname: requiredFiles) {
+            if (!files.contains(fname)) {
+                Log.debug("  RelativeFileSet does not contain [" + fname + "]");
+                result = false;
+            }
+        }
+
+        return result;
+    }
+
+    public boolean contains(String requiredFile) {
+        if (files.contains(requiredFile)) {
+            return true;
+        } else {
+            Log.debug("RelativeFileSet does not contain [" +requiredFile+ "]");
+            return false;
+        }
+    }
+
+    public File getBaseDirectory() {
+        return basedir;
+    }
+
+    public Set<String> getIncludedFiles() {
+        return files;
+    }
+
+    public void dump() {
+        Log.verbose("\n=========\nBasedir: " + basedir + "\n");
+        for (String fname : files) {
+            Log.verbose("  " + fname);
+        }
+        Log.verbose("\n========");
+    }
+
+    public String getMode() {
+        return mode;
+    }
+
+    public void setMode(String mode) {
+        this.mode = mode;
+    }
+
+    public String getOs() {
+        return os;
+    }
+
+    public void setOs(String os) {
+        this.os = os;
+    }
+
+    public String getArch() {
+        return arch;
+    }
+
+    public void setArch(String arch) {
+        this.arch = arch;
+    }
+
+    @Override
+    public String toString() {
+        return "RelativeFileSet{basedir:" + basedir + ", files:" + files + "}";
+    }
+
+}