diff --git a/.gitignore b/.gitignore
index cd99249298..9bf866d3bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .DS_Store
 .AppleDouble
+*.iml
 ._*
 *~
 /build/shared/reference.zip
diff --git a/app/build.xml b/app/build.xml
index b6d97218ab..bef3f06b70 100644
--- a/app/build.xml
+++ b/app/build.xml
@@ -13,14 +13,14 @@
     <fail unless="core-built" message="Please build the core library first and make sure it is located at ../core/library/core.jar" />
 
     <mkdir dir="bin" />
-    
+
     <!-- copy languages files -->
     <copy todir="bin">
       <fileset dir="src">
         <include name="processing/app/languages/*.properties" />
       </fileset>
     </copy>
-    
+
     <!-- in some cases, pde.jar was not getting built
 	 https://github.com/processing/processing/issues/1792 -->
     <delete file="pde.jar" />
@@ -30,22 +30,19 @@
 
     <javac source="1.8"
 	   target="1.8"
-	   destdir="bin" 
-	   excludes="**/tools/format/**" 
-	   encoding="UTF-8" 
-	   includeAntRuntime="false" 
-	   classpath="../core/library/core.jar; 
-                      ../core/apple.jar; 
-                      lib/ant.jar; 
-                      lib/ant-launcher.jar; 
+	   destdir="bin"
+	   excludes="**/tools/format/**"
+	   encoding="UTF-8"
+	   includeAntRuntime="false"
+	   classpath="../core/library/core.jar;
+                      ../core/apple.jar;
+                      lib/ant.jar;
+                      lib/ant-launcher.jar;
                       lib/jna.jar;
                       lib/jna-platform.jar"
 	   debug="on"
-	   nowarn="true"
-	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
+	   nowarn="true">
       <src path="src" />
-      <compilerclasspath path="../java/mode/org.eclipse.jdt.core.jar; 
-                               ../java/mode/jdtCompilerAdapter.jar" />
     </javac>
   </target>
 
diff --git a/app/lib/jna-platform.jar b/app/lib/jna-platform.jar
index d0fd2e4f52..4722681821 100644
Binary files a/app/lib/jna-platform.jar and b/app/lib/jna-platform.jar differ
diff --git a/app/lib/jna.jar b/app/lib/jna.jar
index 25243176ea..0b5fabdd8b 100644
Binary files a/app/lib/jna.jar and b/app/lib/jna.jar differ
diff --git a/app/src/processing/app/Platform.java b/app/src/processing/app/Platform.java
index 16a31bf80e..dc3c8c0da1 100644
--- a/app/src/processing/app/Platform.java
+++ b/app/src/processing/app/Platform.java
@@ -339,10 +339,10 @@ static public File getJavaHome() {
       File[] plugins = getContentFile("../PlugIns").listFiles(new FilenameFilter() {
         public boolean accept(File dir, String name) {
           return dir.isDirectory() &&
-            name.endsWith(".jdk") && !name.startsWith(".");
+            name.contains("jdk") && !name.startsWith(".");
         }
       });
-      return new File(plugins[0], "Contents/Home/jre");
+      return new File(plugins[0], "Contents/Home");
     }
     // On all other platforms, it's the 'java' folder adjacent to Processing
     return getContentFile("java");
@@ -412,4 +412,4 @@ static public int unsetenv(String variable) {
   static public int getSystemDPI() {
     return inst.getSystemDPI();
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/processing/app/platform/LinuxPlatform.java b/app/src/processing/app/platform/LinuxPlatform.java
index fe3d7ce859..56c7859ded 100644
--- a/app/src/processing/app/platform/LinuxPlatform.java
+++ b/app/src/processing/app/platform/LinuxPlatform.java
@@ -40,20 +40,6 @@ public class LinuxPlatform extends DefaultPlatform {
   public void initBase(Base base) {
     super.initBase(base);
 
-    String javaVendor = System.getProperty("java.vendor");
-    String javaVM = System.getProperty("java.vm.name");
-    if (javaVendor == null ||
-        (!javaVendor.contains("Sun") && !javaVendor.contains("Oracle")) ||
-        javaVM == null || !javaVM.contains("Java")) {
-      Messages.showWarning("Not fond of this Java VM",
-                           "Processing requires Java 8 from Oracle.\n" +
-                           "Other versions such as OpenJDK, IcedTea,\n" +
-                           "and GCJ are strongly discouraged. Among other things, you're\n" +
-                           "likely to run into problems with sketch window size and\n" +
-                           "placement. For more background, please read the wiki:\n" +
-                           "https://github.com/processing/processing/wiki/Supported-Platforms#linux", null);
-    }
-
     // Set x11 WM_CLASS property which is used as the application
     // name by Gnome3 and other window managers.
     // https://github.com/processing/processing/issues/2534
diff --git a/app/src/processing/app/platform/ThinkDifferent.java b/app/src/processing/app/platform/ThinkDifferent.java
index dc905c62a3..01c9823bc3 100644
--- a/app/src/processing/app/platform/ThinkDifferent.java
+++ b/app/src/processing/app/platform/ThinkDifferent.java
@@ -24,11 +24,15 @@
 
 import java.awt.event.*;
 import java.io.File;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.List;
 
 import javax.swing.*;
 
-import com.apple.eawt.*;
-import com.apple.eawt.AppEvent.*;
+import com.apple.eawt.Application;
 
 import processing.app.*;
 import processing.app.ui.About;
@@ -65,44 +69,40 @@ static protected void init(final Base base) {
     if (adapter == null) {
       adapter = new ThinkDifferent();  //base);
     }
-    
-    application.setAboutHandler(new AboutHandler() {
-      public void handleAbout(AboutEvent ae) {
-        new About(null);
-      }
+
+    setHandler(application, "setAboutHandler", (proxy, method, args) -> {
+      new About(null);
+      return null;
     });
-    
-    application.setPreferencesHandler(new PreferencesHandler() {
-      public void handlePreferences(PreferencesEvent arg0) {
-        base.handlePrefs();
-      }
+
+    setHandler(application, "setPreferencesHandler", (proxy, method, args) -> {
+      base.handlePrefs();
+      return null;
     });
 
-    application.setOpenFileHandler(new OpenFilesHandler() {
-      public void openFiles(OpenFilesEvent event) {
-        for (File file : event.getFiles()) {
-          base.handleOpen(file.getAbsolutePath());
-        }
+    setHandler(application, "setOpenFileHandler", (proxy, method, args) -> {
+      Method m = args[0].getClass().getMethod("getFiles");
+      for (File file : (List<File>) m.invoke(args[0])) {
+        base.handleOpen(file.getAbsolutePath());
       }
+      return null;
     });
-    
-    application.setPrintFileHandler(new PrintFilesHandler() {
-      public void printFiles(PrintFilesEvent event) {
-        // TODO not yet implemented
-      }
+
+    setHandler(application, "setPrintFileHandler", (proxy, method, args) -> {
+      // TODO not yet implemented
+      return null;
     });
-    
-    application.setQuitHandler(new QuitHandler() {
-      public void handleQuitRequestWith(QuitEvent event, QuitResponse response) {
-        if (base.handleQuit()) {
-          response.performQuit();
-        } else {
-          response.cancelQuit();
-        }
+
+    setHandler(application, "setQuitHandler", (proxy, method, args) -> {
+      if (base.handleQuit()) {
+        args[1].getClass().getMethod("performQuit").invoke(args[1]);
+      } else {
+        args[1].getClass().getMethod("cancelQuit").invoke(args[1]);
       }
+      return null;
     });
 
-    // Set the menubar to be used when nothing else is open. 
+    // Set the menubar to be used when nothing else is open.
     JMenuBar defaultMenuBar = new JMenuBar();
     JMenu fileMenu = buildFileMenu(base);
     defaultMenuBar.add(fileMenu);
@@ -117,12 +117,12 @@ public void handleQuitRequestWith(QuitEvent event, QuitResponse response) {
       e.printStackTrace();  // oh well, never mind
     }
 //    } else {
-//      // The douchebags at Oracle didn't feel that a working f*king menubar 
-//      // on OS X was important enough to make it into the 7u40 release. 
+//      // The douchebags at Oracle didn't feel that a working f*king menubar
+//      // on OS X was important enough to make it into the 7u40 release.
 //      //http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=8007267
 //      // It languished in the JDK 8 source and has been backported for 7u60:
 //      //http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=8022667
-//      
+//
 //      JFrame offscreen = new JFrame();
 //      offscreen.setUndecorated(true);
 //      offscreen.setJMenuBar(defaultMenuBar);
@@ -131,12 +131,51 @@ public void handleQuitRequestWith(QuitEvent event, QuitResponse response) {
 //      offscreen.setVisible(true);
 //    }
   }
-  
+
 
 //  public ThinkDifferent(Base base) {
 //    this.base = base;
 //  }
 
+  /**
+   * Sets a handler on an instance of {@link Application}, taking into account JVM version
+   * differences.
+   *
+   * @param app an instance of {@link Application}
+   * @param name the "set handler" method name
+   * @param handler the handler
+   */
+  private static void setHandler(Application app, String name, InvocationHandler handler) {
+    // Determine which version of com.apple.eawt.Application to use and pass it a handler of the
+    // appropriate type
+    Method[] methods = app.getClass().getMethods();
+    for (Method m : methods) {
+      if (!name.equals(m.getName())) {
+        continue;
+      }
+      if (m.getParameterCount() != 1) {
+        continue;
+      }
+      Class paramType = m.getParameterTypes()[0];
+      try {
+        // Allow a null handler
+        Object proxy = null;
+        if (handler != null) {
+          proxy = Proxy.newProxyInstance(
+              paramType.getClassLoader(), new Class<?>[] { paramType }, handler);
+        }
+        m.invoke(app, proxy);
+      } catch (IllegalArgumentException ex) {
+        // TODO: Print error?: method doesn't take an interface, etc.
+      } catch (IllegalAccessException ex) {
+        // TODO: Print error?: Other method invocation problem
+      } catch (InvocationTargetException ex) {
+        ex.getCause().printStackTrace();
+        // TODO: Print ex.getCause() a different way?
+      }
+      break;
+    }
+  }
 
   /**
    * Gimpy file menu to be used on OS X when no sketches are open.
@@ -162,7 +201,7 @@ public void actionPerformed(ActionEvent e) {
     fileMenu.add(item);
 
     item = Toolkit.newJMenuItemShift(Language.text("menu.file.sketchbook"), 'K');
-    item.addActionListener(new ActionListener() {      
+    item.addActionListener(new ActionListener() {
       @Override
       public void actionPerformed(ActionEvent e) {
         base.getNextMode().showSketchbookFrame();
diff --git a/app/src/processing/app/platform/WindowsPlatform.java b/app/src/processing/app/platform/WindowsPlatform.java
index 3c4759a375..fd29eed58b 100644
--- a/app/src/processing/app/platform/WindowsPlatform.java
+++ b/app/src/processing/app/platform/WindowsPlatform.java
@@ -64,10 +64,16 @@ public class WindowsPlatform extends DefaultPlatform {
     "\\" + APP_NAME.toLowerCase() + ".exe \"%1\"";
   static final String REG_DOC = APP_NAME + ".Document";
 
+  // Starting with Java 9, the scaling is done automatically. If DPI is
+  // used to scaling within the application, one ends up with 2x the
+  // expected scale. See JEP 263.
+  private static final int WINDOWS_NATIVE_DPI = 96;
 
   public void initBase(Base base) {
     super.initBase(base);
+
     checkAssociations();
+
     //checkQuickTime();
     checkPath();
 
@@ -627,56 +633,9 @@ public int unsetenv(String variable) {
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 
-  // Need to extend com.sun.jna.platform.win32.User32 to access
-  // Win32 function GetDpiForSystem()
-  interface ExtUser32 extends StdCallLibrary, com.sun.jna.platform.win32.User32 {
-    ExtUser32 INSTANCE = (ExtUser32) Native.loadLibrary("user32", ExtUser32.class, W32APIOptions.DEFAULT_OPTIONS);
-
-    public int GetDpiForSystem();
-
-    public int SetProcessDpiAwareness(int value);
-
-    public final int DPI_AWARENESS_INVALID = -1;
-    public final int DPI_AWARENESS_UNAWARE = 0;
-    public final int DPI_AWARENESS_SYSTEM_AWARE = 1;
-    public final int DPI_AWARENESS_PER_MONITOR_AWARE = 2;
-
-    public Pointer SetThreadDpiAwarenessContext(Pointer dpiContext);
-
-    public final Pointer DPI_AWARENESS_CONTEXT_UNAWARE = new Pointer(-1);
-    public final Pointer DPI_AWARENESS_CONTEXT_SYSTEM_AWARE = new Pointer(-2);
-    public final Pointer DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE = new Pointer(-3);
-  }
-
-
-  static private int detected = detectSystemDPI();
-
-
   public int getSystemDPI() {
-    if (detected == -1) {
-      return super.getSystemDPI();
-    }
-    return detected;
+    // Note that this is supported "natively" within Java - See JEP 263.
+    return WINDOWS_NATIVE_DPI;
   }
 
-
-  public static int detectSystemDPI() {
-    try {
-      ExtUser32.INSTANCE.SetProcessDpiAwareness(ExtUser32.DPI_AWARENESS_SYSTEM_AWARE);
-    } catch (Throwable e) {
-      // Ignore error
-    }
-    try {
-      ExtUser32.INSTANCE.SetThreadDpiAwarenessContext(ExtUser32.DPI_AWARENESS_CONTEXT_SYSTEM_AWARE);
-    } catch (Throwable e) {
-      // Ignore error (call valid only on Windows 10)
-    }
-    try {
-      return ExtUser32.INSTANCE.GetDpiForSystem();
-    } catch (Throwable e) {
-      // DPI detection failed, fall back with default
-      System.out.println("DPI detection failed, fallback to 96 dpi");
-      return -1;
-    }
-  }
 }
diff --git a/app/src/processing/app/syntax/JEditTextArea.java b/app/src/processing/app/syntax/JEditTextArea.java
index b63084c63a..c3e6c617cb 100644
--- a/app/src/processing/app/syntax/JEditTextArea.java
+++ b/app/src/processing/app/syntax/JEditTextArea.java
@@ -76,12 +76,17 @@ public class JEditTextArea extends JComponent
   /** The size of the offset between the leftmost padding and the code */
   public static final int leftHandGutter = 6;
 
+  private final Segment TEST_SEGMENT;
+
   private InputMethodSupport inputMethodSupport;
 
   private TextAreaDefaults defaults;
 
   private Brackets bracketHelper = new Brackets();
 
+  private FontMetrics cachedPartialPixelWidthFont;
+  private float partialPixelWidth;
+
 
   /**
    * Creates a new JEditTextArea with the specified settings.
@@ -90,6 +95,9 @@ public class JEditTextArea extends JComponent
   public JEditTextArea(TextAreaDefaults defaults, InputHandler inputHandler) {
     this.defaults = defaults;
 
+    char[] testSegmentContents = {'w'};
+    TEST_SEGMENT = new Segment(testSegmentContents, 0, 1);
+
     // Enable the necessary events
     enableEvents(AWTEvent.KEY_EVENT_MASK);
 
@@ -113,6 +121,8 @@ public void actionPerformed(ActionEvent e) {
     lineSegment = new Segment();
     bracketLine = bracketPosition = -1;
     blink = true;
+    cachedPartialPixelWidthFont = null;
+    partialPixelWidth = 0;
 
     // Initialize the GUI
     setLayout(new ScrollLayout());
@@ -632,7 +642,7 @@ public int _offsetToX(int line, int offset) {
     // If syntax coloring is disabled, do simple translation
     if (tokenMarker == null) {
       lineSegment.count = offset;
-      return x + Utilities.getTabbedTextWidth(lineSegment, fm, x, painter, 0);
+      return x + getTabbedTextWidth(lineSegment, fm, x, painter, 0);
 
     } else {
       // If syntax coloring is enabled, we have to do this
@@ -664,10 +674,10 @@ public int _offsetToX(int line, int offset) {
         int length = tokens.length;
         if (offset + segmentOffset < lineSegment.offset + length) {
           lineSegment.count = offset - (lineSegment.offset - segmentOffset);
-          return x + Utilities.getTabbedTextWidth(lineSegment, fm, x, painter, 0);
+          return x + getTabbedTextWidth(lineSegment, fm, x, painter, 0);
         } else {
           lineSegment.count = length;
-          x += Utilities.getTabbedTextWidth(lineSegment, fm, x, painter, 0);
+          x += getTabbedTextWidth(lineSegment, fm, x, painter, 0);
           lineSegment.offset += length;
         }
         tokens = tokens.next;
@@ -1310,6 +1320,72 @@ else if ( Character.isWhitespace(ch) )
       return CharacterKinds.Other;
   }
 
+  /**
+   * Get the width in pixels of a segment of text within the IDE.
+   *
+   * <p>
+   * Fractional-font aware implementation of Utilities.getTabbedTextWidth that determines if there
+   * are fractional character widths present in a font in order to return a more accurate pixel
+   * width for an input segment.
+   * </p>
+   *
+   * @param s The segment of text for which a pixel width should be returned.
+   * @param metrics The metrics for the font in which the given segment will be drawn.
+   * @param x The x origin.
+   * @param expander The strategy for converting tabs into characters.
+   * @param startOffset The offset to apply before the text will be drawn.
+   * @return The width of the input segment in pixels with fractional character widths considered.
+   */
+  private int getTabbedTextWidth(Segment s, FontMetrics metrics, float x, TabExpander expander,
+      int startOffset) {
+
+    float additionalOffset = getPartialPixelWidth(metrics, x, expander, startOffset) * s.length();
+
+    return (int) Math.round(
+      Utilities.getTabbedTextWidth(s, metrics, x, expander, startOffset) + additionalOffset
+    );
+  }
+
+  /**
+   * Get any partial widths applied within a font.
+   *
+   * <p>
+   * Get any partial widths applied within a font, caching results for the latest requested font
+   * (as identified via a FontMetrics object). Note that this is calculated for a sample character
+   * and is only valid for extrapolation in a monospaced font (that one might want to use in an
+   * IDE).
+   * </p>
+   *
+   * @param candidateMetrics The FontMetrics for which partial character pixel widths should be
+   *    returned.
+   * @param x The x origin.
+   * @param expander The strategy for converting tabs into characters.
+   * @param startOffset The offset to apply before the text will be drawn.
+   * @return The partial width of a sample character within a font.
+   */
+  private float getPartialPixelWidth(FontMetrics candidateMetrics, float x, TabExpander expander,
+      int startOffset) {
+
+    // See https://github.com/sampottinger/processing/issues/103
+    // Requires reference not object equality check
+    if (candidateMetrics != cachedPartialPixelWidthFont) {
+      float withFractional = Utilities.getTabbedTextWidth​(
+        TEST_SEGMENT,
+        candidateMetrics,
+        x,
+        expander,
+        startOffset
+      );
+
+      int withoutFractional = (int) withFractional;
+
+      partialPixelWidth = withFractional - withoutFractional;
+      cachedPartialPixelWidthFont = candidateMetrics;
+    }
+
+    return partialPixelWidth;
+  }
+
   protected void setNewSelectionWord( int line, int offset )
   {
     if (getLineLength(line) == 0) {
diff --git a/build/build.xml b/build/build.xml
index c7061c2c3d..93f2b05415 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0"?>
 <project name="Processing" default="build">
 
+  <property environment="env"/>
+
+  <taskdef resource="net/sf/antcontrib/antcontrib.properties">
+    <classpath>
+      <pathelement location="library/ant-contrib-0.6.jar"/>
+    </classpath>
+  </taskdef>
+
   <!-- Sets properties for macosx/windows/linux depending on current system -->
   <condition property="platform" value="macosx">
     <os family="mac" />
@@ -27,52 +35,66 @@
   <!-- detetect Raspberry Pi and friends -->
   <condition property="linux-arm32" value="linux-arm32">
     <and>
-      <equals arg1="${platform}" arg2="linux" />
+      <equals arg1="${target-platform}" arg2="linux" />
       <equals arg1="${os.arch}" arg2="arm" />
-      <equals arg1="${sun.arch.data.model}" arg2="32" />
+      <equals arg1="${jdk.data.model}" arg2="32" />
     </and>
   </condition>
   <condition property="linux-arm64" value="linux-arm64">
     <and>
-      <equals arg1="${platform}" arg2="linux" />
+      <equals arg1="${target-platform}" arg2="linux" />
       <equals arg1="${os.arch}" arg2="aarch64" />
-      <equals arg1="${sun.arch.data.model}" arg2="64" />
+      <equals arg1="${jdk.data.model}" arg2="64" />
     </and>
   </condition>
 
   <!-- there is currently no JRE available for ARM -->
   <target name="check-linux-arm32" if="linux-arm32">
-    <property name="jre.download.jdk" value="true" />
-    <property name="jre.downloader" value="linux-arm32-vfp-hflt.tar.gz" />
+    <property name="jdk.download.jdk" value="true" />
+    <property name="jdk.downloader" value="linux-arm32-vfp-hflt.tar.gz" />
     <property name="linux.dist" value="linux/processing-${version}-linux-armv6hf.tgz" />
     <property name="launch4j.variant" value="linux-armv6hf" />
   </target>
   <target name="check-linux-arm64" if="linux-arm64">
-    <property name="jre.download.jdk" value="true" />
-    <property name="jre.downloader" value="linux-arm64-vfp-hflt.tar.gz" />
+    <property name="jdk.download.jdk" value="true" />
+    <property name="jdk.downloader" value="linux-arm64-vfp-hflt.tar.gz" />
     <property name="linux.dist" value="linux/processing-${version}-linux-arm64.tgz" />
   </target>
 
-  <!-- Require Java 8 everywhere. -->
-  <fail message="Unsupported Java version: ${java.version}. To build, make sure that Java 8 (aka Java 1.8) is installed.">
+  <!-- Require Java 11 everywhere. -->
+  <fail message="Unsupported Java version: ${java.version}. To build, make sure that Java 11 is installed.">
     <condition>
       <not>
         <or>
-          <contains string="${java.version}" substring="1.8" />
+          <contains string="${java.version}" substring="11." />
         </or>
       </not>
     </condition>
   </fail>
 
+  <!-- JavaFX got removed from the Oracle's JDK for arm and Java 11 -->
+  <condition property="jfx.available" value="true">
+    <and>
+      <not><equals arg1="${os.arch}" arg2="arm" /></not>
+    </and>
+  </condition>
+
   <!-- could prompt here to download the necessary JRE
        (Windows/Linux) or JDK (on Mac OS X) -->
 
   <property name="examples.dir"
             value="../../processing-docs/content/examples" />
 
-  <property name="jdk.version" value="8" />
-  <property name="jdk.update" value="202" />
-  <property name="jdk.build" value="08" />
+  <property name="jdk.train" value="11" />
+  <property name="jdk.version" value="0" />
+  <property name="jdk.update" value="4" />
+  <property name="jdk.build" value="11" />
+
+  <property name="jfx.train" value="11" />
+  <property name="jfx.version" value="0" />
+  <property name="jfx.update" value="2" />
+  <property name="jfx.build" value="0" />
+
   <!-- See https://gist.github.com/P7h/9741922
        or http://stackoverflow.com/q/10268583 -->
   <property name="jdk.hash" value="1961070e4c9b4e26a04e7f5a083f551e" />
@@ -84,71 +106,89 @@
   -->
 
   <property name="jdk.short" value="${jdk.version}u${jdk.update}" />
-  <property name="jdk.esoteric" value="1.${jdk.version}.0_${jdk.update}" />
+
+  <property name="jdk.prefix" value="jdk" />
+  <property name="jdk.separator" value="-" />
+  <property name="jdk.esoteric" value="${jdk.train}.${jdk.version}.${jdk.update}" />
+
+  <property name="jfx.name" value="${jfx.train}.${jfx.version}.${jfx.update}" />
+
 
   <!-- Figure out the JRE download location for Linux and Windows. -->
   <!--
-  <condition property="jre.file"
-             value="jre-${jdk.short}-${platform}-i586.tar.gz">
-    <equals arg1="${sun.arch.data.model}" arg2="32" />
+  <condition property="jdk.file"
+             value="jdk-${jdk.short}-${target-platform}-i586.tar.gz">
+    <equals arg1="${jdk.data.model}" arg2="32" />
   </condition>
-  <condition property="jre.file"
-             value="jre-${jdk.short}-${platform}-x64.tar.gz">
-    <equals arg1="${sun.arch.data.model}" arg2="64" />
+  <condition property="jdk.file"
+             value="jdk-${jdk.short}-${target-platform}-x64.tar.gz">
+    <equals arg1="${jdk.data.model}" arg2="64" />
   </condition>
   -->
 
   <!-- JDK location for Mac OS X -->
   <!--
   <condition property="jdk.file" value="jdk-${jdk.short}-macosx-x64.dmg">
-    <equals arg1="${platform}" arg2="macosx" />
+    <equals arg1="${target-platform}" arg2="macosx" />
   </condition>
   -->
 
   <!-- These lists haven't been updated since Java 6. The new list:
-       http://www.oracle.com/technetwork/java/javase/jre-8-readme-2095710.html
+       http://www.oracle.com/technetwork/java/javase/jdk-8-readme-2095710.html
        Please help: https://github.com/processing/processing/issues/3288 -->
 
-  <fileset dir="windows/work/java" id="jre-optional-windows">
-    <include name="lib/ext/dnsns.jar" />
+  <fileset dir="macosx/work/Processing.app/Contents" id="jdk-optional-macosx">
+    <include name="Java/core/library/libjfxwebkit.dylib" />
+  </fileset>
+
+  <fileset dir="windows/work" id="jdk-optional-windows">
+    <include name="java/lib/ext/dnsns.jar" />
+
+    <include name="java/bin/dtplugin" />
+    <include name="java/bin/plugin2" />
 
-    <include name="bin/dtplugin" />
-    <include name="bin/plugin2" />
+    <include name="java/bin/kinit.exe" />
+    <include name="java/bin/klist.exe" />
+    <include name="java/bin/ktab.exe" />
 
-    <include name="bin/kinit.exe" />
-    <include name="bin/klist.exe" />
-    <include name="bin/ktab.exe" />
+    <include name="java/bin/keytool" /> <!-- needed for Android -->
+    <include name="java/bin/orbd" />
+    <include name="java/bin/policytool" />
+    <include name="java/bin/rmid" />
+    <include name="java/bin/rmiregistry" />
+    <include name="java/bin/servertool" />
+    <include name="java/bin/tnameserv" />
 
-    <include name="bin/keytool" /> <!-- needed for Android -->
-    <include name="bin/orbd" />
-    <include name="bin/policytool" />
-    <include name="bin/rmid" />
-    <include name="bin/rmiregistry" />
-    <include name="bin/servertool" />
-    <include name="bin/tnameserv" />
+    <include name="java/bin/javaws.exe" />
+    <include name="java/lib/javaws.jar" />
 
-    <include name="bin/javaws.exe" />
-    <include name="lib/javaws.jar" />
+    <include name="java/lib/cmm/PYCC.pf" />
 
-    <include name="lib/cmm/PYCC.pf" />
+    <include name="java/lib/src.zip" />
+
+    <include name="core/library/jfxwebkit.dll" />
   </fileset>
 
-  <fileset dir="linux/work/java" id="jre-optional-linux">
-    <include name="bin/keytool" /> <!-- needed for Android -->
+  <fileset dir="linux/work" id="jdk-optional-linux">
+    <include name="java/bin/keytool" /> <!-- needed for Android -->
+
+    <include name="java/lib/ext/dnsns.jar" />
 
-    <include name="lib/ext/dnsns.jar" />
+    <include name="java/bin/orbd" />
+    <include name="java/bin/policytool" />
+    <include name="java/bin/rmid" />
+    <include name="java/bin/rmiregistry" />
+    <include name="java/bin/servertool" />
+    <include name="java/bin/tnameserv" />
 
-    <include name="bin/orbd" />
-    <include name="bin/policytool" />
-    <include name="bin/rmid" />
-    <include name="bin/rmiregistry" />
-    <include name="bin/servertool" />
-    <include name="bin/tnameserv" />
+    <include name="java/bin/javaws" />
+    <include name="java/lib/javaws.jar" />
 
-    <include name="bin/javaws" />
-    <include name="lib/javaws.jar" />
+    <include name="java/lib/src.zip" />
 
-    <include name="lib/cmm/PYCC.pf" />
+    <include name="core/library/libjfxwebkit.so" />
+
+    <include name="java/lib/cmm/PYCC.pf" />
   </fileset>
 
   <!-- Unused JavaFX files that can be removed from the JRE on Windows
@@ -157,7 +197,7 @@
        However, we're now looking into using JavaFX as the default 2D
        renderer for 3.0. So in 3.0a8, we're no longer removing javafx. -->
 
-  <fileset dir="${platform}/work/java" id="javafx-basics">
+  <fileset dir="${target-platform}/work/java" id="javafx-basics">
     <include name="THIRDPARTYLICENSEREADME-JAVAFX.txt" />
     <include name="lib/javafx.properties" />
     <include name="lib/jfxrt.jar" />
@@ -210,16 +250,108 @@
   <echo message="${java.class.path}" />
   -->
 
-  <!-- Set a property named macosx, linux, or windows.
-       The 'value' chosen is arbitrary. -->
-  <property name="${platform}" value="${platform}" />
-
-  <property environment="env" />
-
-  <property name="jre.tgz.path" value="${platform}/jre-${jdk.short}.tgz" />
+  <!-- Macro to help set the platform ant vars appropriately -->
+  <macrodef name="settarget">
+    <attribute name="platform"/>
+    <attribute name="datamodel"/>
+    <sequential>
+
+      <property name="host-platform" value="${platform}" />
+
+      <!-- Set a property named macosx, linux, or windows.
+           The 'value' chosen is arbitrary. -->
+      <property name="target-platform" value="@{platform}" />
+      <property name="${target-platform}" value="${target-platform}" />
+
+      <property name="jdk.tgz.path" value="${target-platform}/jdk-${jdk.short}.tgz" />
+
+      <property name="jdk.data.model" value="@{datamodel}" />
+
+      <property name="jfx.path.zip" value="${target-platform}/jfx-${jfx.name}.zip" />
+
+      <property name="jfx.path.dist" value="${target-platform}/javafx-sdk-${jfx.name}" />
+
+      <property name="jfx.path.lib" value="${jfx.path.dist}/lib" />
+
+      <condition property="jdk.tgz.path" value="${target-platform}/jdk-${jdk.short}.tgz">
+        <not>
+          <equals arg1="${target-platform}" arg2="windows" />
+        </not>
+      </condition>
+
+      <condition property="jdk.tgz.path" value="${target-platform}/jdk-${jdk.short}.zip">
+        <equals arg1="${target-platform}" arg2="windows" />
+      </condition>
+    </sequential>
+  </macrodef>
+
+  <macrodef name="preparejfx">
+    <sequential>
+      <if>
+        <equals arg1="${jfx.available}" arg2="true" />
+        <then>
+          <!-- Extract JFX -->
+          <echo message="Target jfx: ${jfx.path.zip}"/>
+          <unzip dest="${target-platform}" src="${jfx.path.zip}" overwrite="true"/>
+        </then>
+      </if>
+    </sequential>
+  </macrodef>
+
+  <macrodef name="nativecopy">
+    <attribute name="src"/>
+    <attribute name="dest"/>
+    <sequential>
+
+      <local name="src-abs"/>
+      <local name="dest-abs"/>
+      <local name="src-local"/>
+      <local name="dest-local"/>
+
+      <property name="src-abs" value="${basedir}/@{src}"/>
+      <property name="dest-abs" value="${basedir}/@{dest}"/>
+
+      <if>
+        <equals arg1="${host-platform}" arg2="windows" />
+        <then>
+          <propertyregex property="src-local"
+               input="${src-abs}"
+               regexp="/"
+               replace="\\\\"
+               global="true" />
+          <propertyregex property="dest-local"
+              input="${dest-abs}"
+              regexp="/"
+              replace="\\\\"
+              global="true" />
+
+          <echo message="Native copy of ${src-local} to ${dest-local}" />
+          <exec executable="cmd">
+            <arg line="/C xcopy /s/Y ${src-local} ${dest-local}" />
+          </exec>
+        </then>
+      </if>
+
+      <if>
+        <not><equals arg1="${host-platform}" arg2="windows" /></not>
+        <then>
+          <echo message="Native copy of ${src-abs} to ${dest-abs}" />
+          <exec executable="sh">
+            <arg line="-c 'cp ${src-abs} ${dest-abs}'"/>
+          </exec>
+        </then>
+      </if>
+    </sequential>
+  </macrodef>
+
+  <target name="jdk-check">
+    <echo message="Checking for ${jdk.tgz.path}" />
+    <available file="${jdk.tgz.path}" property="jdk.tgz.downloaded" />
+    <echo message="Result: ${jdk.tgz.downloaded}" />
+  </target>
 
-  <target name="jre-check">
-    <available file="${jre.tgz.path}" property="jre.tgz.downloaded" />
+  <target name="jfx-check">
+    <available file="${jfx.path.zip}" property="jfx.zip.downloaded" />
   </target>
 
   <target name="downloader-setup">
@@ -232,37 +364,47 @@
              classpath="jre/downloader.jar" />
   </target>
 
-  <target name="jre-download" depends="jre-check, downloader-setup"
-          unless="jre.tgz.downloaded">
+  <target name="jdk-download" depends="jdk-check, downloader-setup"
+          unless="jdk.tgz.downloaded">
+
     <!-- we normally download a JRE, except on arm -->
-    <property name="jre.download.jdk" value="false" />
+    <property name="jdk.download.jdk" value="true" />
 
-    <condition property="jre.downloader"
-               value="${platform}-i586.tar.gz">
-        <equals arg1="${sun.arch.data.model}" arg2="32" />
+    <condition property="jdk.downloader"
+               value="${target-platform}-i586.tar.gz">
+        <equals arg1="${jdk.data.model}" arg2="32" />
     </condition>
-    <condition property="jre.downloader"
-               value="${platform}-x64.tar.gz">
-      <equals arg1="${sun.arch.data.model}" arg2="64" />
+    <condition property="jdk.downloader"
+               value="${target-platform}-x64.tar.gz">
+      <equals arg1="${jdk.data.model}" arg2="64" />
     </condition>
 
-    <downloader version="${jdk.version}"
+    <downloader train="${jdk.train}"
+                version="${jdk.version}"
+                openJdk="true"
+                platform="${target-platform}${jdk.data.model}"
                 update="${jdk.update}"
                 build="${jdk.build}"
                 hash="${jdk.hash}"
-                jdk="${jre.download.jdk}"
-                flavor="${jre.downloader}"
-                path="${jre.tgz.path}" />
+                component="JDK"
+                flavor="${jdk.downloader}"
+                path="${jdk.tgz.path}" />
   </target>
 
-  <target name="download-jdk-macosx" depends="downloader-setup">
-    <downloader version="${jdk.version}"
-                update="${jdk.update}"
-                build="${jdk.build}"
-                hash="${jdk.hash}"
-                jdk="true"
-                flavor="macosx-x64.dmg"
-                path="${env.HOME}/Desktop/jdk-${jdk.short}.dmg" />
+  <target name="jfx-download" depends="jfx-check, downloader-setup"
+          unless="jfx.zip.downloaded">
+
+    <downloader train="${jfx.train}"
+                version="${jfx.version}"
+                openJdk="true"
+                platform="${target-platform}${jdk.data.model}"
+                update="${jfx.update}"
+                build="1"
+                hash="${jfx.hash}"
+                component="JFX"
+                flavor="${target-platform}${jdk.data.model}.zip"
+                path="${jfx.path.zip}" />
+
   </target>
 
   <!-- code signing hack, turns on code signing during dist -->
@@ -271,8 +413,7 @@
   </condition>
 
   <!-- Set the version of Java that must be present to build. -->
-  <property name="jdk.path.macosx"
-            value="/Library/Java/JavaVirtualMachines/jdk${jdk.esoteric}.jdk" />
+  <property name="jdk.path.macosx" value="macosx/jdk-${jdk.esoteric}+${jdk.build}" />
 
   <available file="${jdk.path.macosx}" property="macosx_jdk_found" />
 
@@ -307,18 +448,40 @@
   </fileset>
 
   <target name="build" description="Build Processing.">
-    <antcall target="${platform}-build" />
+    <settarget platform="${platform}" datamodel="${sun.arch.data.model}" />
+    <antcall target="${target-platform}-build" />
+  </target>
+
+  <target name="cross-build-macosx" description="Build Processing.">
+    <settarget platform="macosx" datamodel="64" />
+    <antcall target="macosx-build" />
+  </target>
+
+  <target name="cross-build-linux-x64" description="Build Processing.">
+    <settarget platform="linux" datamodel="64" />
+    <antcall target="linux-build" />
+  </target>
+
+  <target name="cross-build-linux-aarch64" description="Build Processing.">
+    <settarget platform="linux" datamodel="Arm" />
+    <antcall target="linux-build" />
+  </target>
+
+  <target name="cross-build-windows" description="Build Processing.">
+    <settarget platform="windows" datamodel="64" />
+    <antcall target="windows-build" />
   </target>
 
   <target name="run" description="Run Processing.">
-    <antcall target="${platform}-run" />
+    <settarget platform="${platform}" datamodel="${sun.arch.data.model}" />
+    <antcall target="${target-platform}-run" />
   </target>
 
   <!-- Run the app in a more "native" manner, i.e. no additional
        console for debugging. Ensures that double-clicking shortcuts
        and other desktop integration features work properly. -->
   <target name="app" description="Run Processing w/o console.">
-    <antcall target="${platform}-run-app" />
+    <antcall target="${target-platform}-run-app" />
   </target>
 
   <target name="dist" depends="revision-check"
@@ -335,7 +498,7 @@
       <arg line="pull" />
     </exec>
 
-    <antcall target="${platform}-dist" />
+    <antcall target="${target-platform}-dist" />
   </target>
 
   <!-- "§$§$&, ant doesn't have a built-in help target :(  -->
@@ -506,27 +669,51 @@
     </delete>
   </target>
 
-  <target name="macosx-check-os" unless="macosx">
-    <echo>
-      =======================================================
-      Processing for Mac OS X can only be built on Mac OS X.
-
-      Bye.
-      =======================================================
-    </echo>
-    <fail message="wrong platform (${os.name})" />
+  <target name="macosx-check-os">
+    <if>
+      <equals arg1="${host-platform}" arg2="windows" />
+      <then>
+        <echo>
+          =======================================================
+          Processing for Mac can only be built on *nix systems.
+
+          Bye.
+          =======================================================
+        </echo>
+
+        <fail message="wrong platform (${os.name})" />
+      </then>
+    </if>
   </target>
 
-  <target name="macosx-build" if="macosx" depends="revision-check, macosx-check-os, subprojects-build" description="Build Mac OS X version">
+  <target name="macosx-build" depends="revision-check, macosx-check-os, subprojects-build, jdk-download, jfx-download" description="Build Mac OS X version">
+    <mkdir dir="macosx/work" />
 
-    <!-- Require that a JDK be installed, but call this on build, so that
-         the download-jdk-macosx target can be called. -->
-    <fail unless="macosx_jdk_found"
-          message="JDK ${jdk.short} required.${line.separator}To build on OS X, you must install Oracle's JDK ${jdk.short} from${line.separator}http://www.oracle.com/technetwork/java/javase/downloads${line.separator}Or... type 'ant download-jdk-macosx' to download it to your Desktop.${line.separator}Note that only ${jdk.short} (not a later or earlier version) will work. ${line.separator}And it must be the JDK, not the JRE. And do not try to defy me again." />
+    <!-- Extract JDK -->
+    <echo message="Target jdk: ${jdk.tgz.path}"/>
+    <exec executable="tar" dir="macosx">
+      <!-- Change directory -->
+      <!--
+      <arg value="-C" />
+      <arg value="linux/work" />
+      <arg value="-xzpf" />
+      -->
+      <arg value="xfz" />
+      <arg value="../${jdk.tgz.path}"/>
+    </exec>
 
-    <mkdir dir="macosx/work" />
+    <condition property="jdk.dir" value="macosx/work/jdk-${jdk.esoteric}+${jdk.build}.jdk">
+      <equals arg1="${jdk.train}" arg2="1" />
+    </condition>
+
+    <!-- Force full JDK when not on train 1 (starts with java 11) -->
+    <condition property="jdk.dir" value="macosx/work/jdk-${jdk.esoteric}+${jdk.build}.jdk/">
+      <not>
+        <equals arg1="${jdk.train}" arg2="1" />
+      </not>
+    </condition>
 
-    <!-- app bundler for OS X and Java 1.7 -->
+    <!-- app bundler for OS X and Java -->
     <taskdef name="bundleapp"
              classname="com.oracle.appbundler.AppBundlerTask"
              classpath="macosx/appbundler.jar" />
@@ -539,20 +726,17 @@
                signature="Pde3"
                icon="macosx/processing.icns"
                copyright="© The Processing Foundation"
-               getInfo="${version}, Copyright © The Processing Foundation"
                shortVersion="${version}"
                version="${revision}"
-               javafx="true"
-               minimumSystem="10.8.5"
                mainClassName="processing.app.BaseSplash">
 
       <!-- The appbundler task needs a couple files (the Info.plist and
-           anything else outside /jre) from the full JDK, even though
+           anything else outside /jdk) from the full JDK, even though
            it's primarily copying over the JRE folder. -->
       <runtime dir="${jdk.path.macosx}/Contents/Home" />
       <!-- Eventually we'll want to load the JRE directly from
            the .tgz on the Oracle site, though it's in a folder called
-           jre1.7.0_40.jre, so we'll need to strip that out. -->
+           jdk1.7.0_40.jdk, so we'll need to strip that out. -->
 
       <!-- Same as runtime.jars, seen above; plus core.jar. -->
       <classpath file="../app/pde.jar" />
@@ -599,7 +783,7 @@
       <option value="-Djna.nosys=true" />
 
       <!-- deal with jokers who install JOGL, ANTLR, etc system-wide -->
-      <option value="-Djava.ext.dirs=$APP_ROOT/Contents/PlugIns/jdk${jdk.esoteric}.jdk/Contents/Home/jre/lib/ext" />
+      <!--<option value="-Djava.ext.dirs=$APP_ROOT/Contents/PlugIns/adoptopenjdk-11.0.1.jdk/Contents/Home/lib/ext" />-->
 
       <option value="-Dapple.laf.useScreenMenuBar=true" />
       <option value="-Dcom.apple.macos.use-file-dialog-packages=true" />
@@ -627,6 +811,8 @@
 -->
     </bundleapp>
 
+    <mkdir dir="macosx/work/Processing.app/Contents/Java/Classes" />
+
     <!-- Temporary fix until new appbundler is included again after solving
          https://github.com/processing/processing/issues/3359
          https://github.com/processing/processing/issues/3360
@@ -636,7 +822,23 @@
          Also, because Ant's copy task does not retain file permissions on
          Unix systems, we need to use <exec executable="cp" ... > instead -->
     <exec executable="cp">
-      <arg line="${jdk.path.macosx}/Contents/Home/bin/keytool macosx/work/Processing.app/Contents/PlugIns/jdk${jdk.esoteric}.jdk/Contents/Home/jre/bin"/>
+      <arg value="-r"/>
+      <arg line="${jdk.path.macosx}/Contents/Home/bin macosx/work/Processing.app/Contents/PlugIns/${jdk.prefix}-${jdk.esoteric}+${jdk.build}/Contents/Home/bin"/>
+    </exec>
+
+    <exec executable="cp">
+      <arg value="-r"/>
+      <arg line="${jdk.path.macosx}/Contents/Home/jmods macosx/work/Processing.app/Contents/PlugIns/${jdk.prefix}-${jdk.esoteric}+${jdk.build}/Contents/Home/jmods"/>
+    </exec>
+
+    <exec executable="cp">
+      <arg value="-r"/>
+      <arg line="${jdk.path.macosx}/Contents/Home/legal macosx/work/Processing.app/Contents/PlugIns/${jdk.prefix}-${jdk.esoteric}+${jdk.build}/Contents/Home/legal"/>
+    </exec>
+
+    <exec executable="cp">
+      <arg value="-r"/>
+      <arg line="${jdk.path.macosx}/Contents/Home/conf macosx/work/Processing.app/Contents/PlugIns/${jdk.prefix}-${jdk.esoteric}+${jdk.build}/Contents/Home/conf"/>
     </exec>
 
     <property name="contents.dir"
@@ -644,10 +846,10 @@
 
     <!-- Replace libjli.dylib symlink with actual file.
          Deals with code signing issues on OS X 10.9.5+ -->
-    <property name="jli.path" value="${contents.dir}/PlugIns/jdk${jdk.esoteric}.jdk/Contents/MacOS/libjli.dylib" />
+    <property name="jli.path" value="${contents.dir}/PlugIns/${jdk.prefix}-${jdk.esoteric}+${jdk.build}/Contents/MacOS/libjli.dylib" />
     <delete file="${jli.path}" />
     <exec executable="cp">
-      <arg line="${jdk.path.macosx}/Contents/Home/jre/lib/jli/libjli.dylib ${jli.path}"/>
+      <arg line="${jdk.path.macosx}/Contents/Home/lib/jli/libjli.dylib ${jli.path}"/>
     </exec>
 
     <copy todir="${contents.dir}/Java" preservelastmodified="true">
@@ -657,6 +859,27 @@
       <fileset file="shared/revisions.txt" />
     </copy>
 
+    <preparejfx />
+
+    <!-- Pull in OpenJFX (separated from mainline Java in JDK 11). -->
+    <if>
+      <equals arg1="${jfx.available}" arg2="true" />
+      <then>
+
+        <copy todir="macosx/work/Processing.app/Contents/Java/core/library" overwrite="true">
+          <fileset dir="${jfx.path.lib}" includes="*.jar"/>
+          <fileset dir="${jfx.path.lib}" includes="*.dylib"/>
+        </copy>
+
+        <mkdir dir="macosx/work/Processing.app/Contents/PlugIns/${jdk.prefix}-${jdk.esoteric}+${jdk.build}/Contents/Home/legal/openjfx" />
+
+        <copy todir="macosx/work/Processing.app/Contents/PlugIns/${jdk.prefix}-${jdk.esoteric}+${jdk.build}/Contents/Home/legal/openjfx" overwrite="true">
+          <fileset dir="${jfx.path.dist}/legal" includes="**"/>
+        </copy>
+
+      </then>
+    </if>
+
     <!-- Use the Processing executable as the stub for exported apps.
          This works b/c everything app-specific is in Info.plist. -->
     <property name="app.stub" value="${contents.dir}/Java/modes/java/application/mac-app-stub" />
@@ -671,6 +894,10 @@
       <param name="target.path" value="${contents.dir}/Java" />
     </antcall>
 
+    <delete failonerror="true">
+      <fileset refid="jdk-optional-macosx" />
+    </delete>
+
     <exec executable="macosx/language_gen.py" />
 
     <property name="launch4j.dir" value="${contents.dir}/Java/modes/java/application/launch4j" />
@@ -690,6 +917,7 @@
       <fileset dir="${launch4j.dir}/bin" includes="ld-*" />
       <fileset dir="${launch4j.dir}/bin" includes="windres-*" />
     </delete>
+
   </target>
 
   <target name="macosx-run" depends="macosx-build"
@@ -723,7 +951,7 @@
       <arg value="--force" />
       <arg value="--sign" />
       <arg value="Developer ID Application" />
-      <arg value="Processing.app/Contents/PlugIns/jdk${jdk.esoteric}.jdk" />
+      <arg value="Processing.app/Contents/PlugIns/jdk-${jdk.esoteric}+${jdk.build}" />
     </exec>
 
     <exec executable="/usr/bin/codesign" dir="macosx/work">
@@ -777,19 +1005,24 @@
     </delete>
   </target>
 
-  <target name="linux-check-os" unless="linux">
-    <echo>
-      =======================================================
-      Processing for Linux can only be built on *nix systems.
-
-      Bye.
-      =======================================================
-    </echo>
-
-    <fail message="wrong platform (${os.name})" />
+  <target name="linux-check-os">
+    <if>
+      <equals arg1="${host-platform}" arg2="windows" />
+      <then>
+        <echo>
+          =======================================================
+          Processing for Linux can only be built on *nix systems.
+
+          Bye.
+          =======================================================
+        </echo>
+
+        <fail message="wrong platform (${os.name})" />
+      </then>
+    </if>
   </target>
 
-  <target name="linux-build" depends="ignore-tools, check-linux-arm32, check-linux-arm64, revision-check, linux-check-os, jre-download, subprojects-build, subprojects-build-linux-arm32, subprojects-build-linux-arm64" description="Build Linux version">
+  <target name="linux-build" depends="ignore-tools, check-linux-arm32, check-linux-arm64, revision-check, linux-check-os, jdk-download, jfx-download, subprojects-build, subprojects-build-linux-arm32, subprojects-build-linux-arm64" description="Build Linux version">
     <mkdir dir="linux/work" />
 
     <copy todir="linux/work" preservelastmodified="true">
@@ -829,6 +1062,25 @@
       <fileset refid="runtime.jars" />
     </copy>
 
+    <preparejfx />
+
+    <!-- Pull in OpenJFX (separated from mainline Java in JDK 11). -->
+    <if>
+      <equals arg1="${jfx.available}" arg2="true" />
+      <then>
+        <copy todir="linux/work/core/library" overwrite="true">
+          <fileset dir="${jfx.path.lib}" includes="*.jar"/>
+          <fileset dir="${jfx.path.lib}" includes="*.so"/>
+        </copy>
+
+        <mkdir dir="linux/work/core/java/legal/openjfx" />
+
+        <copy todir="linux/work/core/java/legal/openjfx" overwrite="true">
+          <fileset dir="${jfx.path.dist}/legal" includes="**"/>
+        </copy>
+      </then>
+    </if>
+
     <copy file="linux/processing" todir="linux/work" />
     <chmod perm="ugo+x" file="linux/work/processing" />
 
@@ -860,7 +1112,7 @@
     Cannot use ant version of tar because it doesn't preserve properties.
     <untar compression="gzip"
            dest="linux/work"
-           src="linux/jre.tgz"
+           src="linux/jdk.tgz"
            overwrite="false"/>
 -->
 
@@ -875,37 +1127,52 @@
       <arg value="-xzpf" />
       -->
       <arg value="xfz" />
-      <arg value="../${jre.tgz.path}"/>
+      <arg value="../${jdk.tgz.path}"/>
     </exec>
 
-    <!-- use the jre subfolder when having downloaded a JDK file -->
-    <condition property="jre.dir" value="jdk${jdk.esoteric}/jre">
+    <!-- use the jdk subfolder when having downloaded a JDK file -->
+    <condition property="jdk.dir" value="jdk${jdk.esoteric}">
       <!-- property might not be set, but it is for arm -->
-      <equals arg1="${jre.download.jdk}" arg2="true" />
+      <and>
+        <equals arg1="${jdk.download.jdk}" arg2="true" />
+        <equals arg1="${jdk.train}" arg2="1" />
+      </and>
+    </condition>
+
+    <!-- use top level JRE otherwise -->
+    <condition property="jdk.dir" value="jdk${jdk.esoteric}">
+      <and>
+        <not>
+          <equals arg1="${jdk.download.jdk}" arg2="true" />
+        </not>
+        <equals arg1="${jdk.train}" arg2="1" />
+      </and>
     </condition>
-    <condition property="jre.dir" value="jre${jdk.esoteric}">
+
+    <!-- Force full JDK when not on train 1 (starts with java 11) -->
+    <condition property="jdk.dir" value="jdk-${jdk.esoteric}+${jdk.build}/">
       <not>
-        <equals arg1="${jre.download.jdk}" arg2="true" />
+        <equals arg1="${jdk.train}" arg2="1" />
       </not>
     </condition>
 
     <exec executable="rsync" dir="linux">
       <arg value="-a" />
       <arg value="--delete" />
-      <arg value="${jre.dir}/" />
+      <arg value="${jdk.dir}" />
       <arg value="work/java/" />
     </exec>
 
-    <delete dir="linux/jre${jdk.esoteric}" failonerror="false" />
+    <delete dir="linux/jdk${jdk.esoteric}" failonerror="false" />
     <delete dir="linux/jdk${jdk.esoteric}" failonerror="false" />
 
     <!-- Remove unused JRE bloat. -->
     <delete failonerror="true">
       <!--
       <fileset refid="javafx-basics" />
-      <fileset refid="javafx-linux-${sun.arch.data.model}" />
+      <fileset refid="javafx-linux-${jdk.data.model}" />
       -->
-      <fileset refid="jre-optional-linux" />
+      <fileset refid="jdk-optional-linux" />
     </delete>
   </target>
 
@@ -926,7 +1193,7 @@
    <!-- rename the work folder temporarily -->
    <move file="linux/work" tofile="linux/processing-${version}" />
 
-   <property name="linux.dist" value="linux/processing-${version}-linux${sun.arch.data.model}.tgz" />
+   <property name="linux.dist" value="linux/processing-${version}-linux${jdk.data.model}.tgz" />
 
    <exec executable="tar">
      <arg value="--directory=linux" />
@@ -985,7 +1252,7 @@
    <condition property="linux.deb" value="linux/processing-${version}-linux-arm64.deb">
      <equals arg1="${linux-arm64}" arg2="linux-arm64" />
    </condition>
-   <property name="linux.deb" value="linux/processing-${version}-linux${sun.arch.data.model}.deb" />
+   <property name="linux.deb" value="linux/processing-${version}-linux${jdk.data.model}.deb" />
 
    <!-- Raspbian seems to borrow armhf for armv6hf, so this works -->
    <condition property="deb.arch" value="armhf">
@@ -995,10 +1262,10 @@
      <equals arg1="${linux-arm64}" arg2="linux-arm64" />
    </condition>
    <condition property="deb.arch" value="i386">
-     <equals arg1="${sun.arch.data.model}" arg2="32" />
+     <equals arg1="${jdk.data.model}" arg2="32" />
    </condition>
    <condition property="deb.arch" value="amd64">
-     <equals arg1="${sun.arch.data.model}" arg2="64" />
+     <equals arg1="${jdk.data.model}" arg2="64" />
    </condition>
 
    <length property="deb.bsize" >
@@ -1064,18 +1331,10 @@
   </target>
 
   <target name="windows-check-os" unless="windows">
-    <echo>
-      =======================================================
-      Processing for Windows can only be built on windows.
-
-      Bye.
-      =======================================================
-    </echo>
-
-    <fail message="wrong platform (${os.name})" />
+    <!-- Left for consistency. Windows can be built on mac, linux, or windows. -->
   </target>
 
-  <target name="windows-build" depends="ignore-tools, revision-check, windows-check-os, jre-download, subprojects-build" description="Build Windows version">
+  <target name="windows-build" depends="ignore-tools, revision-check, windows-check-os, jdk-download, jfx-download, subprojects-build" description="Build Windows version">
     <mkdir dir="windows/work" />
 
     <!-- assemble the pde -->
@@ -1088,10 +1347,10 @@
          https://github.com/processing/processing/issues/3624 -->
 
     <condition property="jna.subfolder" value="win32-x86">
-      <equals arg1="${sun.arch.data.model}" arg2="32" />
+      <equals arg1="${jdk.data.model}" arg2="32" />
     </condition>
     <condition property="jna.subfolder" value="win32-x86-64">
-      <equals arg1="${sun.arch.data.model}" arg2="64" />
+      <equals arg1="${jdk.data.model}" arg2="64" />
     </condition>
 
     <unzip src="../app/lib/jna.jar" dest="windows/work/lib">
@@ -1109,6 +1368,34 @@
       <fileset file="shared/revisions.txt" />
     </copy>
 
+    <preparejfx />
+
+    <!-- Pull in OpenJFX (separated from mainline Java in JDK 11). -->
+    <if>
+      <equals arg1="${jfx.available}" arg2="true" />
+      <then>
+
+        <!-- Use native copy command due to binary file corruption. See
+          https://ant.apache.org/manual/Tasks/copy.html#encoding. Extraneous
+          files removed later. -->
+
+        <nativecopy
+          src="${jfx.path.lib}/*.jar"
+          dest="windows/work/core/library" />
+
+        <nativecopy
+          src="${jfx.path.dist}/bin/*.dll"
+          dest="windows/work/core/library" />
+
+        <mkdir dir="windows/work/java/legal/openjfx" />
+
+        <copy todir="windows/work/java/legal/openjfx" overwrite="true">
+          <fileset dir="${jfx.path.dist}/legal" includes="**"/>
+        </copy>
+
+      </then>
+    </if>
+
     <fixcrlf file="windows/work/revisions.txt" eol="crlf" encoding="UTF-8" />
 
     <antcall target="assemble">
@@ -1123,12 +1410,31 @@
     <move file="${launch4j.dir}/bin/ld-windows.exe"
           tofile="${launch4j.dir}/bin/ld.exe" />
 
-    <!-- remove the others -->
-    <delete failonerror="true">
-      <fileset dir="${launch4j.dir}/bin" includes="ld-*" />
-      <fileset dir="${launch4j.dir}/bin" includes="windres-*" />
-    </delete>
+    <!-- check for cross-build -->
+    <if>
+      <not><equals arg1="${host-platform}" arg2="windows" /></not>
+      <then>
+
+        <move file="${launch4j.dir}/bin/windres-${host-platform}"
+              tofile="${launch4j.dir}/bin/windres" />
+
+        <move file="${launch4j.dir}/bin/ld-${host-platform}"
+              tofile="${launch4j.dir}/bin/ld" />
+
+        <exec executable="chmod">
+          <arg value="+x"/>
+          <arg line="${launch4j.dir}/bin/windres"/>
+        </exec>
 
+        <exec executable="chmod">
+          <arg value="+x"/>
+          <arg line="${launch4j.dir}/bin/ld"/>
+        </exec>
+
+      </then>
+    </if>
+
+    <!-- Execute launch4j task -->
     <taskdef name="launch4j"
              classname="net.sf.launch4j.ant.Launch4jTask"
              classpath="${launch4j.dir}/launch4j.jar; ${launch4j.dir}/lib/xstream.jar" />
@@ -1138,6 +1444,14 @@
     <launch4j configFile="windows/config.xml" />
     <launch4j configFile="windows/config-cmd.xml" />
 
+    <!-- remove the other launch4j executables -->
+    <delete failonerror="true">
+      <fileset dir="${launch4j.dir}/bin" includes="ld-*" />
+      <fileset dir="${launch4j.dir}/bin" includes="windres-*" />
+      <fileset dir="${launch4j.dir}/bin" includes="windres" />
+      <fileset dir="${launch4j.dir}/bin" includes="ld" />
+    </delete>
+
     <!-- cygwin requires html, dll, and exe to have the +x flag -->
     <chmod perm="ugo+x">
       <fileset dir="windows/work" includes="**/*.html, **/*.dll, **/*.exe" />
@@ -1145,22 +1459,32 @@
 
     <!-- starting with 2.0a7, require the local JRE + tools.jar -->
 <!--
-    <get src="http://download.processing.org/java/${jre.file}"
-         dest="windows/jre.tgz"
+    <get src="http://download.processing.org/java/${jdk.file}"
+         dest="windows/jdk.tgz"
          usetimestamp="true" />
 -->
 
     <!--
-    <unzip dest="windows/work" src="windows/jre.zip" overwrite="false"/>
+    <unzip dest="windows/work" src="windows/jdk.zip" overwrite="false"/>
     -->
     <!-- Hopefully this is OK with the permissions (unlike Linux),
          since those shouldn't matter on Windows. -->
-    <untar compression="gzip"
-           dest="windows/work"
-           src="${jre.tgz.path}"
+    <unzip dest="windows/work"
+           src="${jdk.tgz.path}"
            overwrite="false" />
-    <move file="windows/work/jre${jdk.esoteric}"
-          tofile="windows/work/java" />
+
+    <condition property="jdk.dir" value="windows/work/jdk${jdk.esoteric}">
+      <equals arg1="${jdk.train}" arg2="1" />
+    </condition>
+
+    <!-- Force full JDK when not on train 1 (starts with java 11) -->
+    <condition property="jdk.dir" value="windows/work/jdk-${jdk.esoteric}+${jdk.build}/">
+      <not>
+        <equals arg1="${jdk.train}" arg2="1" />
+      </not>
+    </condition>
+
+    <move file="${jdk.dir}" tofile="windows/work/java" />
 
     <!-- Remove unused JRE bloat. -->
     <delete failonerror="true">
@@ -1168,7 +1492,7 @@
       <fileset refid="javafx-basics" />
       <fileset refid="javafx-windows" />
       -->
-      <fileset refid="jre-optional-windows" />
+      <fileset refid="jdk-optional-windows" />
     </delete>
   </target>
 
@@ -1190,7 +1514,7 @@
          excludes="java/**" />
     -->
 
-    <property name="windows.dist" value="windows/processing-${version}-windows${sun.arch.data.model}.zip" />
+    <property name="windows.dist" value="windows/processing-${version}-windows${jdk.data.model}.zip" />
 
     <zip destfile="${windows.dist}">
       <zipfileset dir="windows/work"
diff --git a/build/jre/build.xml b/build/jre/build.xml
index db3c84e6e7..69c8109e85 100644
--- a/build/jre/build.xml
+++ b/build/jre/build.xml
@@ -1,49 +1,71 @@
 <project name="downloader" default="dist">
 
-  <target name="compile">
-    <mkdir dir="bin" />
-
-    <!-- Where can I expect to find Java Mode JARs? -->
-    <property name="java.mode" value="../../java/mode/" />
-    
-    <!-- Check for JDT compiler, since this is likely a PDE build. Using
-	 it allows us to build the PDE with only a JRE on Windows and Linux.
-	 So that the core can be built independently of the PDE, 
-	 use javac (the "modern" compiler) if ecj is not present. -->
-    <property name="jdt.jar" value="${java.mode}/org.eclipse.jdt.core.jar" />
-    <condition property="build.compiler" 
-	       value="org.eclipse.jdt.core.JDTCompilerAdapter"
-	       else="modern">
-      <available file="${jdt.jar}" />
-    </condition>
-    <!--<echo message="compiler is ${build.compiler}" />-->
-
-    <javac source="1.8"
-           target="1.8" 
-	   srcdir="src" 
-           destdir="bin" 
-	   debug="true" 
-	   includeantruntime="true"
-	   nowarn="true">
-      <!-- kinda gross, but if not using the JDT, this just ignored anyway -->
-      <compilerclasspath path="${jdt.jar}; ${java.mode}/jdtCompilerAdapter.jar" />
-    </javac>
+  <path id="classpath.base">
+    <!-- kinda gross, but if not using the JDT, this just ignored anyway -->
+    <pathelement location="${jdt.jar};" />
+    <pathelement location="${java.mode}/jdtCompilerAdapter.jar" />
+  </path>
+
+  <path id="classpath.test">
+    <pathelement location="../../core/library-test/junit-4.8.1.jar" />
+    <pathelement location = "bin-test" />
+    <path refid="classpath.base" />
+  </path>
+
+  <macrodef name="compilecommon">
+    <attribute name="destdir"/>
+    <attribute name="srcdir"/>
+    <attribute name="classpath"/>
+    <sequential>
+      <mkdir dir="@{destdir}" />
+
+      <!-- Where can I expect to find Java Mode JARs? -->
+      <property name="java.mode" value="../../java/mode/" />
+
+      <javac source="1.8"
+          target="1.8"
+          srcdir="@{srcdir}"
+          destdir="@{destdir}"
+          debug="true"
+          includeantruntime="true"
+          nowarn="true">
+        <classpath refid="@{classpath}"/>
+      </javac>
+    </sequential>
+  </macrodef>
+
+  <target name="test-compile">
+    <compilecommon srcdir="src; test" destdir="bin-test" classpath="classpath.test" />
+  </target>
+
+  <target name="test" depends="test-compile">
+    <junit haltonfailure="true">
+      <classpath refid="classpath.test" />
+      <formatter type="brief" usefile="false" />
+      <test name="AdoptOpenJdkDownloadUrlGeneratorTest" />
+      <test name="OracleDownloadUrlGeneratorTest" />
+    </junit>
+  </target>
+
+  <target name="compile" depends="test">
+    <compilecommon srcdir="src" destdir="bin" classpath="classpath.base" />
   </target>
-  
+
   <target name="dist" depends="compile">
     <jar basedir="bin" destfile="downloader.jar" />
   </target>
-  
+
   <target name="demo" depends="dist">
-    <taskdef name="downloader" 
+    <taskdef name="downloader"
 	     classname="Downloader"
 	     classpath="downloader.jar" />
-    <downloader version="8" update="31" build="13" 
+    <downloader version="8" update="31" build="13"
                 jdk="true" flavor="macosx-x64.dmg" />
   </target>
-  
+
   <target name="clean">
     <delete dir="bin" />
+    <delete dir="bin-test" />
     <delete file="downloader.jar" />
   </target>
 
diff --git a/build/jre/src/AdoptOpenJdkDownloadUrlGenerator.java b/build/jre/src/AdoptOpenJdkDownloadUrlGenerator.java
new file mode 100644
index 0000000000..7ede8c52b5
--- /dev/null
+++ b/build/jre/src/AdoptOpenJdkDownloadUrlGenerator.java
@@ -0,0 +1,85 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+  Part of the Processing project - http://processing.org
+
+  Copyright (c) 2019 The Processing Foundation
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  version 2, as published by the Free Software Foundation.
+
+  This program 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 for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+/**
+ * Utility to generate download URLs from AdoptOpenJDK.
+ */
+public class AdoptOpenJdkDownloadUrlGenerator extends DownloadUrlGenerator {
+
+  private static final String BASE_URL = "https://github.com/AdoptOpenJDK/openjdk%d-binaries/releases/download/jdk-%d.%d.%d%%2B%d/OpenJDK%dU-%s_%d.%d.%d_%d.%s";
+
+  @Override
+  public String buildUrl(String platform, String component, int train, int version, int update,
+      int build, String flavor, String hash) {
+
+    if (!component.equalsIgnoreCase("jdk")) {
+      throw new RuntimeException("Can only generate JDK download URLs for AdoptOpenJDK.");
+    }
+
+    String filename = buildDownloadRemoteFilename(platform);
+    String fileExtension = buildFileExtension(platform);
+    return String.format(
+        BASE_URL,
+        train,
+        train,
+        version,
+        update,
+        build,
+        train,
+        filename,
+        train,
+        version,
+        update,
+        build,
+        fileExtension
+    );
+  }
+
+  /**
+   * Build a the filename (the "flavor") that is expected on AdoptOpenJDK.
+   *
+   * @param downloadPlatform The platform for which the download URL is being generated like
+   *    "macos" or "linux64".
+   * @return The artifact name without extension like "jdk_x64_mac_hotspot".
+   */
+  private String buildDownloadRemoteFilename(String downloadPlatform) {
+    switch (downloadPlatform.toLowerCase()) {
+      case "windows32": return "jdk_x86-32_windows_hotspot";
+      case "windows64": return "jdk_x64_windows_hotspot";
+      case "macosx64": return "jdk_x64_mac_hotspot";
+      case "linux32": throw new RuntimeException("Linux32 not supported by AdoptOpenJDK.");
+      case "linux64": return "jdk_x64_linux_hotspot";
+      case "linuxarm": return "jdk_aarch64_linux_hotspot";
+      default: throw new RuntimeException("Unknown platform: " + downloadPlatform);
+    }
+  }
+
+  /**
+   * Determine the download file extension.
+   *
+   * @param downloadPlatform The platform for which the download URL is being generated like
+   *    "macos" or "linux64".
+   * @return The file extension without leading period like "zip" or "tar.gz".
+   */
+  private String buildFileExtension(String downloadPlatform) {
+    return downloadPlatform.startsWith("windows") ? "zip" : "tar.gz";
+  }
+}
diff --git a/build/jre/src/DownloadItem.java b/build/jre/src/DownloadItem.java
new file mode 100644
index 0000000000..30e716f435
--- /dev/null
+++ b/build/jre/src/DownloadItem.java
@@ -0,0 +1,77 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+  Part of the Processing project - http://processing.org
+
+  Copyright (c) 2014-19 The Processing Foundation
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  version 2, as published by the Free Software Foundation.
+
+  This program 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 for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+import java.util.Optional;
+
+
+/**
+ * Data structure describing an item to be downloaded as part the Processing build.
+ */
+public class DownloadItem {
+
+  private String url;
+  private String localPath;
+  private Optional<String> cookie;
+
+  /**
+   * Create a new download item.
+   *
+   * @param newUrl The remote URL at which the download can be found (via GET).
+   * @param newLocalPath The local path to which the file should be written.
+   * @param newCookie Optional cookie that, if present, should be given to the server along with the
+   *    GET request for the download contents.
+   */
+  public DownloadItem(String newUrl, String newLocalPath, Optional<String> newCookie) {
+    url = newUrl;
+    localPath = newLocalPath;
+    cookie = newCookie;
+  }
+
+  /**
+   * Determine where the download can be requested.
+   *
+   * @return The remote URL at which the download can be found (via GET).
+   */
+  public String getUrl() {
+    return url;
+  }
+
+  /**
+   * Determine to where the download should be saved.
+   *
+   * @return The local path to which the file should be written.
+   */
+  public String getLocalPath() {
+    return localPath;
+  }
+
+  /**
+   * Determine if and what cookie should be given as part of the download request.
+   *
+   * @return Optional cookie that, if present, should be given to the server along with the
+   *    GET request for the download contents. Should be ignored otherwise.
+   */
+  public Optional<String> getCookie() {
+    return cookie;
+  }
+
+
+}
diff --git a/build/jre/src/DownloadUrlGenerator.java b/build/jre/src/DownloadUrlGenerator.java
new file mode 100644
index 0000000000..02e0d62c46
--- /dev/null
+++ b/build/jre/src/DownloadUrlGenerator.java
@@ -0,0 +1,84 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+  Part of the Processing project - http://processing.org
+
+  Copyright (c) 2014-19 The Processing Foundation
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  version 2, as published by the Free Software Foundation.
+
+  This program 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 for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+
+import java.util.Optional;
+
+/**
+ * Abstract base class for strategy to generate download URLs.
+ */
+public abstract class DownloadUrlGenerator {
+
+  /**
+   * Determine the URL at which the artifact can be downloaded.
+   *
+   * @param platform The platform for which the download URL is being generated like "macos" or
+   *    "linux64".
+   * @param component The component to download like "JDK", "JRE", or "JFX".
+   * @param train The JDK train (like 1 or 11).
+   * @param version The JDK version (like 8 or 1).
+   * @param update The update (like 13).
+   * @param build The build number (like 133).
+   * @param flavor The flavor like "macosx-x64.dmg".
+   * @param hash The hash like "d54c1d3a095b4ff2b6607d096fa80163".
+   */
+  public abstract String buildUrl(String platform, String component, int train, int version,
+      int update, int build, String flavor, String hash);
+
+  /**
+   * Get the cookie that should be used in downloading the target component.
+   *
+   * @return Optional that is empty if no cookie should be used or optional with the string cookie
+   *    value if one should be used.
+   */
+  public Optional<String> getCookie() {
+    return Optional.empty();
+  }
+
+  /**
+   * Determine the name of the file to which the remote file should be saved.
+   *
+   * @param downloadPlatform The platform for which the download URL is being generated like
+   *    "macos" or "linux64".
+   * @param component The component to download like "JDK", "JRE", or "JFX".
+   * @param train The JDK train (like 1 or 11).
+   * @param version The JDK version (like 8 or 1).
+   * @param update The update (like 13).
+   * @param build The build number (like 133).
+   * @param flavor The flavor like "macosx-x64.dmg".
+   * @param hash The hash like "d54c1d3a095b4ff2b6607d096fa80163".
+   */
+  public String getLocalFilename(String downloadPlatform, String component, int train, int version,
+      int update, int build, String flavor, String hash) {
+
+    String baseFilename = component.toLowerCase();
+
+    String versionStr;
+    if (update == 0) {
+      versionStr = String.format("-%d-%s", version, flavor);
+    } else {
+      versionStr = String.format("-%du%d-%s", version, update, flavor);
+    }
+
+    return baseFilename + versionStr;
+  }
+
+}
diff --git a/build/jre/src/Downloader.java b/build/jre/src/Downloader.java
index b25fb58b8d..8828cb595e 100644
--- a/build/jre/src/Downloader.java
+++ b/build/jre/src/Downloader.java
@@ -1,3 +1,24 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+  Part of the Processing project - http://processing.org
+
+  Copyright (c) 2014-19 The Processing Foundation
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  version 2, as published by the Free Software Foundation.
+
+  This program 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 for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
 import java.io.*;
 import java.net.*;
 import java.util.*;
@@ -7,66 +28,134 @@
 
 
 /**
- * Ant Task for downloading the latest JRE or JDK from Oracle.
+ * Ant Task for downloading the latest JRE, JDK, or OpenJFX release.
  */
 public class Downloader extends Task {
-  static final String COOKIE =
-    "oraclelicense=accept-securebackup-cookie";
+  private static final boolean PRINT_LOGGING = true;
 
-  private int version;  // Java 8
+  private boolean openJdk; // If using openJDK.
+  private String platform; // macos
+  private int train;  // Java 11 (was 1 through Java 8)
+  private int version;  // 0 (was 8 prior to Java 9)
   private int update;   // Update 131
   private int build;    // Build 11
   // https://gist.github.com/P7h/9741922
   // http://stackoverflow.com/q/10268583
   private String hash;  // d54c1d3a095b4ff2b6607d096fa80163
 
-  private boolean jdk;  // false if JRE
+  private String component;  // "JRE", "JDK", or "JFX"
 
-  private String flavor;
+  private String flavor; // Like "zip"
 
   private String path;  // target path
 
 
+  /**
+   * Create a new downloader without tag attributes filled in.
+   **/
   public Downloader() { }
 
+  /**
+   * Set the platform being used.
+   *
+   * @param platform The platfom for which files are being downloaded like macosx.
+   */
+  public void setPlatform(String platform) {
+    this.platform = platform;
+  }
+
+  /**
+   * Indicate if the OpenJDK is being used.
+   *
+   * @param openJdk True if OpenJDK is being used. False if Oracle JDK is being used.
+   */
+  public void setOpenJdk(boolean openJdk) {
+    this.openJdk = openJdk;
+  }
+
+  /**
+   * Specify the build train being used.
+   *
+   * @param train The build train like 1 (Java 8 and before) or 11 (Java 11).
+   */
+  public void setTrain(int train) {
+    this.train = train;
+  }
 
+  /**
+   * Set the version to download within the given build train.
+   *
+   * @param version The version within the train to use like 0 for "11.0.1_13".
+   */
   public void setVersion(int version) {
     this.version = version;
   }
 
-
+  /**
+   * Set the update number to download within the given build train.
+   *
+   * @param update The update within the version to use like 1 for "11.0.1_13".
+   */
   public void setUpdate(int update) {
     this.update = update;
   }
 
-
+  /**
+   * Set the build number to download.
+   *
+   * @param build The build number to use within the build train like 13 for "11.0.1_13".
+   */
   public void setBuild(int build) {
     this.build = build;
   }
 
-
+  /**
+   * Set the expected hash of the download.
+   *
+   * @param hash The hash set.
+   */
   public void setHash(String hash) {
     this.hash = hash;
   }
 
-
-  public void setJDK(boolean jdk) {
-    this.jdk = jdk;
+  /**
+   * Indicate what component or release type of Java is being downloaded.
+   *
+   * @param component The component to download like "JDK", "JRE", or "OpenJFX".
+   */
+  public void setComponent(String component) {
+    this.component = component;
   }
 
-
+  /**
+   * Indicate the file flavor to be downloaded.
+   *
+   * @param flavor The flavor of file (dependent on platform) to be downloaded. Like "-x64.tar.gz".
+   */
   public void setFlavor(String flavor) {
     this.flavor = flavor;
   }
 
-
+  /**
+   * Set the path to which the file should be downloaded.
+   *
+   * @param path The path to which the file should be downloaded.
+   */
   public void setPath(String path) {
     this.path = path;
   }
 
-
+  /**
+   * Download the JDK or JRE.
+   */
   public void execute() throws BuildException {
-    if (version == 0) {
+    if (train == 0) {
+      // 1 if prior to Java 9
+      throw new BuildException("Train (i.e. 1 or 11) must be set");
+    }
+
+    boolean isJava11 = train == 11;
+    if (!isJava11 && version == 0) {
       throw new BuildException("Version (i.e. 7 or 8) must be set");
     }
 
@@ -90,33 +179,38 @@ public void execute() throws BuildException {
     }
   }
 
-
+  /**
+   * Download the package from AdoptOpenJDK or Oracle.
+   */
   void download() throws IOException {
-    String filename = (jdk ? "jdk" : "jre") +
-      (update == 0 ?
-       String.format("-%d-%s", version, flavor) :
-       String.format("-%du%d-%s", version, update, flavor));
+    DownloadItem downloadItem;
 
-    if (path == null) {
-      path = filename;
+    // Determine url generator for task
+    Optional<DownloadItem> downloadItemMaybe = getDownloadItem();
+    if (downloadItemMaybe.isEmpty()) {
+      return; // There is nothing to do.
+    } else {
+      downloadItem = downloadItemMaybe.get();
     }
 
-    String url = "http://download.oracle.com/otn-pub/java/jdk/" +
-      (update == 0 ?
-       String.format("%d-b%02d/", version, build) :
-       String.format("%du%d-b%02d/", version, update, build));
-
-    // URL format changed starting with 8u121
-    if (update >= 121) {
-      url += hash + "/";
+    // Build URL and path
+    if (path == null) {
+      path = downloadItem.getLocalPath();
     }
 
-    // Finally, add the filename to the end
-    url += filename;
+    String url = downloadItem.getUrl();
+
+    // Downlaod
+    println("Attempting download at " + url);
 
     HttpURLConnection conn =
       (HttpURLConnection) new URL(url).openConnection();
-    conn.setRequestProperty("Cookie", COOKIE);
+
+    Optional<String> cookieMaybe = downloadItem.getCookie();
+
+    if (cookieMaybe.isPresent()) {
+      conn.setRequestProperty("Cookie", cookieMaybe.get());
+    }
 
     //printHeaders(conn);
     //conn.connect();
@@ -125,7 +219,7 @@ void download() throws IOException {
       List<String> location = headers.get("Location");
       if (location.size() == 1) {
         url = location.get(0);
-        System.out.println("Redirecting to " + url);
+        println("Redirecting to " + url);
       } else {
         throw new BuildException("Got " + location.size() + " locations.");
       }
@@ -136,7 +230,11 @@ void download() throws IOException {
           conn.setRequestProperty("Cookie", cookie);
         }
       }
-      conn.setRequestProperty("Cookie", COOKIE);
+
+      if (cookieMaybe.isPresent()) {
+        conn.setRequestProperty("Cookie", cookieMaybe.get());
+      }
+
       conn.connect();
     }
 
@@ -144,7 +242,10 @@ void download() throws IOException {
       InputStream input = conn.getInputStream();
       BufferedInputStream bis = new BufferedInputStream(input);
       File outputFile = new File(path); //folder, filename);
-      System.out.format("Downloading %s from %s%n", outputFile.getAbsolutePath(), url);
+
+      String msg = String.format("Downloading %s from %s%n", outputFile.getAbsolutePath(), url);
+      println(msg);
+
       // Write to a temp file so that we don't have an incomplete download
       // masquerading as a good archive.
       File tempFile = File.createTempFile("download", "", outputFile.getParentFile());
@@ -175,19 +276,107 @@ void download() throws IOException {
     }
   }
 
-
+  /**
+   * Print the headers used for {URLConnection}.
+   */
   static void printHeaders(URLConnection conn) {
     Map<String, List<String>> headers = conn.getHeaderFields();
     Set<Map.Entry<String, List<String>>> entrySet = headers.entrySet();
     for (Map.Entry<String, List<String>> entry : entrySet) {
       String headerName = entry.getKey();
-      System.out.println("Header Name:" + headerName);
+      println("Header Name:" + headerName);
       List<String> headerValues = entry.getValue();
       for (String value : headerValues) {
-        System.out.print("Header value:" + value);
+        print("Header value:" + value);
       }
-      System.out.println();
-      System.out.println();
+      printEmptyLine();
+      printEmptyLine();
     }
   }
+
+  /**
+   * Get the item to be downloaded for this task.
+   *
+   * @return The to be downloaded or empty if there is no download required.
+   */
+  private Optional<DownloadItem> getDownloadItem() {
+    // Determine download type
+    boolean isJavaDownload = component.equalsIgnoreCase("jdk");
+    isJavaDownload = isJavaDownload || component.equalsIgnoreCase("jre");
+
+    boolean isJfxDownload = component.equalsIgnoreCase("jfx");
+
+    DownloadUrlGenerator downloadUrlGenerator;
+
+    // Determine url generator
+    if (isJavaDownload) {
+      if (openJdk) {
+        downloadUrlGenerator = new AdoptOpenJdkDownloadUrlGenerator();
+      } else {
+        downloadUrlGenerator = new OracleDownloadUrlGenerator();
+      }
+    } else if (isJfxDownload) {
+      if (openJdk) {
+        downloadUrlGenerator = new GluonHqDownloadUrlGenerator();
+      } else {
+        return Optional.empty(); // Nothing to download
+      }
+    } else {
+      throw new RuntimeException("Do not know how to download: " + component);
+    }
+
+    // Build download item
+    String path = downloadUrlGenerator.getLocalFilename(
+        platform,
+        component,
+        train,
+        version,
+        update,
+        build,
+        flavor,
+        hash
+    );
+
+    String url = downloadUrlGenerator.buildUrl(
+        platform,
+        component,
+        train,
+        version,
+        update,
+        build,
+        flavor,
+        hash
+    );
+
+    return Optional.of(new DownloadItem(url, path, downloadUrlGenerator.getCookie()));
+  }
+
+  /**
+   * Print a line out to console if logging is enabled.
+   *
+   * @param message The message to be printed.
+   */
+  private static void println(String message) {
+    if (PRINT_LOGGING) {
+      System.out.println(message);
+    }
+  }
+
+  /**
+   * Print a line out to console if logging is enabled without a newline.
+   *
+   * @param message The message to be printed.
+   */
+  private static void print(String message) {
+    if (PRINT_LOGGING) {
+      System.out.print(message);
+    }
+  }
+
+  /**
+   * Print an empty line to the system.out.
+   */
+  private static void printEmptyLine() {
+    println("");
+  }
 }
diff --git a/build/jre/src/GluonHqDownloadUrlGenerator.java b/build/jre/src/GluonHqDownloadUrlGenerator.java
new file mode 100644
index 0000000000..d11fc5df3d
--- /dev/null
+++ b/build/jre/src/GluonHqDownloadUrlGenerator.java
@@ -0,0 +1,50 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+  Part of the Processing project - http://processing.org
+
+  Copyright (c) 2014-19 The Processing Foundation
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  version 2, as published by the Free Software Foundation.
+
+  This program 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 for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+
+/**
+ * URL generator for downloading JFX directly from OpenJFX's sponsor Gluon.
+ */
+public class GluonHqDownloadUrlGenerator extends DownloadUrlGenerator {
+
+  private static final String TEMPLATE_URL = "http://gluonhq.com/download/javafx-%d-%d-%d-sdk-%s/";
+
+  @Override
+  public String buildUrl(String platform, String component, int train, int version, int update,
+      int build, String flavor, String hash) {
+
+      String platformLower = platform.toLowerCase();
+
+      String platformShort;
+      if (platformLower.contains("linux")) {
+        platformShort = "linux";
+      } else if (platformLower.contains("mac")) {
+        platformShort = "mac";
+      } else if (platformLower.contains("windows")) {
+        platformShort = "windows";
+      } else {
+        throw new RuntimeException("Unsupported platform for JFX: " + platform);
+      }
+
+      return String.format(TEMPLATE_URL, train, version, update, platformShort);
+  }
+
+}
diff --git a/build/jre/src/OracleDownloadUrlGenerator.java b/build/jre/src/OracleDownloadUrlGenerator.java
new file mode 100644
index 0000000000..2984bfa1c5
--- /dev/null
+++ b/build/jre/src/OracleDownloadUrlGenerator.java
@@ -0,0 +1,72 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+  Part of the Processing project - http://processing.org
+
+  Copyright (c) 2014-19 The Processing Foundation
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  version 2, as published by the Free Software Foundation.
+
+  This program 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 for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+
+import java.util.Optional;
+
+/**
+ * Utility to generate the download URL from Oracle.
+ */
+public class OracleDownloadUrlGenerator extends DownloadUrlGenerator {
+  private static final String COOKIE =
+      "oraclelicense=accept-securebackup-cookie";
+
+
+  @Override
+  public String buildUrl(String platform, String component, int train, int version, int update,
+      int build, String flavor, String hash) {
+
+    if (!component.equalsIgnoreCase("jdk")) {
+      throw new RuntimeException("Can only generate JDK download URLs for Oracle.");
+    }
+
+    String filename = getLocalFilename(
+        platform,
+        component,
+        train,
+        version,
+        update,
+        build,
+        flavor,
+        hash
+    );
+
+    String url = "http://download.oracle.com/otn-pub/java/jdk/" +
+        (update == 0 ?
+            String.format("%d-b%02d/", version, build) :
+            String.format("%du%d-b%02d/", version, update, build));
+
+    // URL format changed starting with 8u121
+    if (update >= 121) {
+      url += hash + "/";
+    }
+
+    // Finally, add the filename to the end
+    url += filename;
+
+    return url;
+  }
+
+  public Optional<String> getCookie() {
+    return Optional.of(COOKIE);
+  }
+
+}
diff --git a/build/jre/test/AdoptOpenJdkDownloadUrlGeneratorTest.java b/build/jre/test/AdoptOpenJdkDownloadUrlGeneratorTest.java
new file mode 100644
index 0000000000..4a07fa990d
--- /dev/null
+++ b/build/jre/test/AdoptOpenJdkDownloadUrlGeneratorTest.java
@@ -0,0 +1,128 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+  Part of the Processing project - http://processing.org
+
+  Copyright (c) 2012-19 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  version 2, as published by the Free Software Foundation.
+
+  This program 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 for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class AdoptOpenJdkDownloadUrlGeneratorTest {
+
+  private static final String EXPECTED_WIN64_URL = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_windows_hotspot_11.0.1_13.zip";
+  private static final String EXPECTED_MAC_URL = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_hotspot_11.0.1_13.tar.gz";
+  private static final String EXPECTED_LINUX_URL = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_hotspot_11.0.1_13.tar.gz";
+  private static final String EXPECTED_LINUX_URL_ARM = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.1_13.tar.gz";
+
+  private static final String COMPONENT = "jdk";
+  private static final int TRAIN = 11;
+  private static final int VERSION = 0;
+  private static final int UPDATE = 1;
+  private static final int BUILD = 13;
+  private static final String FLAVOR_SUFFIX = "-x64.tar.gz";
+  private static final String HASH = "";
+
+  private AdoptOpenJdkDownloadUrlGenerator urlGenerator;
+
+  @Before
+	public void setUp() throws Exception {
+		urlGenerator = new AdoptOpenJdkDownloadUrlGenerator();
+	}
+
+  @Test
+  public void testBuildUrlWindows() {
+    String url = urlGenerator.buildUrl(
+      "windows64",
+      COMPONENT,
+      TRAIN,
+      VERSION,
+      UPDATE,
+      BUILD,
+      "windows" + FLAVOR_SUFFIX,
+      HASH
+    );
+
+    assertEquals(
+      EXPECTED_WIN64_URL,
+      url
+    );
+  }
+
+  @Test
+  public void testBuildUrlMac() {
+    String url = urlGenerator.buildUrl(
+      "macosx64",
+      COMPONENT,
+      TRAIN,
+      VERSION,
+      UPDATE,
+      BUILD,
+      "mac" + FLAVOR_SUFFIX,
+      HASH
+    );
+
+    assertEquals(
+      EXPECTED_MAC_URL,
+      url
+    );
+  }
+
+  @Test
+  public void testBuildUrlLinux64() {
+    String url = urlGenerator.buildUrl(
+      "linux64",
+      COMPONENT,
+      TRAIN,
+      VERSION,
+      UPDATE,
+      BUILD,
+      "linux64" + FLAVOR_SUFFIX,
+      HASH
+    );
+
+    assertEquals(
+      EXPECTED_LINUX_URL,
+      url
+    );
+  }
+
+  @Test
+  public void testBuildUrlLinuxArm() {
+    String url = urlGenerator.buildUrl(
+      "linuxArm",
+      COMPONENT,
+      TRAIN,
+      VERSION,
+      UPDATE,
+      BUILD,
+      "linuxArm" + FLAVOR_SUFFIX,
+      HASH
+    );
+
+    assertEquals(
+      EXPECTED_LINUX_URL_ARM,
+      url
+    );
+  }
+
+}
diff --git a/build/jre/test/GluonHqDownloadUrlGeneratorTest.java b/build/jre/test/GluonHqDownloadUrlGeneratorTest.java
new file mode 100644
index 0000000000..0f1ca2faa2
--- /dev/null
+++ b/build/jre/test/GluonHqDownloadUrlGeneratorTest.java
@@ -0,0 +1,108 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+  Part of the Processing project - http://processing.org
+
+  Copyright (c) 2012-19 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  version 2, as published by the Free Software Foundation.
+
+  This program 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 for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class GluonHqDownloadUrlGeneratorTest {
+
+  private static final String EXPECTED_WIN64_URL = "http://gluonhq.com/download/javafx-11-0-2-sdk-windows/";
+  private static final String EXPECTED_MAC_URL = "http://gluonhq.com/download/javafx-11-0-2-sdk-mac";
+  private static final String EXPECTED_LINUX_URL = "http://gluonhq.com/download/javafx-11-0-2-sdk-linux/";
+
+  private static final String COMPONENT = "jfx";
+  private static final int TRAIN = 11;
+  private static final int VERSION = 0;
+  private static final int UPDATE = 2;
+  private static final int BUILD = 0;
+  private static final String FLAVOR_SUFFIX = ".zip";
+  private static final String HASH = "";
+
+  private AdoptOpenJdkDownloadUrlGenerator urlGenerator;
+
+  @Before
+  public void setUp() throws Exception {
+    urlGenerator = new AdoptOpenJdkDownloadUrlGenerator();
+  }
+
+  @Test
+  public void testBuildUrlWindows() {
+    String url = urlGenerator.buildUrl(
+        "windows64",
+        COMPONENT,
+        TRAIN,
+        VERSION,
+        UPDATE,
+        BUILD,
+        "windows" + FLAVOR_SUFFIX,
+        HASH
+    );
+
+    assertEquals(
+        EXPECTED_WIN64_URL,
+        url
+    );
+  }
+
+  @Test
+  public void testBuildUrlMac() {
+    String url = urlGenerator.buildUrl(
+        "macosx64",
+        COMPONENT,
+        TRAIN,
+        VERSION,
+        UPDATE,
+        BUILD,
+        "mac" + FLAVOR_SUFFIX,
+        HASH
+    );
+
+    assertEquals(
+        EXPECTED_MAC_URL,
+        url
+    );
+  }
+
+  @Test
+  public void testBuildUrlLinux() {
+    String url = urlGenerator.buildUrl(
+        "linux64",
+        COMPONENT,
+        TRAIN,
+        VERSION,
+        UPDATE,
+        BUILD,
+        "linux64" + FLAVOR_SUFFIX,
+        HASH
+    );
+
+    assertEquals(
+        EXPECTED_LINUX_URL,
+        url
+    );
+  }
+
+}
diff --git a/build/jre/test/OracleDownloadUrlGeneratorTest.java b/build/jre/test/OracleDownloadUrlGeneratorTest.java
new file mode 100644
index 0000000000..2124c210f2
--- /dev/null
+++ b/build/jre/test/OracleDownloadUrlGeneratorTest.java
@@ -0,0 +1,59 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+  Part of the Processing project - http://processing.org
+
+  Copyright (c) 2012-19 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  version 2, as published by the Free Software Foundation.
+
+  This program 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 for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.Ignore;
+import static org.junit.Assert.assertEquals;
+
+public class OracleDownloadUrlGeneratorTest {
+
+  private static final String EXPECTED_URL = "http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-macosx-x64.dmg";
+
+  private OracleDownloadUrlGenerator urlGenerator;
+
+  @Before
+  public void setUp() throws Exception {
+    urlGenerator = new OracleDownloadUrlGenerator();
+  }
+
+  @Test
+  public void testBuildUrl() {
+    String url = urlGenerator.buildUrl(
+      "macos",
+      "jdk",
+      1,
+      8,
+      131,
+      11,
+      "macosx-x64.dmg",
+      "d54c1d3a095b4ff2b6607d096fa80163"
+    );
+
+    assertEquals(
+      EXPECTED_URL,
+      url
+    );
+  }
+
+}
diff --git a/build/library/ant-contrib-0.6.jar b/build/library/ant-contrib-0.6.jar
new file mode 100644
index 0000000000..db90b0aae8
Binary files /dev/null and b/build/library/ant-contrib-0.6.jar differ
diff --git a/build/library/ant-contrib-LICENSE.txt b/build/library/ant-contrib-LICENSE.txt
new file mode 100644
index 0000000000..4d8c2fb7a1
--- /dev/null
+++ b/build/library/ant-contrib-LICENSE.txt
@@ -0,0 +1,47 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2001-2003 Ant-Contrib project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:  
+ *       "This product includes software developed by the 
+ *        Ant-Contrib project (http://sourceforge.net/projects/ant-contrib)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The name Ant-Contrib must not be used to endorse or promote products 
+ *    derived from this software without prior written permission. For
+ *    written permission, please contact
+ *    ant-contrib-developers@lists.sourceforge.net.
+ *
+ * 5. Products derived from this software may not be called "Ant-Contrib"
+ *    nor may "Ant-Contrib" appear in their names without prior written
+ *    permission of the Ant-Contrib project.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE ANT-CONTRIB PROJECT OR ITS
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ */
diff --git a/build/linux/processing b/build/linux/processing
index 078b2428b5..a7a008e334 100755
--- a/build/linux/processing
+++ b/build/linux/processing
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# This script runs Processing, using the JRE in the Processing 
+# This script runs Processing, using the JRE in the Processing
 # installation directory.
 
 # If your system needs a different version of Java than what's included
 # in the download, replace the 'java' folder with the contents of a new
-# Oracle JRE (Java 8 only), or create a symlink named "java" in the 
+# Oracle JRE (Java 8 only), or create a symlink named "java" in the
 # Processing installation directory that points to the JRE home directory.
 # This must be a Sun/Oracle JDK. For more details, see here:
 # https://github.com/processing/processing/wiki/Supported-Platforms
@@ -104,7 +104,7 @@ cmd_name='processing-java'
 
 if [ $current_name = $cmd_name ]
 then
-    java -Djna.nosys=true -Djava.ext.dirs="$APPDIR"/java/lib/ext -Xmx256m processing.mode.java.Commander "$@"
+    java -Djna.nosys=true -Xmx256m processing.mode.java.Commander "$@"
     exit $?
 else
   # Start Processing in the same directory as this script
@@ -115,5 +115,5 @@ else
   fi
   cd "$APPDIR"
 
-  java -splash:lib/about-1x.png -Djna.nosys=true -Djava.ext.dirs="$APPDIR"/java/lib/ext -Xmx256m processing.app.Base "$SKETCH" &
+  java -splash:lib/about-1x.png -Djna.nosys=true -Xmx256m processing.app.Base "$SKETCH" &
 fi
diff --git a/build/macosx/appbundler.jar b/build/macosx/appbundler.jar
index 42cc8f18cd..62a658d51e 100644
Binary files a/build/macosx/appbundler.jar and b/build/macosx/appbundler.jar differ
diff --git a/build/macosx/appbundler/build.xml b/build/macosx/appbundler/build.xml
index 4d02204175..068b41b39a 100644
--- a/build/macosx/appbundler/build.xml
+++ b/build/macosx/appbundler/build.xml
@@ -73,8 +73,7 @@ questions.
         </copy>
 
         <exec executable="${cc}">
-            <!-- <arg line="${arch64} ${arch32}"/> -->
-            <arg line="${arch64}"/>
+            <arg line="${arch64}"/> <!-- ${arch32} not supported -->
             <arg value="-I"/>
             <arg value="${env.JAVA_HOME}/include"/>
             <arg value="-I"/>
@@ -90,7 +89,7 @@ questions.
             <arg value="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk"/>
             <arg value="-mmacosx-version-min=10.7"/>
             -->
-            <arg value="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"/>
+            <arg value="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk"/>
             <arg value="-mmacosx-version-min=10.8"/>
             <arg value="native/main.m"/>
         </exec>
diff --git a/build/macosx/appbundler/doc/appbundler.html b/build/macosx/appbundler/doc/appbundler.html
index aa44684872..5c213e908a 100644
--- a/build/macosx/appbundler/doc/appbundler.html
+++ b/build/macosx/appbundler/doc/appbundler.html
@@ -73,6 +73,13 @@ <h3>Parameters</h3>
     Corresponds to the <code>CFBundleIconFile</code> key in the <tt>Info.plist</tt> file.</td>
     <td align="center" valign="top">No</td>
   </tr>
+  <tr>
+    <td valign="top">hideDockIcon</td>
+    <td valign="top">Set to true to prevent display of the application icon on the Mac OS X dock.
+    Corresponds to the <code>LSUIElement</code> key in the <tt>Info.plist</tt> file. 
+    (<a href="https://developer.apple.com/library/mac/documentation/General/Reference/InfoPlistKeyReference/Articles/LaunchServicesKeys.html#//apple_ref/doc/uid/20001431-108256">Details</a>)</td>
+    <td align="center" valign="top">No</td>
+  </tr>      
   <tr>
     <td valign="top">shortversion</td>
     <td valign="top">The release version number string for the application.
@@ -100,10 +107,86 @@ <h3>Parameters</h3>
     file.</td>
     <td align="center" valign="top">No</td>
   </tr>
+  <tr>
+    <td valign="top">privileged</td>
+    <td valign="top">Bool value if the bundled application is to be launched as privileged.</td>
+    <td align="center" valign="top">No</td>
+  </tr>
   <tr>
     <td valign="top">mainclassname</td>
     <td valign="top">The name of the bundled application's main class.</td>
+    <td align="center" valign="top">Yes, alternative to <code>jnlplaunchername</code></td>
     <td align="center" valign="top">Yes</td>
+  </tr>  
+  <tr>
+    <td valign="top">plistClassPaths</td>
+    <td valign="top">A comma-separated list of classpath-elements which are used for the java application.
+    <tt>$APP_ROOT</tt> is replaced by the path of the <tt>.app</tt>-bundle. Required only if not
+    the libraries specified by the <tt>classpath</tt> and <tt>librarypath</tt> should be used.</td>
+    <td align="center" valign="top">No</td>
+  </tr>  
+  <tr>
+    <td valign="top">jvmRequired</td>
+    <td valign="top">Specifies the required Java virtual machine version.</td>
+    <td align="center" valign="top">No (defaults to <tt>1.7</tt>)</td>
+  </tr>     
+  <tr>
+    <td valign="top">jrePreferred</td>
+    <td valign="top">If set to <tt>true</tt>, a Java Runtime Edition is required for execution. If both <tt>jrePreferred</tt> and <tt>jdkPreferred</tt> are set <tt>true</tt>, then a JRE is preferred but a JDK ia also accepted.</td>
+    <td align="center" valign="top">No</td>
+  </tr>      
+  <tr>
+    <td valign="top">jdkPreferred</td>
+    <td valign="top">If set to <tt>true</tt>, a Java Development Kit is required for execution. If both <tt>jrePreferred</tt> and <tt>jdkPreferred</tt> are set <tt>true</tt>, then a JRE is preferred but a JDK ia also accepted.</td>
+    <td align="center" valign="top">No</td>
+  </tr>    
+  <tr>
+    <td valign="top">minimumSystemVersion</td>
+    <td valign="top">Indicates the minimum version of OS X required for this app to run.
+    Corresponds to the <code>LSMinimumSystemVersion</code> key in the <tt>Info.plist</tt>
+    file.</td> 
+    (<a href="https://developer.apple.com/library/ios/documentation/General/Reference/InfoPlistKeyReference/Articles/LaunchServicesKeys.html#//apple_ref/doc/uid/20001431-113253">Details</a>)</td>
+    <td align="center" valign="top">No</td>
+  </tr>
+  <tr>
+    <td valign="top">jnlplaunchername</td>
+    <td valign="top">The name of the bundled applications's jnlp file. The file has to be be copied to the <code>Contents/Java</code> folder. It has to be present during execution of the application. This serves as option to deliver signed applications based upon JNLP files. The application can then be signed and the signature won't break when modifying the JNLP file.</td>
+    <td align="center" valign="top">No, alternative to <code>mainclassname</code></td>
+  </tr>
+  <tr>
+    <td valign="top">workingdirectory</td>
+    <td valign="top">Specifies the working directory of the application. 
+    <tt>$APP_ROOT</tt> is replaced by the path of the <tt>.app</tt>-bundle.</td>
+    <td align="center" valign="top">No</td>
+  </tr>
+  <tr>
+    <td valign="top">privileged</td>
+    <td valign="top">If set, the application is started with administrator privileges.</td>
+    <td align="center" valign="top">No</td>
+  </tr>
+  <tr>
+    <td valign="top">highResolutionCapable</td>
+    <td valign="top">Sets the <i>High Resolution Capable</i> flag.   
+    Corresponds to the <code>NSHighResolutionCapable</code> key in the <tt>Info.plist</tt>
+    file.</td> 
+    <td align="center" valign="top">No</td>
+  </tr>
+  <tr>
+    <td valign="top">supportsAutomaticGraphicsSwitching</td>
+    <td valign="top">Allow OpenGL applications to utilize the integrated GPU.
+    Corresponds to the <code>NSSupportsAutomaticGraphicsSwitching</code> key in the <tt>Info.plist</tt>
+    <td align="center" valign="top">No</td>
+  </tr>
+  <tr>
+    <td valign="top">ignorePSN</td>
+    <td valign="top">If set to <tt>true</tt>, the <tt>-psn...</tt> arguments passed by the OS
+    to the application is filtered out.</td>
+    <td align="center" valign="top">No</td>
+  </tr>
+  <tr>
+    <td valign="top">isDebug</td>
+    <td valign="top">If set to <tt>true</tt>, additiona console output will be produced during startup.</td>
+    <td align="center" valign="top">No</td>
   </tr>
 </table>
 
@@ -137,6 +220,23 @@ <h4>librarypath</h4>
 
 <h4>option</h4>
 <p>Specifies a command-line option to be passed to the JVM at startup.</p>
+<p>Options may be named, which allows the bundled Java program
+itself to override the option (e.g. to adjust heap settings). Changes will take effect upon restart of the
+application. Assuming your <tt>CFBundleIdentifier</tt> (settable via the attribute <tt>identifier</tt>)
+is <tt>com.oracle.appbundler</tt>. Then you can override a named option by calling
+<xmp>   import java.util.prefs.Preferences;
+   [...]
+   Preferences jvmOptions = Preferences.userRoot().node("/com/oracle/appbundler/JVMOptions");
+   jvmOptions.put("name", "value"); // use option name and desired value here
+   jvmOptions.flush();</xmp>
+The corresponding entries will be stored in a file called
+<tt>~/Library/Preferences/com.oracle.appbundler.plist</tt>. To manipulate the file
+without Java's <tt>Preferences</tt> from the command line, you should use the tool
+<a href="https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/defaults.1.html">defaults</a>.
+For example, to add an entry via the command line, use:
+<xmp>   defaults write com.oracle.appbundler /com/oracle/appbundler/ -dict-add JVMOptions/ '{"name"="value";}'</xmp>
+Of named options, only the value is passed to the JVM, not the name. The name merely serves as identifier.
+</p>
 <table border="1" cellpadding="2" cellspacing="0">
   <tr>
     <td valign="top"><b>Attribute</b></td>
@@ -148,6 +248,11 @@ <h4>option</h4>
     <td valign="top">The option value.</td>
     <td align="center" valign="top">Yes</td>
   </tr>
+  <tr>
+    <td valign="top">name</td>
+    <td valign="top">The option name.</td>
+    <td align="center" valign="top">No</td>
+  </tr>
 </table>
 
 <h4>argument</h4>
@@ -165,6 +270,218 @@ <h4>argument</h4>
   </tr>
 </table>
 
+<h4>environment</h4>
+<p>Specifies an environment variable set via LSEnvironment entry in the <tt>Info.plist</tt> file. See the
+    <a href="https://developer.apple.com/library/prerelease/mac/documentation/General/Reference/InfoPlistKeyReference/Articles/LaunchServicesKeys.html#//apple_ref/doc/uid/20001431-106825">Apple Documentation</a> for details.</p>
+<p>The string <tt>$APP_ROOT</tt> will be replaced by the application bundle path in all environment variables on runtime.</p>
+<table border="1" cellpadding="2" cellspacing="0">
+  <tr>
+    <td valign="top"><b>Attribute</b></td>
+    <td valign="top"><b>Description</b></td>
+    <td align="center" valign="top"><b>Required</b></td>
+  </tr>
+  <tr>
+    <td valign="top">name</td>
+    <td valign="top">The variable name.</td>
+    <td align="center" valign="top">Yes</td>
+  </tr>
+  <tr>
+    <td valign="top">value</td>
+    <td valign="top">The variable value.</td>
+    <td align="center" valign="top">Yes</td>
+  </tr>
+</table>
+
+<h4>architecture</h4>
+<p>Specifies the elements of the <tt>LSArchitecturePriority</tt> array in <tt>Info.plist</tt>.
+(<a href="https://developer.apple.com/library/ios/documentation/General/Reference/InfoPlistKeyReference/Articles/LaunchServicesKeys.html#//apple_ref/doc/uid/TP40009250-106825-TPXREF124">Details</a>)</p>
+<table border="1" cellpadding="2" cellspacing="0">
+  <tr>
+    <td valign="top"><b>Attribute</b></td>
+    <td valign="top"><b>Description</b></td>
+    <td align="center" valign="top"><b>Required</b></td>
+  </tr>
+  <tr>
+    <td valign="top">name</td>
+    <td valign="top">The architecture name.</td>
+    <td align="center" valign="top">Yes</td>
+  </tr>
+</table>
+
+<h4>plistentry</h4>
+<p>Adds an arbitrary entry to the generated <tt>Info.plist</tt>.</p>
+<table border="1" cellpadding="2" cellspacing="0">
+  <tr>
+    <td valign="top"><b>Attribute</b></td>
+    <td valign="top"><b>Description</b></td>
+    <td align="center" valign="top"><b>Required</b></td>
+  </tr>
+  <tr>
+    <td valign="top">key</td>
+    <td valign="top">The entry's key.</td>
+    <td align="center" valign="top">Yes</td>
+  </tr>
+  <tr>
+    <td valign="top">value</td>
+    <td valign="top">The entry's value.</td>
+    <td align="center" valign="top">Yes</td>
+  </tr>
+  <tr>
+    <td valign="top">type</td>
+    <td valign="top">The entry's type.</td>
+    <td align="center" valign="top">No (defaults to <tt>String</tt>)</td>
+  </tr>
+</table>
+
+
+<h4>scheme</h4>
+<p>Specifies a protocol for which the bundled application should be registered as a handler.</p>
+<table border="1" cellpadding="2" cellspacing="0">
+  <tr>
+    <td valign="top"><b>Attribute</b></td>
+    <td valign="top"><b>Description</b></td>
+    <td align="center" valign="top"><b>Required</b></td>
+  </tr>
+  <tr>
+    <td valign="top">value</td>
+    <td valign="top">The protocol scheme.</td>
+    <td align="center" valign="top">Yes</td>
+  </tr>
+</table>
+
+<h4 id="bundledocument">bundledocument</h4>
+<p>Describes a document associated with your application.</p>
+<table border="1" cellpadding="2" cellspacing="0">
+  <tr>
+    <td valign="top"><b>Attribute</b></td>
+    <td valign="top"><b>Description</b></td>
+    <td valign="top"><b>Corresponding <tt>CFBundleDocumentTypes</tt> key</b></td>
+    <td align="center" valign="top"><b>Required</b></td>
+  </tr>
+  <tr>
+    <td valign="top">contentTypes</td>
+    <td valign="top">A comma-separated list of <a href="https://developer.apple.com/library/mac/documentation/FileManagement/Conceptual/understanding_utis/understand_utis_intro/understand_utis_intro.html#//apple_ref/doc/uid/TP40001319">Uniform Type Identifiers</a> defining each a supported file type.
+    If you reference custom filetypes, declare them using a <a href="#typedeclaration">typedeclaration</a>. 
+    If set, <i>extensions</i> and <i>isPackage</i> are ignored. See the <a href="https://developer.apple.com/library/mac/documentation/Miscellaneous/Reference/UTIRef/Articles/System-DeclaredUniformTypeIdentifiers.html">UTI reference</a> for a list of default UTIs.</td>
+    <td valign="top"><tt>LSItemContentTypes</tt></td>
+    <td align="center" valign="top">Yes (or <i>extensions</i>)</td>
+  </tr>
+  <tr>
+    <td valign="top">extensions</td>
+    <td valign="top">A comma-separated list of filename extensions (minus the leading period) to map to this document type.</td>
+    <td valign="top"><tt>CFBundleTypeExtensions</tt></td>
+    <td align="center" valign="top">Yes (or <i>contentTypes</i>)</td>
+  </tr>
+  <tr>
+    <td valign="top">icon</td>
+    <td valign="top">The name of the icon file (.icns) to associate with this OS X document type.</td>
+    <td valign="top"><tt>CFBundleTypeIconFile</tt></td>
+    <td align="center" valign="top">No (But recommended)</td>
+  </tr>
+  <tr>
+    <td valign="top">name</td>
+    <td valign="top">The abstract name for the document type.</td>
+    <td valign="top"><tt>CFBundleTypeName</tt></td>
+    <td align="center" valign="top">No (But recommended)</td>
+  </tr>
+  <tr>
+    <td valign="top">role</td>
+    <td valign="top">This key specifies the app's role with respect to the type. The value can be <tt>Editor</tt>, <tt>Viewer</tt>, <tt>Shell</tt>, or <tt>None</tt>.</td>
+    <td valign="top"><tt>CFBundleTypeRole</tt></td>
+    <td align="center" valign="top">No (default: <tt>Editor</tt>)</td>
+  </tr>
+  <tr>
+    <td valign="top">handlerRank</td>
+    <td valign="top">Determines how Launch Services ranks this app among the apps that declare themselves editors or viewers of files of this type. The possible values are: <tt>Owner</tt> (this app is the creator of files of this type), <tt>Alternate</tt> (this app is a secondary viewer of files of this type), <tt>None</tt> (this app must never be used to open files of this type, but it accepts drops of files of this type), <tt>Default</tt> (default; this app doesn't accept drops of files of this type). </td>
+    <td valign="top"><tt>LSHandlerRank</tt></td>
+    <td align="center" valign="top">No</td>
+  </tr>
+  <tr>
+    <td valign="top">isPackage</td>
+    <td valign="top">Specifies whether the document is distributed as a bundle. If set to true, the bundle directory is treated as a file.</td>
+    <td valign="top"><tt>LSTypeIsPackage</tt></td>
+    <td align="center" valign="top">No (default: <tt>false</tt>)</td>
+  </tr> 
+  <tr>
+    <td valign="top">exportableTypes</td>
+    <td valign="top">A comma-separated list of <a href="https://developer.apple.com/library/mac/documentation/FileManagement/Conceptual/understanding_utis/understand_utis_intro/understand_utis_intro.html#//apple_ref/doc/uid/TP40001319">Uniform Type Identifiers</a> defining a supported file type to which this document can export its content.
+    If you reference custom filetypes, declare them using a <a href="#typedeclaration">typedeclaration</a>.
+    See also the <a href="https://developer.apple.com/library/mac/documentation/DataManagement/Conceptual/DocBasedAppProgrammingGuideForOSX/AdvancedTopics/AdvancedTopics.html#//apple_ref/doc/uid/TP40011179-CH7-SW8">Additional Document Type Considerations</a> of the <a href="https://developer.apple.com/library/mac/documentation/DataManagement/Conceptual/DocBasedAppProgrammingGuideForOSX/">Document-Based App Programming Guide for Mac</a>.
+    <td valign="top"><tt>NSExportableTypes</tt></td>
+    <td align="center" valign="top">No</td>
+  </tr>
+</table>
+
+<h4 id="typedeclaration">typedeclaration</h4>
+<p>Declares a new  <a href="https://developer.apple.com/library/mac/documentation/FileManagement/Conceptual/understanding_utis/understand_utis_intro/understand_utis_intro.html#//apple_ref/doc/uid/TP40001319">Uniform Type Identifier</a>.
+Required if you reference non-system UTIs in <a href="#bundledocument">bundledocument's</a> <i>contentTypes</i> or <i>exportableTypes</i></p>.
+<table border="1" cellpadding="2" cellspacing="0">
+  <tr>
+    <td valign="top"><b>Attribute</b></td>
+    <td valign="top"><b>Description</b></td>
+    <td valign="top"><b>Corresponding <tt>UT...TypeDeclarations</tt> key</b></td>
+    <td align="center" valign="top"><b>Required</b></td>
+  </tr>
+  <tr>
+    <td valign="top">identifier</td>
+    <td valign="top">The unique UTI for the declared type. Following the reverse-DNS format beginning with com.companyName is a simple way to ensure uniqueness.</td>
+    <td valign="top"><tt>UTTypeIdentifier</tt></td>
+    <td align="center" valign="top">Yes</td>
+  </tr>
+  <tr>
+    <td valign="top">description</td>
+    <td valign="top">A user-visible description of this type.</td>
+    <td valign="top"><tt>UTTypeDescription</tt></td>
+    <td align="center" valign="top">No</td>
+  </tr>
+  <tr>
+    <td valign="top">icon</td>
+    <td valign="top">The name of the icon file (.icns) to associate with this UTI.</td>
+    <td valign="top"><tt>UTTypeIconFile</tt></td>
+    <td align="center" valign="top">No</td>
+  </tr>
+  <tr>
+    <td valign="top">referenceUrl</td>
+    <td valign="top">The URL of a reference document describing this type.</td>
+    <td valign="top"><tt>UTTypeReferenceURL</tt></td>
+    <td align="center" valign="top">No</td>
+  </tr>
+  <tr>
+    <td valign="top">conformsTo</td>
+    <td valign="top">A comma-separated list of UTIs to which this identifier conforms.
+    Although a custom UTI can conform to any UTI, <tt>public.data</tt> or <tt>com.apple.package</tt> must be at the root of the conformance hierarchy.</td>
+    <td valign="top"><tt>UTTypeConformsTo</tt></td>
+    <td align="center" valign="top">No (defaults to <tt>public.data</tt>)</td>
+  </tr>
+  <tr>
+    <td valign="top">extensions</td>
+    <td valign="top">A comma-separated list of filename extensions (minus the leading period) to map to this UTI.</td>
+    <td valign="top"><tt>UTTypeTagSpecification -> public.filename-extension</tt></td>
+    <td align="center" valign="top">No (but recommended)</td>
+  </tr>
+  <tr>
+    <td valign="top">mimeTypes</td>
+    <td valign="top">A comma-separated list of mime types which identify this UTI.</td>
+    <td valign="top"><tt>UTTypeTagSpecification -> public.mime-type</tt></td>
+    <td align="center" valign="top">No</td>
+  </tr>
+  <tr>
+    <td valign="top">osTypes</td>
+    <td valign="top">Comma-separated list of four-character codes formerly used to identify types.
+    Only specify OSTypes if you really know what you're doing.</td>
+    <td valign="top"><tt>UTTypeTagSpecification -> com.apple.ostype</tt></td>
+    <td align="center" valign="top">No</td>
+  </tr>
+  <tr>
+    <td valign="top">imported</td>
+    <td valign="top">If set to <tt>true</tt>, the declaration is listed under the <tt>UTImportedTypeDeclarations</tt> key. 
+    Otherwise, it is listed under <tt>UTExportedTypeDeclarations</tt>. 
+    If your code relies on third-party UTI types that may not be present on the system, you should declare those UTIs as imported types.</td>
+    <td valign="top">-</td>
+    <td align="center" valign="top">No</td>
+  </tr>
+</table>
+
 <h3>Examples</h3>
 <p>Generate a launcher for the "Swing Set" demo, bundling the JRE defined by the <tt>JAVA_HOME</tt>
 environment variable with the resulting executable.</p>
@@ -187,9 +504,57 @@ <h3>Examples</h3>
         &lt;runtime dir="${env.JAVA_HOME}"/&gt;
         &lt;classpath file="/Library/Java/Demos/JFC/SwingSet2/SwingSet2.jar"/&gt;
         &lt;option value="-Dapple.laf.useScreenMenuBar=true"/&gt;
+        &lt;scheme value="mailto"/&gt;
     &lt;/bundleapp&gt;
 &lt;/target&gt;
 </pre>
 
+<h3>Example 2: JNLP Launcher</h3>
+<p>Generate a launcher for a JNLP File, copy it into the package and sign the package. You need to have a Developer ID Profile to sign the application.</p>
+<p>You can now dynamically modify the zip content (only the JNLP file), deliver it with your web service and the application should directly unpack and can be run</p>
+<pre>
+&lt;-- Define the appbundler task --&gt;
+&lt;taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask"/&gt;
+
+&lt;-- Create the app bundle --&gt;
+&lt;target name="bundle-swingset" depends="package"&gt;
+
+    &lt;mkdir dir="./app"&gt;
+
+    &lt;bundleapp outputdirectory="./app"
+        name="SwingSet2"
+        displayname="SwingSet 2"
+        identifier="com.oracle.javax.swing.SwingSet2"
+        shortversion="1.0"
+        icon="icon.icns"
+        applicationCategory="public.app-category.developer-tools"
+        jnlplaunchername="Contents/_CodeSignature/SwingSet2.jnlp"&gt;
+        
+        &lt;value="-Xdock:icon=Contents/Resources/icon.icns" /&gt;
+        &lt;option value="-Dapple.laf.useScreenMenuBar=true"/&gt;
+    &lt;/bundleapp&gt;
+
+    &lt;!-- Optionally copy an original file --&gt;
+    &lt;copy todir="./SwingSet2.app/Contents/_CodeSignature" includeemptydirs="true" overwrite="false"&gt;
+        &lt;fileset dir="."&gt;
+            &lt;include name="**/*.jnlp" /&gt;
+        &lt;/fileset&gt;
+    &lt;/copy&gt;
+	
+    &lt;!-- Sign File --&gt;
+    &lt;exec executable="codesign" os="Mac OS X" failonerror="true"&gt;
+        &lt;arg value="-f" /&gt;
+        &lt;arg value="--deep" /&gt;
+        &lt;arg value="-s" /&gt;
+        &lt;arg value="Developer ID Application" /&gt;
+        &lt;arg value="./app/SwingSet2.app" /&gt;
+    &lt;/exec&gt;
+
+    &lt;zip destfile="./SwingSet2.app.zip" basedir="${copyroot}/app"&gt;&lt;/zip&gt;
+&lt;/target&gt;
+</pre>
+<pre>
+
+</pre>
 </body>
 </html>
\ No newline at end of file
diff --git a/build/macosx/appbundler/native/main.m b/build/macosx/appbundler/native/main.m
index cfcc5a9e70..510c371d78 100644
--- a/build/macosx/appbundler/native/main.m
+++ b/build/macosx/appbundler/native/main.m
@@ -27,6 +27,7 @@
 #import <Cocoa/Cocoa.h>
 #include <dlfcn.h>
 #include <jni.h>
+#include <pwd.h>
 
 #define JAVA_LAUNCH_ERROR "JavaLaunchError"
 
@@ -34,15 +35,34 @@
 #define WORKING_DIR "WorkingDirectory"
 #define JVM_MAIN_CLASS_NAME_KEY "JVMMainClassName"
 #define JVM_OPTIONS_KEY "JVMOptions"
+#define JVM_DEFAULT_OPTIONS_KEY "JVMDefaultOptions"
 #define JVM_ARGUMENTS_KEY "JVMArguments"
+#define JVM_CLASSPATH_KEY "JVMClassPath"
+#define JVM_VERSION_KEY "JVMVersion"
+#define JRE_PREFERRED_KEY "JREPreferred"
+#define JDK_PREFERRED_KEY "JDKPreferred"
+#define JVM_DEBUG_KEY "JVMDebug"
+#define IGNORE_PSN_KEY "IgnorePSN"
 
 #define JVM_RUN_PRIVILEGED "JVMRunPrivileged"
+#define JVM_RUN_JNLP "JVMJNLPLauncher"
+#define JVM_RUN_JAR "JVMJARLauncher"
+
 
 #define UNSPECIFIED_ERROR "An unknown error occurred."
 
 #define APP_ROOT_PREFIX "$APP_ROOT"
+#define JVM_RUNTIME "$JVM_RUNTIME"
+
+#define JAVA_RUNTIME  "/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home"
+#define LIBJLI_DY_LIB "lib/jli/libjli.dylib"
+#define DEPLOY_LIB    "lib/deploy.jar"
 
-#define LIBJLI_DYLIB "/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/lib/jli/libjli.dylib"
+//*
+    #define DLog(...) NSLog(@"%s %@", __PRETTY_FUNCTION__, [NSString stringWithFormat:__VA_ARGS__])
+/*/
+    #define DLog(...) do { } while (0)
+//*/
 
 typedef int (JNICALL *JLI_Launch_t)(int argc, char ** argv,
                                     int jargc, const char** jargv,
@@ -56,15 +76,32 @@ typedef int (JNICALL *JLI_Launch_t)(int argc, char ** argv,
                                     jboolean javaw,
                                     jint ergo);
 
-int launch(char *);
+static char** progargv = NULL;
+static int progargc = 0;
+static int launchCount = 0;
 
-int main(int argc, char *argv[]) {
+const char * tmpFile();
+int launch(char *, int, char **);
+
+NSString * findJavaDylib (NSString *, bool, bool, bool, bool);
+NSString * findJREDylib (int, bool, bool);
+NSString * findJDKDylib (int, bool, bool);
+int extractMajorVersion (NSString *);
+NSString * convertRelativeFilePath(NSString *);
+NSString * addDirectoryToSystemArguments(NSUInteger, NSSearchPathDomainMask, NSString *, NSMutableArray *);
+void addModifierFlagToSystemArguments(NSEventModifierFlags, NSString *, NSEventModifierFlags, NSMutableArray *);
 
+int main(int argc, char *argv[]) {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
     int result;
     @try {
-        launch(argv[0]);
+    	if ((argc > 1) && (launchCount == 0)) {
+    		progargc = argc - 1;
+    		progargv = &argv[1];
+    	}
+
+        launch(argv[0], progargc, progargv);
         result = 0;
     } @catch (NSException *exception) {
         NSAlert *alert = [[NSAlert alloc] init];
@@ -80,14 +117,11 @@ int main(int argc, char *argv[]) {
     return result;
 }
 
-int launch(char *commandName) {
+int launch(char *commandName, int progargc, char *progargv[]) {
 
-    //Attempt to disable Inertia scroll
-    //From https://developer.apple.com/library/mac/releasenotes/DriversKernelHardware/RN-MagicMouse/
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    NSDictionary *appDefaults = [NSDictionary dictionaryWithObject:@"NO"
-       forKey:@"AppleMomentumScrollSupported"];
-    [defaults registerDefaults:appDefaults];
+    // Preparation for jnlp launcher arguments
+    const char *const_jargs = NULL;
+    const char *const_appclasspath = NULL;
 
     // Get the main bundle
     NSBundle *mainBundle = [NSBundle mainBundle];
@@ -95,39 +129,120 @@ int launch(char *commandName) {
     // Get the main bundle's info dictionary
     NSDictionary *infoDictionary = [mainBundle infoDictionary];
 
+    // Test for debugging (but only on the second runthrough)
+    bool isDebugging = [[infoDictionary objectForKey:@JVM_DEBUG_KEY] boolValue];
+
+    if (isDebugging) {
+        DLog(@"\n\n\n\nLoading Application '%@'", [infoDictionary objectForKey:@"CFBundleName"]);
+    }
+
     // Set the working directory based on config, defaulting to the user's home directory
     NSString *workingDir = [infoDictionary objectForKey:@WORKING_DIR];
     if (workingDir != nil) {
         workingDir = [workingDir stringByReplacingOccurrencesOfString:@APP_ROOT_PREFIX withString:[mainBundle bundlePath]];
     } else {
-        workingDir = NSHomeDirectory();
+        workingDir = [[NSFileManager defaultManager] currentDirectoryPath];
+        workingDir = NSHomeDirectory(); // REVIEW: Check which if these ones is realy the users home directory ...
+    }
+    if (isDebugging) {
+    	DLog(@"Working Directory: '%@'", convertRelativeFilePath(workingDir));
     }
 
     chdir([workingDir UTF8String]);
 
     // execute privileged
     NSString *privileged = [infoDictionary objectForKey:@JVM_RUN_PRIVILEGED];
-    if (privileged != nil && getuid() != 0) {
+    if ( privileged != nil && getuid() != 0 ) {
         NSDictionary *error = [NSDictionary new];
+
         NSString *script =  [NSString stringWithFormat:@"do shell script \"\\\"%@\\\" > /dev/null 2>&1 &\" with administrator privileges", [NSString stringWithCString:commandName encoding:NSASCIIStringEncoding]];
+
+        if (isDebugging) {
+            DLog(@"script: %@", script);
+        }
+
         NSAppleScript *appleScript = [[NSAppleScript new] initWithSource:script];
         if ([appleScript executeAndReturnError:&error]) {
             // This means we successfully elevated the application and can stop in here.
-	    return 0;  // Should this return 'error' instead? [fry]
+            return 0;
         }
     }
 
     // Locate the JLI_Launch() function
     NSString *runtime = [infoDictionary objectForKey:@JVM_RUNTIME_KEY];
+    NSString *runtimePath = [[mainBundle builtInPlugInsPath] stringByAppendingPathComponent:runtime];
 
-    const char *libjliPath = NULL;
+    NSString *jvmRequired = [infoDictionary objectForKey:@JVM_VERSION_KEY];
+    bool exactVersionMatch = false;
+    bool jrePreferred = [[infoDictionary objectForKey:@JRE_PREFERRED_KEY] boolValue];
+    bool jdkPreferred = [[infoDictionary objectForKey:@JDK_PREFERRED_KEY] boolValue];
+
+    if (jrePreferred && jdkPreferred) {
+        DLog(@"Specifying both JRE- and JDK-preferred means neither is preferred");
+        jrePreferred = false;
+        jdkPreferred = false;
+    }
+
+    // check for jnlp launcher name
+    // This basically circumvents the security problems introduced with 10.8.4 that JNLP Files must be signed to execute them without CTRL+CLick -> Open
+    // See: How to sign (dynamic) JNLP files for OSX 10.8.4 and Gatekeeper http://stackoverflow.com/questions/16958130/how-to-sign-dynamic-jnlp-files-for-osx-10-8-4-and-gatekeeper
+    // There is no solution to properly sign a dynamic jnlp file to date. Both Apple and Oracle have open rdars/tickets on this.
+    // The following mechanism encapsulates a JNLP file/template. It makes a temporary copy when executing. This ensures that the JNLP file can be updates from the server at runtime.
+    // YES, this may insert additional security threats, but it is still the only way to avoid permission problems.
+    // It is highly recommended that the resulting .app container is being signed with a certificate from Apple - otherwise you will not need this mechanism.
+    // Moved up here to check if we want to launch a JNLP. If so: make sure the version is below 9
+    NSString *jnlplauncher = [infoDictionary objectForKey:@JVM_RUN_JNLP];
+    if ( jnlplauncher != nil ) {
+        int required = 8;
+        if ( jvmRequired != nil ) {
+            required = extractMajorVersion (jvmRequired);
+            if (required > 8) { required = 8; }
+        }
+
+        exactVersionMatch = true;
+        jvmRequired = [NSString stringWithFormat:@"1.%i", required];
+        DLog(@"Will Require a JVM version '%i' due to JNLP restrictions", required);
+    }
+
+    NSString *javaDylib;
+
+    // If a runtime is set, we really want it. If it is not there, we will fail later on.
     if (runtime != nil) {
-        NSString *runtimePath = [[[NSBundle mainBundle] builtInPlugInsPath] stringByAppendingPathComponent:runtime];
-        libjliPath = [[runtimePath stringByAppendingPathComponent:@"Contents/Home/jre/lib/jli/libjli.dylib"] fileSystemRepresentation];
-    } else {
-        libjliPath = LIBJLI_DYLIB;
+        NSString *dylibRelPath = @"Contents/Home/jre";
+        javaDylib = [[runtimePath stringByAppendingPathComponent:dylibRelPath] stringByAppendingPathComponent:@LIBJLI_DY_LIB];
+        BOOL isDir;
+        NSFileManager *fm = [[NSFileManager alloc] init];
+        BOOL javaDylibFileExists = [fm fileExistsAtPath:javaDylib isDirectory:&isDir];
+        if (!javaDylibFileExists || isDir) {
+            dylibRelPath = @"Contents/Home";
+            javaDylib = [[runtimePath stringByAppendingPathComponent:dylibRelPath] stringByAppendingPathComponent:@LIBJLI_DY_LIB];
+            javaDylibFileExists = [fm fileExistsAtPath:javaDylib isDirectory:&isDir];
+                if (!javaDylibFileExists || isDir) {
+                    javaDylib = NULL;
+                }
+        }
+        if (isDebugging) {
+            DLog(@"Java Runtime (%@) Relative Path: '%@' (dylib: %@)", runtime, runtimePath, javaDylib);
+        }
+    }
+    else {
+        // Search for the runtimePath, then make it a libjli.dylib path.
+        runtimePath = findJavaDylib (jvmRequired, jrePreferred, jdkPreferred, isDebugging, exactVersionMatch);
+        javaDylib = [runtimePath stringByAppendingPathComponent:@LIBJLI_DY_LIB];
+
+        if (isDebugging) {
+            DLog(@"Java Runtime Dylib Path: '%@'", convertRelativeFilePath(javaDylib));
+        }
+    }
+
+    const char *libjliPath = NULL;
+    if (javaDylib != nil)
+    {
+        libjliPath = [javaDylib fileSystemRepresentation];
     }
 
+    DLog(@"Launchpath: %s", libjliPath);
+
     void *libJLI = dlopen(libjliPath, RTLD_LAZY);
 
     JLI_Launch_t jli_LaunchFxnPtr = NULL;
@@ -136,123 +251,338 @@ int launch(char *commandName) {
     }
 
     if (jli_LaunchFxnPtr == NULL) {
-        [[NSException exceptionWithName:@JAVA_LAUNCH_ERROR
-            reason:NSLocalizedString(@"JRELoadError", @UNSPECIFIED_ERROR)
-            userInfo:nil] raise];
-    }
+        NSString *msg;
+
+        if (runtime == nil && jvmRequired != nil) {
+            int required = extractMajorVersion (jvmRequired);
+
+            if (required < 7) { required = 7; }
+
+            if (jdkPreferred) {
+                NSString *msga = NSLocalizedString(@"JDKxLoadFullError", @UNSPECIFIED_ERROR);
+                msg = [NSString stringWithFormat:msga, required];
+            }
+            else {
+                NSString *msga = NSLocalizedString(@"JRExLoadFullError", @UNSPECIFIED_ERROR);
+                msg = [NSString stringWithFormat:msga, required];
+            }
+        }
+        else {
+            msg = NSLocalizedString(@"JRELoadError", @UNSPECIFIED_ERROR);
+        }
+
+        DLog(@"Error launching JVM Runtime (%@) Relative Path: '%@' (dylib: %@)\n  error: %@",
+              runtime, runtimePath, javaDylib, msg);
 
-    // Get the main class name
-    NSString *mainClassName = [infoDictionary objectForKey:@JVM_MAIN_CLASS_NAME_KEY];
-    if (mainClassName == nil) {
         [[NSException exceptionWithName:@JAVA_LAUNCH_ERROR
-            reason:NSLocalizedString(@"MainClassNameRequired", @UNSPECIFIED_ERROR)
-            userInfo:nil] raise];
+                reason:msg userInfo:nil] raise];
     }
 
     // Set the class path
+    NSFileManager *defaultFileManager = [NSFileManager defaultManager];
     NSString *mainBundlePath = [mainBundle bundlePath];
-    NSString *javaPath =
-        [mainBundlePath stringByAppendingString:@"/Contents/Java"];
-        // Changed Contents/Java to the old Contents/Resources/Java [fry]
-        //[mainBundlePath stringByAppendingString:@"/Contents/Resources/Java"];
-    // Removed the /Classes, because the P5 compiler (ECJ?) will throw an
-    // error if it doesn't exist. But it's harmless to leave the root dir,
-    // since it will always exist, and I guess if you wanted to put .class
-    // files in there, they'd work. If I knew more Cocoa, I'd just make this
-    // an empty string to start, to be appended a few lines later. [fry]
-    //NSMutableString *classPath = [NSMutableString stringWithFormat:@"-Djava.class.path=%@/Classes", javaPath];
-    NSMutableString *classPath = [NSMutableString stringWithFormat:@"-Djava.class.path=%@", javaPath];
 
-    NSFileManager *defaultFileManager = [NSFileManager defaultManager];
-    NSArray *javaDirectoryContents =
-        [defaultFileManager contentsOfDirectoryAtPath:javaPath error:nil];
-    if (javaDirectoryContents == nil) {
+    // make sure the bundle path does not contain a colon, as that messes up the java.class.path,
+    // because colons are used a path separators and cannot be escaped.
+
+    // funny enough, Finder does not let you create folder with colons in their names,
+    // but when you create a folder with a slash, e.g. "audio/video", it is accepted
+    // and turned into... you guessed it, a colon:
+    // "audio:video"
+    if ([mainBundlePath rangeOfString:@":"].location != NSNotFound) {
         [[NSException exceptionWithName:@JAVA_LAUNCH_ERROR
-            reason:NSLocalizedString(@"JavaDirectoryNotFound", @UNSPECIFIED_ERROR)
-            userInfo:nil] raise];
+                                 reason:NSLocalizedString(@"BundlePathContainsColon", @UNSPECIFIED_ERROR)
+                               userInfo:nil] raise];
     }
-
-    for (NSString *file in javaDirectoryContents) {
-        if ([file hasSuffix:@".jar"]) {
-            [classPath appendFormat:@":%@/%@", javaPath, file];
-        }
+    if (isDebugging) {
+        NSLog(@"Main Bundle Path: '%@'", mainBundlePath);
     }
 
-    /*
-    // search the 'lib' subfolder as well [fry]
-    NSString *libPath =
-      [mainBundlePath stringByAppendingString:@"/Contents/Resources/Java/lib"];
-    NSArray *libDirectoryContents =
-      [defaultFileManager contentsOfDirectoryAtPath:libPath error:nil];
-    if (libDirectoryContents != nil) {
-      for (NSString *file in libDirectoryContents) {
-        if ([file hasSuffix:@".jar"]) {
-	  [classPath appendFormat:@":%@/%@", libPath, file];
-        }
-      }
-    }
-    */
+    // Set the class path
+    NSString *javaPath = [mainBundlePath stringByAppendingString:@"/Contents/Java"];
+    NSMutableArray *systemArguments = [[NSMutableArray alloc] init];
+    NSMutableString *classPath = [NSMutableString stringWithString:@"-Djava.class.path="];
 
     // Set the library path
-    NSString *libraryPath = [NSString stringWithFormat:@"-Djava.library.path=:%@/Contents/Java:%@/Contents/MacOS", mainBundlePath, mainBundlePath];
+    NSString *libraryPath = [NSString stringWithFormat:@"-Djava.library.path=%@/Contents/MacOS", mainBundlePath];
+    [systemArguments addObject:libraryPath];
 
     // Get the VM options
-    NSArray *options = [infoDictionary objectForKey:@JVM_OPTIONS_KEY];
+    NSMutableArray *options = [[infoDictionary objectForKey:@JVM_OPTIONS_KEY] mutableCopy];
     if (options == nil) {
-        options = [NSArray array];
+        options = [NSMutableArray array];
+    }
+
+    // Get the VM default options
+    NSArray *defaultOptions = [NSArray array];
+    NSDictionary *defaultOptionsDict = [infoDictionary objectForKey:@JVM_DEFAULT_OPTIONS_KEY];
+    if (defaultOptionsDict != nil) {
+        NSMutableDictionary *defaults = [NSMutableDictionary dictionaryWithDictionary: defaultOptionsDict];
+        // Replace default options with user specific options, if available
+        NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+        // Create special key that should be used by Java's java.util.Preferences impl
+        // Requires us to use "/" + bundleIdentifier.replace('.', '/') + "/JVMOptions/" as node on the Java side
+        // Beware: bundleIdentifiers shorter than 3 segments are placed in a different file!
+        // See java/util/prefs/MacOSXPreferences.java of OpenJDK for details
+        NSString *bundleDictionaryKey = [mainBundle bundleIdentifier];
+        bundleDictionaryKey = [bundleDictionaryKey stringByReplacingOccurrencesOfString:@"." withString:@"/"];
+        bundleDictionaryKey = [NSString stringWithFormat: @"/%@/", bundleDictionaryKey];
+
+        NSDictionary *bundleDictionary = [userDefaults dictionaryForKey: bundleDictionaryKey];
+        if (bundleDictionary != nil) {
+            NSDictionary *jvmOptionsDictionary = [bundleDictionary objectForKey: @"JVMOptions/"];
+            for (NSString *key in jvmOptionsDictionary) {
+                NSString *value = [jvmOptionsDictionary objectForKey:key];
+                [defaults setObject: value forKey: key];
+            }
+        }
+        defaultOptions = [defaults allValues];
     }
 
     // Get the application arguments
-    NSArray *arguments = [infoDictionary objectForKey:@JVM_ARGUMENTS_KEY];
+    NSMutableArray *arguments = [[infoDictionary objectForKey:@JVM_ARGUMENTS_KEY] mutableCopy];
     if (arguments == nil) {
-        arguments = [NSArray array];
+        arguments = [NSMutableArray array];
+    }
+
+    // Check for a defined JAR File below the Contents/Java folder
+    // If set, use this instead of a classpath setting
+    NSString *jarlauncher = [infoDictionary objectForKey:@JVM_RUN_JAR];
+
+    // Get the main class name
+    NSString *mainClassName = [infoDictionary objectForKey:@JVM_MAIN_CLASS_NAME_KEY];
+
+    if ( jnlplauncher != nil ) {
+
+        const_appclasspath = [[runtimePath stringByAppendingPathComponent:@DEPLOY_LIB] fileSystemRepresentation];
+
+        // JNLP Launcher found, need to modify quite a bit now
+        [options addObject:@"-classpath"];
+        [options addObject:[NSString stringWithFormat:@"%s", const_appclasspath]];
+
+        // unset the original classpath
+        classPath = nil;
+
+        // Main Class is javaws
+        mainClassName=@"com.sun.javaws.Main";
+
+        // Optional stuff that javaws would do as well
+        [options addObject:@"-Dsun.awt.warmup=true"];
+        [options addObject:@"-Xverify:remote"];
+        [options addObject:@"-Djnlpx.remove=true"];
+        [options addObject:@"-DtrustProxy=true"];
+
+        [options addObject:[NSString stringWithFormat:@"-Djava.security.policy=file:%@/lib/security/javaws.policy", runtimePath]];
+        [options addObject:[NSString stringWithFormat:@"-Xbootclasspath/a:%@/lib/javaws.jar:%@/lib/deploy.jar:%@/lib/plugin.jar", runtimePath, runtimePath, runtimePath]];
+
+        // Argument that javaws does also
+        // [arguments addObject:@"-noWebStart"];
+
+        // Copy the jnlp to a temporary location
+        NSError *copyerror = nil;
+        NSString *tempFileName = [NSString stringWithCString:tmpFile() encoding:NSASCIIStringEncoding];
+        // File now exists.
+        [defaultFileManager removeItemAtPath:tempFileName error:NULL];
+
+        // Check if this is absolute or relative (else)
+        NSString *jnlpPath = [mainBundlePath stringByAppendingPathComponent:jnlplauncher];
+        if ( ![defaultFileManager fileExistsAtPath:jnlpPath] ) {
+            jnlpPath = [javaPath stringByAppendingPathComponent:jnlplauncher];
+        }
+
+        [defaultFileManager copyItemAtURL:[NSURL fileURLWithPath:jnlpPath] toURL:[NSURL fileURLWithPath:tempFileName] error:&copyerror];
+        if ( copyerror != nil ) {
+            NSLog(@"Error: %@", copyerror);
+            [[NSException exceptionWithName:@"Error while copying JNLP File"
+                                     reason:@"File copy error"
+                                   userInfo:copyerror.userInfo] raise];
+        }
+
+        // Add the jnlp as argument so that javaws.Main can read and delete it
+        [arguments addObject:tempFileName];
+
+    } else
+    // Either mainClassName or jarLauncher has to be set since this is not a jnlpLauncher
+    if ( mainClassName == nil && jarlauncher == nil ) {
+        [[NSException exceptionWithName:@JAVA_LAUNCH_ERROR
+            reason:NSLocalizedString(@"MainClassNameRequired", @UNSPECIFIED_ERROR)
+            userInfo:nil] raise];
+    }
+
+    if (isDebugging) {
+        DLog(@"Main Class Name: '%@'", mainClassName);
+    }
+
+    // If a jar file is defined as launcher, disacard the javaPath
+    if ( jarlauncher != nil ) {
+        [classPath appendFormat:@":%@/%@", javaPath, jarlauncher];
+    } else {
+
+        NSArray *cp = [infoDictionary objectForKey:@JVM_CLASSPATH_KEY];
+        if (cp == nil) {
+
+            // Implicit classpath, so use the contents of the "Java" folder to build an explicit classpath
+
+            [classPath appendFormat:@"%@/Classes", javaPath];
+            NSFileManager *defaultFileManager = [NSFileManager defaultManager];
+            NSArray *javaDirectoryContents = [defaultFileManager contentsOfDirectoryAtPath:javaPath error:nil];
+            if (javaDirectoryContents == nil) {
+                [[NSException exceptionWithName:@JAVA_LAUNCH_ERROR
+                                         reason:NSLocalizedString(@"JavaDirectoryNotFound", @UNSPECIFIED_ERROR)
+                                       userInfo:nil] raise];
+            }
+
+            for (NSString *file in javaDirectoryContents) {
+                if ([file hasSuffix:@".jar"]) {
+                    [classPath appendFormat:@":%@/%@", javaPath, file];
+                }
+            }
+
+        } else {
+
+            // Explicit ClassPath
+
+            int k = 0;
+            for (NSString *file in cp) {
+                if (k++ > 0) [classPath appendString:@":"]; // add separator if needed
+                file = [file stringByReplacingOccurrencesOfString:@APP_ROOT_PREFIX withString:[mainBundle bundlePath]];
+                [classPath appendString:file];
+            }
+        }
+    }
+
+    if ( classPath != nil ) {
+        [systemArguments addObject:classPath];
     }
 
     // Set OSX special folders
-    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory,
-            NSUserDomainMask, YES);
-    NSString *basePath = [paths objectAtIndex:0];
-    NSString *libraryDirectory = [NSString stringWithFormat:@"-DLibraryDirectory=%@", basePath];
-
-    paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory,
-            NSUserDomainMask, YES);
-    basePath = [paths objectAtIndex:0];
-    NSString *documentsDirectory = [NSString stringWithFormat:@"-DDocumentsDirectory=%@", basePath];
-
-    paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory,
-            NSUserDomainMask, YES);
-    basePath = [paths objectAtIndex:0];
-    NSString *applicationSupportDirectory = [NSString stringWithFormat:@"-DApplicationSupportDirectory=%@", basePath];
-
-    paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory,
-            NSUserDomainMask, YES);
-    basePath = [paths objectAtIndex:0];
-    NSString *cachesDirectory = [NSString stringWithFormat:@"-DCachesDirectory=%@", basePath];
-
-    NSString *sandboxEnabled = @"true";
-    if ([basePath rangeOfString:@"Containers"].location == NSNotFound) {
-        sandboxEnabled = @"false";
+    NSString * libraryDirectory = addDirectoryToSystemArguments(NSLibraryDirectory, NSUserDomainMask, @"LibraryDirectory", systemArguments);
+    addDirectoryToSystemArguments(NSDocumentDirectory, NSUserDomainMask, @"DocumentsDirectory", systemArguments);
+    addDirectoryToSystemArguments(NSApplicationSupportDirectory, NSUserDomainMask, @"ApplicationSupportDirectory", systemArguments);
+    addDirectoryToSystemArguments(NSCachesDirectory, NSUserDomainMask, @"CachesDirectory", systemArguments);
+    addDirectoryToSystemArguments(NSApplicationDirectory, NSUserDomainMask, @"ApplicationDirectory", systemArguments);
+    addDirectoryToSystemArguments(NSAutosavedInformationDirectory, NSUserDomainMask, @"AutosavedInformationDirectory", systemArguments);
+    addDirectoryToSystemArguments(NSDesktopDirectory, NSUserDomainMask, @"DesktopDirectory", systemArguments);
+    addDirectoryToSystemArguments(NSDownloadsDirectory, NSUserDomainMask, @"DownloadsDirectory", systemArguments);
+    addDirectoryToSystemArguments(NSMoviesDirectory, NSUserDomainMask, @"MoviesDirectory", systemArguments);
+    addDirectoryToSystemArguments(NSMusicDirectory, NSUserDomainMask, @"MusicDirectory", systemArguments);
+    addDirectoryToSystemArguments(NSPicturesDirectory, NSUserDomainMask, @"PicturesDirectory", systemArguments);
+    addDirectoryToSystemArguments(NSSharedPublicDirectory, NSUserDomainMask, @"SharedPublicDirectory", systemArguments);
+
+    addDirectoryToSystemArguments(NSLibraryDirectory, NSLocalDomainMask, @"SystemLibraryDirectory", systemArguments);
+    addDirectoryToSystemArguments(NSApplicationSupportDirectory, NSLocalDomainMask, @"SystemApplicationSupportDirectory", systemArguments);
+    addDirectoryToSystemArguments(NSCachesDirectory, NSLocalDomainMask, @"SystemCachesDirectory", systemArguments);
+    addDirectoryToSystemArguments(NSApplicationDirectory, NSLocalDomainMask, @"SystemApplicationDirectory", systemArguments);
+    addDirectoryToSystemArguments(NSUserDirectory, NSLocalDomainMask, @"SystemUserDirectory", systemArguments);
+
+    // get the user's home directory, independent of the sandbox container
+    int bufsize;
+    if ((bufsize = sysconf(_SC_GETPW_R_SIZE_MAX)) != -1) {
+        char buffer[bufsize];
+        struct passwd pwd, *result = NULL;
+        if (getpwuid_r(getuid(), &pwd, buffer, bufsize, &result) == 0 && result) {
+            [systemArguments addObject:[NSString stringWithFormat:@"-DUserHome=%s", pwd.pw_dir]];
+        }
+    }
+
+    //Sandbox
+    NSString *containersDirectory = [libraryDirectory stringByAppendingPathComponent:@"Containers"];
+    NSString *sandboxEnabled = @"false";
+    BOOL isDir;
+    NSFileManager *fm = [[NSFileManager alloc] init];
+    BOOL containersDirExists = [fm fileExistsAtPath:containersDirectory isDirectory:&isDir];
+    if (containersDirExists && isDir) {
+        sandboxEnabled = @"true";
     }
     NSString *sandboxEnabledVar = [NSString stringWithFormat:@"-DSandboxEnabled=%@", sandboxEnabled];
+    [systemArguments addObject:sandboxEnabledVar];
+
+
+    // Mojave Dark Mode enabled?
+    NSString *osxMode = [[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"];
+    BOOL isDarkMode = (osxMode != nil && [osxMode isEqualToString:@"Dark"]);
+
+    NSString *darkModeEnabledVar = [NSString stringWithFormat:@"-DDarkMode=%s",
+                                                    (isDarkMode ? "true" : "false")];
+    [systemArguments addObject:darkModeEnabledVar];
+
+	// Check for modifier keys on app launch
+
+	// Since [NSEvent modifierFlags] is only available since OS X 10.6., only add properties if supported.
+	if ([NSEvent respondsToSelector:@selector(modifierFlags)]) {
+		NSEventModifierFlags launchModifierFlags = [NSEvent modifierFlags] & NSEventModifierFlagDeviceIndependentFlagsMask;
+
+		[systemArguments addObject:[NSString stringWithFormat:@"-DLaunchModifierFlags=%lu", (unsigned long)launchModifierFlags]];
+
+		addModifierFlagToSystemArguments(NSEventModifierFlagCapsLock, @"LaunchModifierFlagCapsLock", launchModifierFlags, systemArguments);
+		addModifierFlagToSystemArguments(NSEventModifierFlagShift, @"LaunchModifierFlagShift", launchModifierFlags, systemArguments);
+		addModifierFlagToSystemArguments(NSEventModifierFlagControl, @"LaunchModifierFlagControl", launchModifierFlags, systemArguments);
+		addModifierFlagToSystemArguments(NSEventModifierFlagOption, @"LaunchModifierFlagOption", launchModifierFlags, systemArguments);
+		addModifierFlagToSystemArguments(NSEventModifierFlagCommand, @"LaunchModifierFlagCommand", launchModifierFlags, systemArguments);
+		addModifierFlagToSystemArguments(NSEventModifierFlagNumericPad, @"LaunchModifierFlagNumericPad", launchModifierFlags, systemArguments);
+		addModifierFlagToSystemArguments(NSEventModifierFlagHelp, @"LaunchModifierFlagHelp", launchModifierFlags, systemArguments);
+		addModifierFlagToSystemArguments(NSEventModifierFlagFunction, @"LaunchModifierFlagFunction", launchModifierFlags, systemArguments);
+	}
+
+
+
+    // Remove -psn argument
+    int newProgargc = progargc;
+    char *newProgargv[newProgargc];
+    for (int i = 0; i < progargc; i++) {
+        newProgargv[i] = progargv[i];
+    }
+
+    bool ignorePSN = [[infoDictionary objectForKey:@IGNORE_PSN_KEY] boolValue];
+    if (ignorePSN) {
+        NSString *psnRegexp = @"^-psn_\\d_\\d+$";
+        NSPredicate *psnTest = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", psnRegexp];
+
+        int shift = 0;
+        int i = 0;
+        while (i < newProgargc) {
+            NSString *s = [NSString stringWithFormat:@"%s", newProgargv[i]];
+            if ([psnTest evaluateWithObject: s]){
+                shift++;
+                newProgargc--;
+            }
+            newProgargv[i] = newProgargv[i+shift];
+            i++;
+        }
+    }
+
+    // replace $APP_ROOT in environment variables
+    NSDictionary* environment = [[NSProcessInfo processInfo] environment];
+    for (NSString* key in environment) {
+        NSString* value = [environment objectForKey:key];
+        NSString* newValue = [value stringByReplacingOccurrencesOfString:@APP_ROOT_PREFIX withString:[mainBundle bundlePath]];
+        if (! [newValue isEqualToString:value]) {
+            setenv([key UTF8String], [newValue UTF8String], 1);
+        }
+    }
 
     // Initialize the arguments to JLI_Launch()
     // +5 due to the special directories and the sandbox enabled property
-    int argc = 1 + [options count] + 2 + [arguments count] + 1 + 5;
+    int argc = 1 + [systemArguments count] + [options count] + [defaultOptions count] + 1 + [arguments count] + newProgargc;
     char *argv[argc];
 
     int i = 0;
     argv[i++] = commandName;
-    argv[i++] = strdup([classPath UTF8String]);
-    argv[i++] = strdup([libraryPath UTF8String]);
-    argv[i++] = strdup([libraryDirectory UTF8String]);
-    argv[i++] = strdup([documentsDirectory UTF8String]);
-    argv[i++] = strdup([applicationSupportDirectory UTF8String]);
-    argv[i++] = strdup([cachesDirectory UTF8String]);
-    argv[i++] = strdup([sandboxEnabledVar UTF8String]);
+    for (NSString *systemArgument in systemArguments) {
+    	argv[i++] = strdup([systemArgument UTF8String]);
+    }
 
     for (NSString *option in options) {
         option = [option stringByReplacingOccurrencesOfString:@APP_ROOT_PREFIX withString:[mainBundle bundlePath]];
+        option = [option stringByReplacingOccurrencesOfString:@JVM_RUNTIME withString:runtimePath];
         argv[i++] = strdup([option UTF8String]);
+        if (isDebugging) { DLog(@"Option: %@",option); }
+    }
+
+    for (NSString *defaultOption in defaultOptions) {
+        defaultOption = [defaultOption stringByReplacingOccurrencesOfString:@APP_ROOT_PREFIX withString:[mainBundle bundlePath]];
+        argv[i++] = strdup([defaultOption UTF8String]);
+        if (isDebugging) { DLog(@"DefaultOption: %@",defaultOption); }
     }
 
     argv[i++] = strdup([mainClassName UTF8String]);
@@ -262,16 +592,361 @@ int launch(char *commandName) {
         argv[i++] = strdup([argument UTF8String]);
     }
 
+	int ctr = 0;
+	for (ctr = 0; ctr < newProgargc; ctr++) {
+		argv[i++] = newProgargv[ctr];
+	}
+
+    // Print the full command line for debugging purposes...
+    if (isDebugging) {
+        DLog(@"Command line passed to application:");
+        int j=0;
+        for(j=0; j<i; j++) {
+            DLog(@"Arg %d: '%s'", j, argv[j]);
+        }
+    }
+
+	launchCount++;
+
     // Invoke JLI_Launch()
     return jli_LaunchFxnPtr(argc, argv,
-                            0, NULL,
-                            0, NULL,
+                            sizeof(&const_jargs) / sizeof(char *), &const_jargs,
+                            sizeof(&const_appclasspath) / sizeof(char *), &const_appclasspath,
                             "",
                             "",
                             "java",
                             "java",
-                            FALSE,
+                            (const_jargs != NULL) ? JNI_TRUE : JNI_FALSE,
                             FALSE,
                             FALSE,
                             0);
 }
+
+/*
+ * Convenient Method to create a temporary JNLP file(name)
+ * This file will be deleted by the JLI_Launch when the program ends.
+ */
+const char * tmpFile() {
+    NSString *tempFileTemplate = [NSTemporaryDirectory()
+                                  stringByAppendingPathComponent:@"jnlpFile.XXXXXX.jnlp"];
+
+    const char *tempFileTemplateCString = [tempFileTemplate fileSystemRepresentation];
+
+    char *tempFileNameCString = (char *)malloc(strlen(tempFileTemplateCString) + 1);
+    strcpy(tempFileNameCString, tempFileTemplateCString);
+    int fileDescriptor = mkstemps(tempFileNameCString, 5);
+
+    // no need to keep it open
+    close(fileDescriptor);
+
+    if (fileDescriptor == -1) {
+        DLog(@"Error while creating tmp file");
+        return nil;
+    }
+
+    NSString *tempFileName = [[NSFileManager defaultManager]
+                              stringWithFileSystemRepresentation:tempFileNameCString
+                              length:strlen(tempFileNameCString)];
+
+    free(tempFileNameCString);
+
+    return [tempFileName fileSystemRepresentation];
+}
+
+/**
+ *  Searches for a JRE or JDK dylib of the specified version or later.
+ *  First checks the "usual" JRE location, and failing that looks for a JDK.
+ *  The version required should be a string of form "1.X". If no version is
+ *  specified or the version is pre-1.7, then a Java 1.7 is sought.
+ */
+NSString * findJavaDylib (
+        NSString *jvmRequired,
+        bool jrePreferred,
+        bool jdkPreferred,
+        bool isDebugging,
+        bool exactMatch)
+{
+    DLog (@"Searching for a JRE.");
+    int required = extractMajorVersion(jvmRequired);
+
+    if (required < 7)
+    {
+        if (isDebugging) { DLog (@"Required JVM must be at least ver. 7."); }
+        required = 7;
+    }
+
+    if (isDebugging) {
+        DLog (@"Searching for a Java %d", required);
+    }
+
+    //  First, if a JRE is acceptible, try to find one with required Java version.
+    //  If found, return address for dylib that should be in the JRE package.
+    if (jdkPreferred) {
+        if (isDebugging) {
+            DLog (@"A JDK is preferred; will not search for a JRE.");
+        }
+    }
+    else {
+        NSString * dylib = findJREDylib (required, isDebugging, exactMatch);
+
+        if (dylib != nil) { return dylib; }
+
+        if (isDebugging) { DLog (@"No matching JRE found."); }
+    }
+
+    // If JRE not found or if JDK preferred, look for an acceptable JDK
+    // (probably in /Library/Java/JavaVirtualMachines if so). If found,
+    // return return address of dylib in the JRE within the JDK.
+    if (jrePreferred) {
+        if (isDebugging) {
+            DLog (@"A JRE is preferred; will not search for a JDK.");
+        }
+    }
+    else {
+        NSString * dylib = findJDKDylib (required, isDebugging, exactMatch);
+
+        if (dylib != nil) { return dylib; }
+
+        if (isDebugging) { DLog (@"No matching JDK found."); }
+    }
+
+    DLog (@"No matching JRE or JDK found.");
+
+    return nil;
+}
+
+/**
+ *  Searches for a JRE dylib of the specified version or later.
+ */
+NSString * findJREDylib (
+        int jvmRequired,
+        bool isDebugging,
+        bool exactMatch)
+{
+    // Try the "java -version" shell command and see if we get a response and
+    // if so whether the version  is acceptable.
+    // If found, return address for dylib that should be in the JRE package.
+    // Note that for unknown but ancient reasons, the result is output to stderr
+    // rather than to stdout.
+    @try
+    {
+        NSTask *task = [[NSTask alloc] init];
+        [task setLaunchPath:[@JAVA_RUNTIME stringByAppendingPathComponent:@"bin/java"]];
+
+        NSArray *args = [NSArray arrayWithObjects: @"-version", nil];
+        [task setArguments:args];
+
+        NSPipe *stdout = [NSPipe pipe];
+        [task setStandardOutput:stdout];
+
+        NSPipe *stderr = [NSPipe pipe];
+        [task setStandardError:stderr];
+
+        [task setStandardInput:[NSPipe pipe]];
+
+        NSFileHandle *outHandle = [stdout fileHandleForReading];
+        NSFileHandle *errHandle = [stderr fileHandleForReading];
+
+        [task launch];
+        [task waitUntilExit];
+        [task release];
+
+        NSData *data1 = [outHandle readDataToEndOfFile];
+        NSData *data2 = [errHandle readDataToEndOfFile];
+
+        NSString *outRead = [[NSString alloc] initWithData:data1
+                                                  encoding:NSUTF8StringEncoding];
+        NSString *errRead = [[NSString alloc] initWithData:data2
+                                                  encoding:NSUTF8StringEncoding];
+
+    //  Found something in errRead. Parse it for a Java version string and
+    //  try to extract a major version number.
+        if (errRead != nil) {
+            int version = 0;
+
+            // The result of the version command is 'java version "1.x"' or 'java version "9"'
+            NSRange vrange = [errRead rangeOfString:@"java version \""];
+
+            if (vrange.location != NSNotFound) {
+                NSString *vstring = [errRead substringFromIndex:(vrange.location + 14)];
+
+                vrange  = [vstring rangeOfString:@"\""];
+                vstring = [vstring substringToIndex:vrange.location];
+
+                version = extractMajorVersion(vstring);
+
+                if (isDebugging) {
+                    DLog (@"Found a Java %@ JRE", vstring);
+                    DLog (@"Looks like major version %d", extractMajorVersion(vstring));
+                }
+            }
+
+            if ( (version >= jvmRequired && !exactMatch) || (version == jvmRequired && exactMatch) ) {
+                if (isDebugging) {
+                    DLog (@"JRE version qualifies");
+                }
+                return @JAVA_RUNTIME;
+            }
+        }
+    }
+    @catch (NSException *exception)
+    {
+        DLog (@"JRE search exception: '%@'", [exception reason]);
+    }
+
+    return nil;
+}
+
+//  Having failed to find a JRE in the usual location, see if a JDK is installed
+//  (probably in /Library/Java/JavaVirtualMachines). If so, return address of
+//  dylib in the JRE within the JDK.
+/**
+ *  Searches for a JDK dylib of the specified version or later.
+ */
+NSString * findJDKDylib (
+        int jvmRequired,
+        bool isDebugging,
+        bool exactMatch)
+{
+    @try
+    {
+        NSTask *task = [[NSTask alloc] init];
+        [task setLaunchPath:@"/usr/libexec/java_home"];
+
+        NSArray *args = [NSArray arrayWithObjects: @"-v", [NSString stringWithFormat:@"1.%i%@", jvmRequired, exactMatch?@"":@"+"], nil];
+        [task setArguments:args];
+
+        NSPipe *stdout = [NSPipe pipe];
+        [task setStandardOutput:stdout];
+
+        NSPipe *stderr = [NSPipe pipe];
+        [task setStandardError:stderr];
+
+        [task setStandardInput:[NSPipe pipe]];
+
+        NSFileHandle *outHandle = [stdout fileHandleForReading];
+        NSFileHandle *errHandle = [stderr fileHandleForReading];
+
+        [task launch];
+        [task waitUntilExit];
+        [task release];
+
+        NSData *data1 = [outHandle readDataToEndOfFile];
+        NSData *data2 = [errHandle readDataToEndOfFile];
+
+        NSString *outRead = [[NSString alloc] initWithData:data1
+                                                    encoding:NSUTF8StringEncoding];
+        NSString *errRead = [[NSString alloc] initWithData:data2
+                                                    encoding:NSUTF8StringEncoding];
+
+    //  If matching JDK not found, outRead will include something like
+    //  "Unable to find any JVMs matching version "1.X"."
+        if ( errRead != nil
+                && [errRead rangeOfString:@"Unable"].location != NSNotFound )
+        {
+            if (isDebugging) {  DLog (@"No matching JDK found."); }
+            return nil;
+        }
+
+        int version = 0;
+
+        NSRange vrange = [outRead rangeOfString:@"jdk1."];
+        if (vrange.location == NSNotFound) {
+            // try the changed version layout from version 9
+            vrange = [outRead rangeOfString:@"jdk-"];
+            vrange.location += 4;
+        } else {
+            // otherwise remove the leading jdk
+            vrange.location += 3;
+        }
+
+        if (vrange.location != NSNotFound) {
+            NSString *vstring = [outRead substringFromIndex:(vrange.location)];
+
+            vrange  = [vstring rangeOfString:@"/"];
+            vstring = [vstring substringToIndex:vrange.location];
+
+            version = extractMajorVersion(vstring);
+
+            if (isDebugging) {
+                DLog (@"Found a Java %@ JDK", vstring);
+                DLog (@"Looks like major version %d", extractMajorVersion(vstring));
+            }
+        }
+
+        if ( (version >= jvmRequired && !exactMatch) || (version == jvmRequired && exactMatch) ) {
+            if (isDebugging) {
+                DLog (@"JDK version qualifies");
+            }
+
+            NSString *outread2 = [outRead stringByTrimmingCharactersInSet:[NSCharacterSet
+                                                            whitespaceAndNewlineCharacterSet]];
+
+        //  Return location where LIBJLI_DY_LIB is located. Note that the path was
+        //  shortemed between JDK 8 and JDK 9.
+            if (version > 8) {
+                return outread2;
+            }
+            else {
+                return [outread2 stringByAppendingPathComponent:@"jre"];
+            }
+        }
+    }
+    @catch (NSException *exception)
+    {
+        DLog (@"JDK search exception: '%@'", [exception reason]);
+    }
+
+    return nil;
+}
+
+
+/**
+ *  Extract the Java major version number from a string. We expect the input
+ *  to look like either either "1.X", "1.X.Y_ZZ" or "X.Y.ZZ", and the
+ *  returned result will be the integral value of X. Any failure to parse the
+ *  string will return 0.
+ */
+int extractMajorVersion (NSString *vstring) {
+  if (vstring == nil) { return 0; }
+
+  //  Expecting either a java version of form 1.X, 1.X.Y_ZZ or jdk1.X.Y_ZZ.
+  //  Strip everything from start and ending that aren't part of the version number
+  NSCharacterSet* nonDigits = [[NSCharacterSet characterSetWithCharactersInString:@"0123456789."] invertedSet];
+  vstring = [vstring stringByTrimmingCharactersInSet:nonDigits];
+
+  if([vstring hasPrefix:@"1."]) {  // this is the version < 9 layout. Remove the leading "1."
+    vstring = [vstring substringFromIndex:2];
+  }
+
+  // the next integer token should be the major version, so read everything up to the first decimal point, if any
+  NSUInteger versionEndLoc = [vstring rangeOfString:@"."].location;
+  if (versionEndLoc != NSNotFound) {
+    vstring = [vstring substringToIndex:versionEndLoc];
+  }
+
+  return [vstring intValue];
+}
+
+
+NSString * convertRelativeFilePath(NSString * path) {
+    return [path stringByStandardizingPath];
+}
+
+NSString * addDirectoryToSystemArguments(NSUInteger searchPath, NSSearchPathDomainMask domainMask,
+		NSString *systemProperty, NSMutableArray *systemArguments) {
+	NSArray *paths = NSSearchPathForDirectoriesInDomains(searchPath,domainMask, YES);
+    if ([paths count] > 0) {
+		NSString *basePath = [paths objectAtIndex:0];
+		NSString *directory = [NSString stringWithFormat:@"-D%@=%@", systemProperty, basePath];
+		[systemArguments addObject:directory];
+		return basePath;
+    }
+    return nil;
+}
+
+void addModifierFlagToSystemArguments(NSEventModifierFlags mask, NSString *systemProperty, NSEventModifierFlags modifierFlags, NSMutableArray *systemArguments) {
+	NSString *modifierFlagValue = (modifierFlags & mask) ? @"true" : @"false";
+	NSString *modifierFlagVar = [NSString stringWithFormat:@"-D%@=%@", systemProperty, modifierFlagValue];
+	[systemArguments addObject:modifierFlagVar];
+}
diff --git a/build/macosx/appbundler/res/de.lproj/Localizable.strings b/build/macosx/appbundler/res/de.lproj/Localizable.strings
new file mode 100644
index 0000000000..59f745d0cd
--- /dev/null
+++ b/build/macosx/appbundler/res/de.lproj/Localizable.strings
@@ -0,0 +1,7 @@
+"JRELoadError" = "Die Java Laufzeitumgebung konnte nicht geladen werden.";
+"JRExLoadError" = "Die Java %d Laufzeitumgebung konnte nicht geladen werden.";
+"JRExLoadFullError" = "Diese Anwendung benötigt die Java %d Laufzeitumgebung oder höher auf Ihrem Computer installiert sein. Bitte installieren Sie die neueste Version von Java von www.java.com und erneut versuchen.";
+"JDKxLoadFullError" = "Diese Anwendung benötigt die Java %d Laufzeitumgebung oder höher auf Ihrem Computer installiert sein. Bitte installieren Sie die neueste JDK von Oracle.com und erneut versuchen.";
+"MainClassNameRequired" = "Hauptklassenname ist erforderlich.";
+"JavaDirectoryNotFound" = "Das Java Verzeichnis ist nicht vorhanden.";
+"BundlePathContainsColon" = "Kann nicht vom einem Ordner aus starten, der \"/\" in seinem Namen enthält.";
diff --git a/build/macosx/appbundler/res/en.lproj/Localizable.strings b/build/macosx/appbundler/res/en.lproj/Localizable.strings
index 0d306aaaf8..b052770d6e 100644
--- a/build/macosx/appbundler/res/en.lproj/Localizable.strings
+++ b/build/macosx/appbundler/res/en.lproj/Localizable.strings
@@ -1,3 +1,7 @@
 "JRELoadError" = "Unable to load Java Runtime Environment.";
+"JRExLoadError" = "Unable to load a Java %d Runtime Environment.";
+"JRExLoadFullError" = "This application requires that Java %d or later be installed on your computer. Please download and install the latest version of Java from www.java.com and try again.";
+"JDKxLoadFullError" = "This application requires that a Java %d JDK or later be installed on your computer. Please download and install the latest Java JDK from Oracle.com and try again.";
 "MainClassNameRequired" = "Main class name is required.";
 "JavaDirectoryNotFound" = "Unable to enumerate Java directory contents.";
+"BundlePathContainsColon" = "Cannot launch from folder that contains a \"/\" in its name.";
diff --git a/build/macosx/appbundler/res/fr.lproj/Localizable.strings b/build/macosx/appbundler/res/fr.lproj/Localizable.strings
new file mode 100644
index 0000000000..693b44a373
--- /dev/null
+++ b/build/macosx/appbundler/res/fr.lproj/Localizable.strings
@@ -0,0 +1,7 @@
+"JRELoadError" = "Impossible d'utiliser un environnement Java.";
+"JRExLoadError" = "Impossible d'utiliser un environnement Java %d.";
+"JRExLoadFullError" = "Ce logiciel nécessite que Java %d ou plus récent être installés sur votre ordinateur. S'il vous plaît télécharger et installer la dernière version de Java à partir de www.java.com et essayez à nouveau.";
+"JDKxLoadFullError" = "Ce logiciel nécessite que Java %d JDK ou plus récent être installés sur votre ordinateur. S'il vous plaît télécharger et installer le JDK plus récente de Oracle.com et essayez à nouveau.";
+"MainClassNameRequired" = "Principal nom de classe est nécessaire.";
+"JavaDirectoryNotFound" = "Impossible d'énumérer répertoire Java contenu.";
+"BundlePathContainsColon" = "Pas de commencer à partir d'un dossier qui contient un \"/\" dans son nom.";
\ No newline at end of file
diff --git a/build/macosx/appbundler/src/com/oracle/appbundler/AppBundlerTask.java b/build/macosx/appbundler/src/com/oracle/appbundler/AppBundlerTask.java
index df4c26bc73..dada420753 100644
--- a/build/macosx/appbundler/src/com/oracle/appbundler/AppBundlerTask.java
+++ b/build/macosx/appbundler/src/com/oracle/appbundler/AppBundlerTask.java
@@ -42,9 +42,14 @@
 import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Task;
@@ -56,704 +61,892 @@
  * App bundler Ant task.
  */
 public class AppBundlerTask extends Task {
-  // Output folder for generated bundle
-  private File outputDirectory = null;
-
-  // General bundle properties
-  private String name = null;
-  private String displayName = null;
-  private String identifier = null;
-  private File iconFile = null;
-  private String executableName = EXECUTABLE_NAME;
-
-  private String shortVersion = null; //"1.0";
-  private String version = null; //"1.0";
-  private String signature = "????";
-  private String copyright = null; //"";
-  private String getInfo = null;
-  private String privileged = null;
-  private String workingDirectory = null;
+    // Output folder for generated bundle
+    private File outputDirectory = null;
 
-  private String applicationCategory = null;
-  private boolean highResolutionCapable = true;
-  // Oracle Java 8 requires 10.8.3 or later, so require it here.
-  private String minimumSystem = "10.8.3";
-  // By default, don't embed Java FX.
-  private boolean javafx = false;
+    // General bundle properties
+    private String name = null;
+    private String displayName = null;
+    private String identifier = null;
+    private File icon = null;
+    private String executableName = EXECUTABLE_NAME;
 
-  // JVM info properties
-  private String mainClassName = null;
-  private FileSet runtime = null;
-  private ArrayList<FileSet> classPath = new ArrayList<>();
-  private ArrayList<FileSet> libraryPath = new ArrayList<>();
-  private ArrayList<String> options = new ArrayList<>();
-  private ArrayList<String> arguments = new ArrayList<>();
-  private ArrayList<String> architectures = new ArrayList<>();
-  private ArrayList<BundleDocument> bundleDocuments = new ArrayList<>();
+    private String shortVersion = "1.0";
+    private String version = "1.0";
+    private String signature = "????";
+    private String copyright = "";
+    private String privileged = null;
+    private String workingDirectory = null;
+    private String minimumSystemVersion = null;
 
-  private Reference classPathRef;
+    private String jvmRequired = null;
+    private boolean jrePreferred = false;
+    private boolean jdkPreferred = false;
 
-  private static final String EXECUTABLE_NAME = "JavaAppLauncher";
-  private static final String DEFAULT_ICON_NAME = "GenericApp.icns";
-  private static final String OS_TYPE_CODE = "APPL";
+    private String applicationCategory = null;
 
-  private static final int BUFFER_SIZE = 2048;
+    private boolean highResolutionCapable = true;
+    private boolean supportsAutomaticGraphicsSwitching = true;
+    private boolean hideDockIcon = false;
+    private boolean isDebug = false;
+    private boolean ignorePSN = false;
 
+    // JVM info properties
+    private String mainClassName = null;
+    private String jnlpLauncherName = null;
+    private String jarLauncherName = null;
+    private Runtime runtime = null;
+    private ArrayList<FileSet> classPath = new ArrayList<>();
+    private ArrayList<FileSet> libraryPath = new ArrayList<>();
+    private ArrayList<Option> options = new ArrayList<>();
+    private ArrayList<String> arguments = new ArrayList<>();
+    private ArrayList<String> architectures = new ArrayList<>();
+    private ArrayList<String> registeredProtocols = new ArrayList<>();
+    private ArrayList<BundleDocument> bundleDocuments = new ArrayList<>();
+    private ArrayList<TypeDeclaration> exportedTypeDeclarations = new ArrayList<>();
+    private ArrayList<TypeDeclaration> importedTypeDeclarations = new ArrayList<>();
+    private ArrayList<PlistEntry> plistEntries = new ArrayList<>();
+    private ArrayList<Environment> environments = new ArrayList<>();
 
-  public void setOutputDirectory(File outputDirectory) {
-    this.outputDirectory = outputDirectory;
-  }
+    private Reference classPathRef;
+    private ArrayList<String> plistClassPaths = new ArrayList<>();
 
+    private static final String EXECUTABLE_NAME = "JavaAppLauncher";
+    private static final String DEFAULT_ICON_NAME = "GenericApp.icns";
+    private static final String OS_TYPE_CODE = "APPL";
 
-  public void setName(String name) {
-    this.name = name;
-  }
+    private static final String PLIST_DTD = "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">";
+    private static final String PLIST_TAG = "plist";
+    private static final String PLIST_VERSION_ATTRIBUTE = "version";
+    private static final String DICT_TAG = "dict";
+    private static final String KEY_TAG = "key";
+    private static final String ARRAY_TAG = "array";
+    private static final String STRING_TAG = "string";
 
+    private static final int BUFFER_SIZE = 2048;
 
-  public void setDisplayName(String displayName) {
-    this.displayName = displayName;
-  }
-
+    public void setOutputDirectory(File outputDirectory) {
+        this.outputDirectory = outputDirectory;
+    }
 
-  public void setIdentifier(String identifier) {
-    this.identifier = identifier;
-  }
+    public void setName(String name) {
+        this.name = name;
+    }
 
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
+    }
 
-  public void setIcon(File icon) {
-    this.iconFile = icon;
-  }
+    public void setIdentifier(String identifier) {
+        this.identifier = identifier;
+    }
 
+    public void setIcon(File icon) {
+        this.icon = icon;
+    }
 
-  public void setExecutableName(String executable) {
-    this.executableName = executable;
-  }
+    public void setExecutableName(String executable) {
+        this.executableName = executable;
+    }
 
+    public void setShortVersion(String shortVersion) {
+        this.shortVersion = shortVersion;
+    }
 
-  public void setShortVersion(String shortVersion) {
-    this.shortVersion = shortVersion;
-  }
+    public void setVersion(String version) {
+        this.version = version;
+    }
 
+    public void setSignature(String signature) {
+        this.signature = signature;
+    }
 
-  public void setVersion(String version) {
-    this.version = version;
-  }
+    public void setCopyright(String copyright) {
+        this.copyright = copyright;
+    }
 
+    public void setPrivileged(String privileged) {
+        this.privileged = privileged;
+    }
 
-  public void setSignature(String signature) {
-    this.signature = signature;
-  }
+    public void setWorkingDirectory(String workingDirectory) {
+        this.workingDirectory = workingDirectory;
+    }
 
+    public void setJVMRequired(String v){
+        this.jvmRequired = v;
+    }
 
-  public void setCopyright(String copyright) {
-    this.copyright = copyright;
-  }
+    public void setJREPreferred(boolean preferred){
+        this.jrePreferred = preferred;
+    }
 
+    public void setJDKPreferred(boolean preferred){
+        this.jdkPreferred = preferred;
+    }
 
-  public void setGetInfo(String getInfo) {
-    this.getInfo = getInfo;
-  }
+    public void setMinimumSystemVersion(String v){
+        this.minimumSystemVersion = v;
+    }
 
+    public void setApplicationCategory(String applicationCategory) {
+        this.applicationCategory = applicationCategory;
+    }
 
-  public void setPrivileged(String privileged) {
-    this.privileged = privileged;
-  }
+    public void setHighResolutionCapable(boolean highResolutionCapable) {
+        this.highResolutionCapable = highResolutionCapable;
+    }
 
+    public void setHideDockIcon(boolean hideDock) {
+        this.hideDockIcon = hideDock;
+    }
 
-  public void setWorkingDirectory(String workingDirectory) {
-    this.workingDirectory = workingDirectory;
-  }
+    public void setDebug(boolean enabled) {
+        this.isDebug = enabled;
+    }
 
+    public void setSupportsAutomaticGraphicsSwitching(boolean supportsAutomaticGraphicsSwitching) {
+        this.supportsAutomaticGraphicsSwitching = supportsAutomaticGraphicsSwitching;
+    }
 
-  public void setApplicationCategory(String applicationCategory) {
-    this.applicationCategory = applicationCategory;
-  }
+    public void setIgnorePSN(boolean ignorePSN) {
+        this.ignorePSN = ignorePSN;
+    }
 
+    public void setMainClassName(String mainClassName) {
+        this.mainClassName = mainClassName;
+    }
 
-  public void setMinimumSystem(String minimumSystem) {
-    this.minimumSystem = minimumSystem;
-  }
+    public void setJnlpLauncherName(String jnlpLauncherName) {
+        this.jnlpLauncherName = jnlpLauncherName;
+    }
 
+    public void setJarLauncherName(String jarLauncherName) {
+        this.jarLauncherName = jarLauncherName;
+    }
 
-  public void setHighResolutionCapable(boolean highResolutionCapable) {
-    this.highResolutionCapable = highResolutionCapable;
-  }
+    public void addConfiguredRuntime(Runtime runtime) throws BuildException {
+        if (this.runtime != null) {
+            throw new BuildException("Runtime already specified.");
+        }
 
+        this.runtime = runtime;
+    }
 
-  public void setJavaFX(boolean javafx) {
-    this.javafx = javafx;
-  }
+    public void setClasspathRef(Reference ref) {
 
+        this.classPathRef = ref;
+    }
 
-  public void setMainClassName(String mainClassName) {
-    this.mainClassName = mainClassName;
-  }
+    public void setPlistClassPaths(String plistClassPaths) {
+        for (String tok : plistClassPaths.split("\\s*,\\s*")) {
+            this.plistClassPaths.add(tok);
+        }
+    }
 
+    public void addConfiguredClassPath(FileSet classPath) {
+        this.classPath.add(classPath);
+    }
 
-  public void addConfiguredRuntime(FileSet runtime) throws BuildException {
-    if (this.runtime != null) {
-      throw new BuildException("Runtime already specified.");
+    public void addConfiguredLibraryPath(FileSet libraryPath) {
+        this.libraryPath.add(libraryPath);
     }
 
-    this.runtime = runtime;
+    public void addConfiguredBundleDocument(BundleDocument document) {
+        if ((document.getContentTypes() == null) && (document.getExtensions() == null)) {
+            throw new BuildException("Document content type or extension is required.");
+        }
+        this.bundleDocuments.add(document);
+    }
 
-    runtime.appendIncludes(new String[] {
-      "jre/",
-    });
+    public void addConfiguredTypeDeclaration(TypeDeclaration typeDeclaration) {
+        if (typeDeclaration.getIdentifier() == null) {
+            throw new BuildException("Type declarations must have an identifier.");
+        }
+        if (typeDeclaration.isImported()) {
+            this.importedTypeDeclarations.add(typeDeclaration);
+        } else {
+            this.exportedTypeDeclarations.add(typeDeclaration);
+        }
+    }
 
-    runtime.appendExcludes(new String[] {
-      "bin/",
+    public void addConfiguredPlistEntry(PlistEntry plistEntry) {
+        if (plistEntry.getKey() == null) {
+            throw new BuildException("Name is required.");
+        }
+        if (plistEntry.getValue() == null) {
+            throw new BuildException("Value is required.");
+        }
+        if (plistEntry.getType() == null) {
+            plistEntry.setType(STRING_TAG);
+        }
 
-      // original version, removed entire bin folder
-      //"jre/bin/",
+        this.plistEntries.add(plistEntry);
+    }
 
-      // remove everything except 'java'
-      // also keep 'keytool' (needed by Android)
-      "jre/bin/orbd",
-      "jre/bin/pack200",
-      "jre/bin/policytool",
-      "jre/bin/rmid",
-      "jre/bin/rmiregistry",
-      "jre/bin/servertool",
-      "jre/bin/tnameserv",
-      "jre/bin/unpack200",
+    public void addConfiguredEnvironment(Environment environment) {
+        if (environment.getName() == null) {
+            throw new BuildException("Name is required.");
+        }
+        if (environment.getValue() == null) {
+            throw new BuildException("Value is required.");
+        }
 
-      "jre/lib/deploy/",
-      "jre/lib/deploy.jar",
-      "jre/lib/javaws.jar",
-      "jre/lib/libdeploy.dylib",
-      "jre/lib/libnpjp2.dylib",
-      "jre/lib/plugin.jar",
-      "jre/lib/security/javaws.policy"
-    });
+        this.environments.add(environment);
+    }
 
-    if (!javafx) {
-      // http://www.oracle.com/technetwork/java/javase/jdk-7-readme-429198.html
-      runtime.appendExcludes(new String[] {
-        "jre/THIRDPARTYLICENSEREADME-JAVAFX.txt",
+    public void addConfiguredOption(Option option) throws BuildException {
+        String value = option.getValue();
 
-        "jre/lib/javafx.properties",
-        "jre/lib/jfxrt.jar",
-        "jre/lib/security/javafx.policy",
+        if (value == null) {
+            throw new BuildException("Value is required.");
+        }
 
-        "jre/lib/fxplugins.dylib",
-        "jre/lib/libdecora-sse.dylib",
-        "jre/lib/libglass.dylib",
-        "jre/lib/libglib-2.0.0.dylib",
-        "jre/lib/libgstplugins-lite.dylib",
-        "jre/lib/libgstreamer-lite.dylib",
-        "jre/lib/libjavafx-font.dylib",
-        "jre/lib/libjavafx-iio.dylib",
-        "jre/lib/libjfxmedia.dylib",
-        "jre/lib/libjfxwebkit.dylib",
-        "jre/lib/libprism-es2.dylib"
-      });
+        options.add(option);
     }
-  }
 
+    public void addConfiguredArgument(Argument argument) throws BuildException {
+        String value = argument.getValue();
 
-  public void setClasspathRef(Reference ref) {
-    this.classPathRef = ref;
-  }
-
-
-  public void addConfiguredClassPath(FileSet classPath) {
-    this.classPath.add(classPath);
-  }
+        if (value == null) {
+            throw new BuildException("Value is required.");
+        }
 
+        arguments.add(value);
+    }
+    public void addConfiguredScheme(Argument argument) throws BuildException {
+        String value = argument.getValue();
 
-  public void addConfiguredLibraryPath(FileSet libraryPath) {
-    this.libraryPath.add(libraryPath);
-  }
+        if (value == null) {
+            throw new BuildException("Value is required.");
+        }
 
+        this.registeredProtocols.add(value);
+    }
 
-  public void addConfiguredBundleDocument(BundleDocument document) {
-    this.bundleDocuments.add(document);
-  }
+    public void addConfiguredArch(Architecture architecture) throws BuildException {
+        String name = architecture.getName();
 
+        if (name == null) {
+            throw new BuildException("Name is required.");
+        }
 
-  public void addConfiguredOption(Option option) throws BuildException {
-    String value = option.getValue();
+        architectures.add(name);
 
-    if (value == null) {
-      throw new BuildException("Value is required.");
     }
 
-    options.add(value);
-  }
+    @Override
+    public void execute() throws BuildException {
+        // Validate required properties
+        if (outputDirectory == null) {
+            throw new IllegalStateException("Output directory is required.");
+        }
 
+        if (!outputDirectory.exists()) {
+            throw new IllegalStateException("Output directory does not exist.");
+        }
 
-  public void addConfiguredArgument(Argument argument) throws BuildException {
-    String value = argument.getValue();
+        if (!outputDirectory.isDirectory()) {
+            throw new IllegalStateException("Invalid output directory.");
+        }
 
-    if (value == null) {
-      throw new BuildException("Value is required.");
-    }
+        if (name == null) {
+            throw new IllegalStateException("Name is required.");
+        }
 
-    arguments.add(value);
-  }
+        if (displayName == null) {
+            throw new IllegalStateException("Display name is required.");
+        }
 
+        if (identifier == null) {
+            throw new IllegalStateException("Identifier is required.");
+        }
 
-  public void addConfiguredArch(Architecture architecture) throws BuildException {
-    String name = architecture.getName();
+        if (icon != null) {
+            if (!icon.exists()) {
+                throw new IllegalStateException("Icon does not exist.");
+            }
 
-    if (name == null) {
-      throw new BuildException("Name is required.");
-    }
+            if (icon.isDirectory()) {
+                throw new IllegalStateException("Invalid icon.");
+            }
+        }
 
-    architectures.add(name);
-  }
+        if (shortVersion == null) {
+            throw new IllegalStateException("Short version is required.");
+        }
 
+        if (signature == null) {
+            throw new IllegalStateException("Signature is required.");
+        }
 
-  @Override
-  public void execute() throws BuildException {
-    // Validate required properties
-    if (outputDirectory == null) {
-      throw new IllegalStateException("Output directory is required.");
-    }
+        if (signature.length() != 4) {
+            throw new IllegalStateException("Invalid signature.");
+        }
 
-    if (!outputDirectory.exists()) {
-      throw new IllegalStateException("Output directory does not exist.");
-    }
+        if (copyright == null) {
+            throw new IllegalStateException("Copyright is required.");
+        }
 
-    if (!outputDirectory.isDirectory()) {
-      throw new IllegalStateException("Invalid output directory.");
-    }
+        if (jnlpLauncherName == null && mainClassName == null) {
+            throw new IllegalStateException("Main class name or JNLP launcher name is required.");
+        }
 
-    if (name == null) {
-      throw new IllegalStateException("Name is required.");
-    }
+        // Create the app bundle
+        try {
+            System.out.println("Creating app bundle: " + name);
 
-    if (displayName == null) {
-      throw new IllegalStateException("Display name is required.");
-    }
+            // Create directory structure
+            File rootDirectory = new File(outputDirectory, name + ".app");
+            delete(rootDirectory);
+            rootDirectory.mkdir();
 
-    if (identifier == null) {
-      throw new IllegalStateException("Identifier is required.");
-    }
+            File contentsDirectory = new File(rootDirectory, "Contents");
+            contentsDirectory.mkdir();
 
-    if (iconFile != null) {
-      if (!iconFile.exists()) {
-        throw new IllegalStateException("Icon does not exist.");
-      }
+            File macOSDirectory = new File(contentsDirectory, "MacOS");
+            macOSDirectory.mkdir();
 
-      if (iconFile.isDirectory()) {
-        throw new IllegalStateException("Invalid icon.");
-      }
-    }
+            File javaDirectory = new File(contentsDirectory, "Java");
+            javaDirectory.mkdir();
 
-    if (shortVersion == null) {
-      throw new IllegalStateException("Short version is required.");
-    }
+            File plugInsDirectory = new File(contentsDirectory, "PlugIns");
+            plugInsDirectory.mkdir();
 
-    if (signature == null) {
-      throw new IllegalStateException("Signature is required.");
-    }
+            File resourcesDirectory = new File(contentsDirectory, "Resources");
+            resourcesDirectory.mkdir();
 
-    if (signature.length() != 4) {
-      throw new IllegalStateException("Invalid signature.");
-    }
+            // Generate Info.plist
+            File infoPlistFile = new File(contentsDirectory, "Info.plist");
+            infoPlistFile.createNewFile();
+            writeInfoPlist(infoPlistFile);
 
-    if (copyright == null) {
-      throw new IllegalStateException("Copyright is required.");
-    }
+            // Generate PkgInfo
+            File pkgInfoFile = new File(contentsDirectory, "PkgInfo");
+            pkgInfoFile.createNewFile();
+            writePkgInfo(pkgInfoFile);
 
-    if (mainClassName == null) {
-      throw new IllegalStateException("Main class name is required.");
-    }
+            // Copy executable to MacOS folder
+            File executableFile = new File(macOSDirectory, executableName);
+            copy(getClass().getResource(EXECUTABLE_NAME), executableFile);
 
-    // Create the app bundle
-    try {
-      System.out.println("Creating app bundle: " + name);
+            executableFile.setExecutable(true, false);
 
-      // Create directory structure
-      File rootDirectory = new File(outputDirectory, name + ".app");
-      delete(rootDirectory);
-      rootDirectory.mkdir();
+            // Copy localized resources to Resources folder
+            copyResources(resourcesDirectory);
 
-      File contentsDirectory = new File(rootDirectory, "Contents");
-      contentsDirectory.mkdir();
+            // Copy runtime to PlugIns folder
+            copyRuntime(plugInsDirectory);
 
-      File macOSDirectory = new File(contentsDirectory, "MacOS");
-      macOSDirectory.mkdir();
+            // Copy class path entries to Java folder
+            copyClassPathEntries(javaDirectory);
 
-      File javaDirectory = new File(contentsDirectory, "Java");
-      javaDirectory.mkdir();
+            // Copy class path ref entries to Java folder
+            copyClassPathRefEntries(javaDirectory);
 
-      File plugInsDirectory = new File(contentsDirectory, "PlugIns");
-      plugInsDirectory.mkdir();
+            // Copy library path entries to MacOS folder
+            copyLibraryPathEntries(macOSDirectory);
 
-      File resourcesDirectory = new File(contentsDirectory, "Resources");
-      resourcesDirectory.mkdir();
+            // Copy app icon to Resources folder
+            copyIcon(resourcesDirectory);
 
-//      // Move back to Contents/Resources/Java instead of Contents/Java [fry]
-//      File javaDirectory = new File(resourcesDirectory, "Java");
-//      javaDirectory.mkdir();
+            // Copy app document icons to Resources folder
+            copyDocumentIcons(bundleDocuments, resourcesDirectory);
+            copyDocumentIcons(exportedTypeDeclarations, resourcesDirectory);
+            copyDocumentIcons(importedTypeDeclarations, resourcesDirectory);
 
-      // Generate Info.plist
-      File infoPlistFile = new File(contentsDirectory, "Info.plist");
-      infoPlistFile.createNewFile();
-      writeInfoPlist(infoPlistFile);
+        } catch (IOException exception) {
+            throw new BuildException(exception);
+        }
+    }
 
-      // Generate PkgInfo
-      File pkgInfoFile = new File(contentsDirectory, "PkgInfo");
-      pkgInfoFile.createNewFile();
-      writePkgInfo(pkgInfoFile);
+    private void copyResources(File resourcesDirectory) throws IOException {
+        // Unzip res.zip into resources directory
+        InputStream inputStream = getClass().getResourceAsStream("res.zip");
+        ZipInputStream zipInputStream = new ZipInputStream(inputStream);
 
-      // Copy executable to MacOS folder
-      File executableFile = new File(macOSDirectory, executableName);
-      copy(getClass().getResource(EXECUTABLE_NAME), executableFile);
+        try {
+            ZipEntry zipEntry = zipInputStream.getNextEntry();
+            while (zipEntry != null) {
+                File file = new File(resourcesDirectory, zipEntry.getName());
 
-      executableFile.setExecutable(true, false);
+                if (zipEntry.isDirectory()) {
+                    file.mkdir();
+                } else {
+                    OutputStream outputStream = new BufferedOutputStream(new FileOutputStream(file), BUFFER_SIZE);
 
-      // Copy localized resources to Resources folder
-      copyResources(resourcesDirectory);
+                    try {
+                        int b = zipInputStream.read();
+                        while (b != -1) {
+                            outputStream.write(b);
+                            b = zipInputStream.read();
+                        }
 
-      // Copy runtime to PlugIns folder
-      copyRuntime(plugInsDirectory);
+                        outputStream.flush();
+                    } finally {
+                        outputStream.close();
+                    }
 
-      // Copy class path entries to Java folder
-      copyClassPathEntries(javaDirectory);
+                }
 
-      // Copy class path ref entries to Java folder
-      copyClassPathRefEntries(javaDirectory);
+                zipEntry = zipInputStream.getNextEntry();
+            }
+        } finally {
+            zipInputStream.close();
+        }
+    }
 
-      // Copy library path entries to MacOS folder
-      copyLibraryPathEntries(macOSDirectory);
+    private void copyRuntime(File plugInsDirectory) throws IOException {
+        if (runtime != null) {
+            runtime.copyTo(plugInsDirectory);
+        }
+    }
 
-      // Copy icon to Resources folder
-      copyIcon(resourcesDirectory);
+    private void copyClassPathRefEntries(File javaDirectory) throws IOException {
+        if(classPathRef != null) {
+            org.apache.tools.ant.types.Path classpath =
 
-      // Copy the bundle/document icons as well
-      copyBundleIcons(resourcesDirectory);
+                    (org.apache.tools.ant.types.Path) classPathRef.getReferencedObject(getProject());
 
-    } catch (IOException exception) {
-      throw new BuildException(exception);
+            Iterator<FileResource> iter = (Iterator<FileResource>)(Object)classpath.iterator();
+            while(iter.hasNext()) {
+                FileResource resource = iter.next();
+                File source = resource.getFile();
+                File destination = new File(javaDirectory, source.getName());
+                copy(source, destination);
+            }
+        }
     }
-  }
 
+    private void copyClassPathEntries(File javaDirectory) throws IOException {
+        for (FileSet fileSet : classPath) {
+            File classPathDirectory = fileSet.getDir();
+            DirectoryScanner directoryScanner = fileSet.getDirectoryScanner(getProject());
+            String[] includedFiles = directoryScanner.getIncludedFiles();
+
+            for (int i = 0; i < includedFiles.length; i++) {
+                String includedFile = includedFiles[i];
+                File source = new File(classPathDirectory, includedFile);
+                File destination = new File(javaDirectory, new File(includedFile).getName());
+                copy(source, destination);
+            }
+        }
+    }
 
-  private void copyResources(File resourcesDirectory) throws IOException {
-    // Unzip res.zip into resources directory
-    InputStream inputStream = getClass().getResourceAsStream("res.zip");
-    ZipInputStream zipInputStream = new ZipInputStream(inputStream);
+    private void copyLibraryPathEntries(File macOSDirectory) throws IOException {
+        for (FileSet fileSet : libraryPath) {
+            File libraryPathDirectory = fileSet.getDir();
+            DirectoryScanner directoryScanner = fileSet.getDirectoryScanner(getProject());
+            String[] includedFiles = directoryScanner.getIncludedFiles();
 
-    try {
-      ZipEntry zipEntry = zipInputStream.getNextEntry();
-      while (zipEntry != null) {
-        File file = new File(resourcesDirectory, zipEntry.getName());
+            for (int i = 0; i < includedFiles.length; i++) {
+                String includedFile = includedFiles[i];
+                File source = new File(libraryPathDirectory, includedFile);
+                File destination = new File(macOSDirectory, new File(includedFile).getName());
+                copy(source, destination);
+            }
+        }
+    }
 
-        if (zipEntry.isDirectory()) {
-          file.mkdir();
+    private void copyIcon(File resourcesDirectory) throws IOException {
+        if (icon == null) {
+            copy(getClass().getResource(DEFAULT_ICON_NAME), new File(resourcesDirectory, DEFAULT_ICON_NAME));
         } else {
-          OutputStream outputStream =
-            new BufferedOutputStream(new FileOutputStream(file), BUFFER_SIZE);
-          try {
-            int b = zipInputStream.read();
-            while (b != -1) {
-              outputStream.write(b);
-              b = zipInputStream.read();
+            copy(icon, new File(resourcesDirectory, icon.getName()));
+        }
+    }
+
+    public void copyDocumentIcons(final ArrayList<? extends IconContainer> iconContainers,
+            File resourcesDirectory) throws IOException {
+        for(IconContainer iconContainer: iconContainers) {
+            if(iconContainer.hasIcon()) {
+                File ifile = iconContainer.getIconFile();
+                if (ifile != null) {
+                    copyDocumentIcon(ifile,resourcesDirectory);
+                }
             }
-            outputStream.flush();
-          } finally {
-            outputStream.close();
-          }
-          file.setLastModified(zipEntry.getTime());
         }
-        zipEntry = zipInputStream.getNextEntry();
-      }
-    } finally {
-      zipInputStream.close();
     }
-  }
 
+    private void copyDocumentIcon(File ifile, File resourcesDirectory) throws IOException {
+        if (ifile == null) {
+            return;
+        } else {
+            copy(ifile, new File(resourcesDirectory, ifile.getName()));
+        }
+    }
 
-  private void copyRuntime(File plugInsDirectory) throws IOException {
-    if (runtime != null) {
-      File runtimeHomeDirectory = runtime.getDir();
-      File runtimeContentsDirectory = runtimeHomeDirectory.getParentFile();
-      File runtimeDirectory = runtimeContentsDirectory.getParentFile();
+    private void writeInfoPlist(File file) throws IOException {
+        Writer out = new BufferedWriter(new FileWriter(file));
+        XMLOutputFactory output = XMLOutputFactory.newInstance();
+
+        try {
+            XMLStreamWriter xout = output.createXMLStreamWriter(out);
+
+            // Write XML declaration
+            xout.writeStartDocument();
+            xout.writeCharacters("\n");
+
+            // Write plist DTD declaration
+            xout.writeDTD(PLIST_DTD);
+            xout.writeCharacters("\n");
+
+            // Begin root element
+            xout.writeStartElement(PLIST_TAG);
+            xout.writeAttribute(PLIST_VERSION_ATTRIBUTE, "1.0");
+            xout.writeCharacters("\n");
+
+            // Begin root dictionary
+            xout.writeStartElement(DICT_TAG);
+            xout.writeCharacters("\n");
+
+            // Write bundle properties
+            writeProperty(xout, "CFBundleDevelopmentRegion", "English");
+            writeProperty(xout, "CFBundleExecutable", executableName);
+            writeProperty(xout, "CFBundleIconFile", (icon == null) ? DEFAULT_ICON_NAME : icon.getName());
+            writeProperty(xout, "CFBundleIdentifier", identifier);
+            writeProperty(xout, "CFBundleDisplayName", displayName);
+            writeProperty(xout, "CFBundleInfoDictionaryVersion", "6.0");
+            writeProperty(xout, "CFBundleName", name);
+            writeProperty(xout, "CFBundlePackageType", OS_TYPE_CODE);
+            writeProperty(xout, "CFBundleShortVersionString", shortVersion);
+            writeProperty(xout, "CFBundleVersion", version);
+            writeProperty(xout, "CFBundleSignature", signature);
+            writeProperty(xout, "NSHumanReadableCopyright", copyright);
+            writeProperty(xout, "LSMinimumSystemVersion", minimumSystemVersion);
+            writeProperty(xout, "LSApplicationCategoryType", applicationCategory);
+            writeProperty(xout, "LSUIElement",hideDockIcon);
+            writeProperty(xout, "NSHighResolutionCapable",highResolutionCapable);
+            writeProperty(xout, "NSSupportsAutomaticGraphicsSwitching",
+                        supportsAutomaticGraphicsSwitching);
+            writeProperty(xout, "IgnorePSN",ignorePSN);
+
+            if(registeredProtocols.size() > 0){
+                writeKey(xout, "CFBundleURLTypes");
+                xout.writeStartElement(ARRAY_TAG);
+                xout.writeCharacters("\n");
+                xout.writeStartElement(DICT_TAG);
+                xout.writeCharacters("\n");
+
+                writeProperty(xout, "CFBundleURLName", identifier);
+                writeStringArray(xout, "CFBundleURLSchemes",registeredProtocols);
+
+                xout.writeEndElement();
+                xout.writeCharacters("\n");
+                xout.writeEndElement();
+                xout.writeCharacters("\n");
+            }
 
-      // Create root plug-in directory
-      File pluginDirectory = new File(plugInsDirectory, runtimeDirectory.getName());
-      pluginDirectory.mkdir();
+            // Write runtime
+            if (runtime != null) {
+                writeProperty(xout, "JVMRuntime", runtime.getDir().getParentFile().getParentFile().getName());
+            }
 
-      // Create Contents directory
-      File pluginContentsDirectory = new File(pluginDirectory, runtimeContentsDirectory.getName());
-      pluginContentsDirectory.mkdir();
+            if(jvmRequired != null) {
+                writeProperty(xout, "JVMVersion", jvmRequired);
+            }
 
-      // Copy MacOS directory
-      File runtimeMacOSDirectory = new File(runtimeContentsDirectory, "MacOS");
-      copy(runtimeMacOSDirectory, new File(pluginContentsDirectory, runtimeMacOSDirectory.getName()));
+            writeProperty(xout, "JVMRunPrivileged", privileged);
 
-      // Copy Info.plist file
-      File runtimeInfoPlistFile = new File(runtimeContentsDirectory, "Info.plist");
-      copy(runtimeInfoPlistFile, new File(pluginContentsDirectory, runtimeInfoPlistFile.getName()));
+            writeProperty(xout, "JREPreferred", jrePreferred);
+            writeProperty(xout, "JDKPreferred", jdkPreferred);
 
-      // Copy included contents of Home directory
-      File pluginHomeDirectory = new File(pluginContentsDirectory, runtimeHomeDirectory.getName());
+            writeProperty(xout, "WorkingDirectory", workingDirectory);
 
-      DirectoryScanner directoryScanner = runtime.getDirectoryScanner(getProject());
-      String[] includedFiles = directoryScanner.getIncludedFiles();
+            // Write jnlp launcher name - only if set
+            writeProperty(xout, "JVMJNLPLauncher", jnlpLauncherName);
 
-      for (String includedFile : includedFiles) {
-      //for (int i = 0; i < includedFiles.length; i++) {
-        //String includedFile = includedFiles[i];
-        File source = new File(runtimeHomeDirectory, includedFile);
-        File destination = new File(pluginHomeDirectory, includedFile);
-        copy(source, destination);
-      }
-    }
-  }
+            // Write main class name - only if set. There should only one be set
+            writeProperty(xout, "JVMMainClassName", mainClassName);
 
+           // Write classpaths in plist, if specified
+            if (!plistClassPaths.isEmpty()) {
+                writeStringArray(xout,"JVMClassPath", plistClassPaths);
+            }
 
-  private void copyClassPathRefEntries(File javaDirectory) throws IOException {
-    if (classPathRef != null) {
-      org.apache.tools.ant.types.Path classpath =
-        (org.apache.tools.ant.types.Path) classPathRef.getReferencedObject(getProject());
+            // Write whether launcher be verbose with debug msgs
+            writeProperty(xout, "JVMDebug", isDebug);
 
-      Iterator<?> iter = classpath.iterator();
-      while (iter.hasNext()) {
-        FileResource resource = (FileResource) iter.next();
-        File source = resource.getFile();
-        File destination = new File(javaDirectory, source.getName());
-        copy(source, destination);
-      }
-    }
-  }
+            // Write jar launcher name
+            writeProperty(xout, "JVMJARLauncher", jarLauncherName);
 
+            // Write CFBundleDocument entries
+            writeKey(xout, "CFBundleDocumentTypes");
+            writeBundleDocuments(xout, bundleDocuments);
 
-  private void copyClassPathEntries(File javaDirectory) throws IOException {
-    for (FileSet fileSet : classPath) {
-      File classPathDirectory = fileSet.getDir();
-      DirectoryScanner directoryScanner = fileSet.getDirectoryScanner(getProject());
-      String[] includedFiles = directoryScanner.getIncludedFiles();
+            // Write Type Declarations
+            if (! exportedTypeDeclarations.isEmpty()) {
+                writeKey(xout, "UTExportedTypeDeclarations");
+                writeTypeDeclarations(xout, exportedTypeDeclarations);
+            }
+            if (! importedTypeDeclarations.isEmpty()) {
+                writeKey(xout, "UTImportedTypeDeclarations");
+                writeTypeDeclarations(xout, importedTypeDeclarations);
+            }
 
-      for (String includedFile : includedFiles) {
-        File source = new File(classPathDirectory, includedFile);
-        File destination = new File(javaDirectory, new File(includedFile).getName());
-        copy(source, destination);
-      }
-    }
-  }
+            // Write architectures
+            writeStringArray(xout, "LSArchitecturePriority",architectures);
 
+            // Write Environment
+            writeKey(xout, "LSEnvironment");
+            xout.writeStartElement(DICT_TAG);
+            xout.writeCharacters("\n");
+            writeKey(xout, "LC_CTYPE");
+            writeString(xout, "UTF-8");
 
-  private void copyLibraryPathEntries(File macOSDirectory) throws IOException {
-    for (FileSet fileSet : libraryPath) {
-      File libraryPathDirectory = fileSet.getDir();
-      DirectoryScanner directoryScanner = fileSet.getDirectoryScanner(getProject());
-      String[] includedFiles = directoryScanner.getIncludedFiles();
+            for (Environment environment : environments) {
+                writeProperty(xout, environment.getName(), environment.getValue());
+            }
 
-      for (String includedFile : includedFiles) {
-        File source = new File(libraryPathDirectory, includedFile);
-        File destination = new File(macOSDirectory, new File(includedFile).getName());
-        copy(source, destination);
-      }
-    }
-  }
+            xout.writeEndElement();
+            xout.writeCharacters("\n");
 
+            // Write options
+            writeKey(xout, "JVMOptions");
 
-  private void copyIcon(File resourcesDirectory) throws IOException {
-    if (iconFile == null) {
-      copy(getClass().getResource(DEFAULT_ICON_NAME),
-           new File(resourcesDirectory, DEFAULT_ICON_NAME));
-    } else {
-      copy(iconFile, new File(resourcesDirectory, iconFile.getName()));
-    }
-  }
+            xout.writeStartElement(ARRAY_TAG);
+            xout.writeCharacters("\n");
 
+            for (Option option : options) {
+                if (option.getName() == null) writeString(xout, option.getValue());
+            }
 
-  private void copyBundleIcons(File resourcesDirectory) throws IOException {
-    for (BundleDocument bundleDocument : bundleDocuments) {
-      if (bundleDocument.hasIcon()) {
-        File iconFile = bundleDocument.getIconFile();
-        copy(iconFile, new File(resourcesDirectory, iconFile.getName()));
-      }
-    }
-  }
+            xout.writeEndElement();
+            xout.writeCharacters("\n");
 
+            // Write default options
+            writeKey(xout, "JVMDefaultOptions");
 
-  private void writeInfoPlist(File file) throws IOException {
-    FileOutputStream output = new FileOutputStream(file);
-    PropertyLister plist = new PropertyLister(output);
+            xout.writeStartElement(DICT_TAG);
+            xout.writeCharacters("\n");
 
-    // Get started, write all necessary header info and open plist element
-    plist.writeStartDocument();
+            for (Option option : options) {
+                if (option.getName() != null) {
+                    writeProperty(xout, option.getName(), option.getValue());
+                }
+            }
+
+            xout.writeEndElement();
+            xout.writeCharacters("\n");
+
+            // Write arguments
+            writeStringArray(xout, "JVMArguments",arguments);
+
+            // Write arbitrary key-value pairs
+            for (PlistEntry item : plistEntries) {
+                writeKey(xout, item.getKey());
+                writeValue(xout, item.getType(), item.getValue());
+            }
 
-    // Begin root dictionary
-    plist.writeStartDictElement();
+            // End root dictionary
+            xout.writeEndElement();
+            xout.writeCharacters("\n");
 
-    // Write bundle properties
-    plist.writeProperty("CFBundleDevelopmentRegion", "English");
-    plist.writeProperty("CFBundleExecutable", executableName);
-    plist.writeProperty("CFBundleIconFile", (iconFile == null) ? DEFAULT_ICON_NAME : iconFile.getName());
-    plist.writeProperty("CFBundleIdentifier", identifier);
-    plist.writeProperty("CFBundleDisplayName", displayName);
-    plist.writeProperty("CFBundleInfoDictionaryVersion", "6.0");
-    plist.writeProperty("CFBundleName", name);
-    plist.writeProperty("CFBundlePackageType", OS_TYPE_CODE);
-    plist.writeProperty("CFBundleShortVersionString", shortVersion);
-    plist.writeProperty("CFBundleVersion", version);
-    plist.writeProperty("CFBundleSignature", signature);
-    plist.writeProperty("NSHumanReadableCopyright", copyright);
+            // End root element
+            xout.writeEndElement();
+            xout.writeCharacters("\n");
 
-    if (getInfo != null) {
-      plist.writeProperty("CFBundleGetInfoString", getInfo);
+            // Close document
+            xout.writeEndDocument();
+            xout.writeCharacters("\n");
+
+            out.flush();
+        } catch (XMLStreamException exception) {
+            throw new IOException(exception);
+        } finally {
+            out.close();
+        }
     }
 
-    if (applicationCategory != null) {
-      plist.writeProperty("LSApplicationCategoryType", applicationCategory);
+    private void writeKey(XMLStreamWriter xout, String key) throws XMLStreamException {
+        xout.writeStartElement(KEY_TAG);
+        xout.writeCharacters(key);
+        xout.writeEndElement();
+        xout.writeCharacters("\n");
     }
 
-    if (minimumSystem != null) {
-      plist.writeProperty("LSMinimumSystemVersion", minimumSystem);
+    private void writeValue(XMLStreamWriter xout, String type, String value) throws XMLStreamException {
+        if (type == null) {
+            type = STRING_TAG;
+        }
+        if ("boolean".equals(type)) {
+            writeBoolean(xout, "true".equals(value));
+        } else {
+            xout.writeStartElement(type);
+            xout.writeCharacters(value);
+            xout.writeEndElement();
+            xout.writeCharacters("\n");
+        }
     }
 
-    if (highResolutionCapable) {
-      plist.writeKey("NSHighResolutionCapable");
-      plist.writeBoolean(true);
+    private void writeString(XMLStreamWriter xout, String value) throws XMLStreamException {
+        xout.writeStartElement(STRING_TAG);
+        xout.writeCharacters(value);
+        xout.writeEndElement();
+        xout.writeCharacters("\n");
     }
 
-    if (runtime != null) {
-      plist.writeProperty("JVMRuntime", runtime.getDir().getParentFile().getParentFile().getName());
+    private void writeBoolean(XMLStreamWriter xout, boolean value) throws XMLStreamException {
+        xout.writeEmptyElement(value ? "true" : "false");
+        xout.writeCharacters("\n");
     }
 
-    if (privileged != null) {
-      plist.writeProperty("JVMRunPrivileged", privileged);
+    private void writeProperty(XMLStreamWriter xout, String key, Boolean value) throws XMLStreamException {
+        if (value != null && value) {
+            writeKey(xout, key);
+            writeBoolean(xout, true);
+        }
     }
 
-    if (workingDirectory != null) {
-      plist.writeProperty("WorkingDirectory", workingDirectory);
+    private void writeProperty(XMLStreamWriter xout, String key, Object value) throws XMLStreamException {
+        if (value != null) {
+            writeKey(xout, key);
+            writeString(xout, value.toString());
+        }
     }
 
-    // Write main class name
-    plist.writeProperty("JVMMainClassName", mainClassName);
+    public void writeStringArray(XMLStreamWriter xout, final String key,
+            final Iterable<String> values) throws XMLStreamException {
+        if (values != null) {
+            writeKey(xout, key);
+            xout.writeStartElement(ARRAY_TAG);
+            xout.writeCharacters("\n");
+            for(String singleValue : values) {
+                writeString(xout, singleValue);
+            }
+            xout.writeEndElement();
+            xout.writeCharacters("\n");
+        }
+    }
 
-    // Write CFBundleDocument entries
-    plist.writeKey("CFBundleDocumentTypes");
-    plist.writeStartArrayElement();
-    for (BundleDocument bundleDocument: bundleDocuments) {
-      plist.writeStartDictElement();
+    public void writeBundleDocuments(XMLStreamWriter xout,
+            final ArrayList<BundleDocument> bundleDocuments) throws XMLStreamException {
 
-      plist.writeKey("CFBundleTypeExtensions");
-      plist.writeStartArrayElement();
-      for (String extension : bundleDocument.getExtensions()) {
-        plist.writeString(extension);
-      }
-      plist.writeEndElement();
+        xout.writeStartElement(ARRAY_TAG);
+        xout.writeCharacters("\n");
 
-      if (bundleDocument.hasIcon()) {
-        plist.writeKey("CFBundleTypeIconFile");
-        plist.writeString(bundleDocument.getIconName());
-      }
+        for(BundleDocument bundleDocument: bundleDocuments) {
+            xout.writeStartElement(DICT_TAG);
+            xout.writeCharacters("\n");
 
-      plist.writeKey("CFBundleTypeName");
-      plist.writeString(bundleDocument.getName());
+            final List<String> contentTypes = bundleDocument.getContentTypes();
+            if (contentTypes != null) {
+                writeStringArray(xout, "LSItemContentTypes", contentTypes);
+            } else {
+                writeStringArray(xout, "CFBundleTypeExtensions", bundleDocument.getExtensions());
+                writeProperty(xout, "LSTypeIsPackage", bundleDocument.isPackage());
+            }
+            writeStringArray(xout, "NSExportableTypes", bundleDocument.getExportableTypes());
 
-      plist.writeKey("CFBundleTypeRole");
-      plist.writeString(bundleDocument.getRole());
+            final File ifile = bundleDocument.getIconFile();
+            writeProperty(xout, "CFBundleTypeIconFile", ifile != null ?
+                        ifile.getName() : bundleDocument.getIcon());
 
-      plist.writeKey("LSTypeIsPackage");
-      plist.writeBoolean(bundleDocument.isPackage());
+            writeProperty(xout, "CFBundleTypeName", bundleDocument.getName());
+            writeProperty(xout, "CFBundleTypeRole", bundleDocument.getRole());
+            writeProperty(xout, "LSHandlerRank", bundleDocument.getHandlerRank());
 
-      plist.writeEndElement();
-    }
-    plist.writeEndElement();
+            xout.writeEndElement();
+            xout.writeCharacters("\n");
+        }
 
-    // Write architectures
-    plist.writeKey("LSArchitecturePriority");
-    plist.writeStartArrayElement();
-    for (String architecture : architectures) {
-      plist.writeString(architecture);
+        xout.writeEndElement();
+        xout.writeCharacters("\n");
     }
-    plist.writeEndElement();
 
-    // Write Environment
-    plist.writeKey("LSEnvironment");
-    plist.writeStartDictElement();
-    plist.writeKey("LC_CTYPE");
-    plist.writeString("UTF-8");
-    plist.writeEndElement();
+    public void writeTypeDeclarations(XMLStreamWriter xout,
+            final ArrayList<TypeDeclaration> typeDeclarations) throws XMLStreamException {
+        xout.writeStartElement(ARRAY_TAG);
+        xout.writeCharacters("\n");
+        for (TypeDeclaration typeDeclaration: typeDeclarations) {
 
-    // Write options
-    plist.writeKey("JVMOptions");
-    plist.writeStartArrayElement();
-    for (String option : options) {
-      plist.writeString(option);
-    }
-    plist.writeEndElement();
+            xout.writeStartElement(DICT_TAG);
+            xout.writeCharacters("\n");
 
-    // Write arguments
-    plist.writeKey("JVMArguments");
-    plist.writeStartArrayElement();
-    for (String argument : arguments) {
-      plist.writeString(argument);
-    }
-    plist.writeEndElement();
+            writeProperty(xout, "UTTypeIdentifier", typeDeclaration.getIdentifier());
+            writeProperty(xout, "UTTypeReferenceURL", typeDeclaration.getReferenceUrl());
+            writeProperty(xout, "UTTypeDescription", typeDeclaration.getDescription());
 
-    // End root dictionary
-    plist.writeEndElement();
+            final File ifile = typeDeclaration.getIconFile();
+            writeProperty(xout, "UTTypeIconFile", ifile != null ?
+                        ifile.getName() : typeDeclaration.getIcon());
 
-    // Close out the plist
-    plist.writeEndDocument();
-  }
+            writeStringArray(xout, "UTTypeConformsTo", typeDeclaration.getConformsTo());
 
+            writeKey(xout, "UTTypeTagSpecification");
 
-  private void writePkgInfo(File file) throws IOException {
-    Writer out = new BufferedWriter(new FileWriter(file));
+            xout.writeStartElement(DICT_TAG);
+            xout.writeCharacters("\n");
 
-    try {
-      out.write(OS_TYPE_CODE + signature);
-      out.flush();
-    } finally {
-      out.close();
-    }
-  }
+            writeStringArray(xout, "com.apple.ostype", typeDeclaration.getOsTypes());
+            writeStringArray(xout, "public.filename-extension", typeDeclaration.getExtensions());
+            writeStringArray(xout, "public.mime-type", typeDeclaration.getMimeTypes());
 
+            xout.writeEndElement();
+            xout.writeCharacters("\n");
 
-  private static void delete(File file) throws IOException {
-    Path filePath = file.toPath();
+            xout.writeEndElement();
+            xout.writeCharacters("\n");
+        }
 
-    if (Files.exists(filePath, LinkOption.NOFOLLOW_LINKS)) {
-      if (Files.isDirectory(filePath, LinkOption.NOFOLLOW_LINKS)) {
-        File[] files = file.listFiles();
+        xout.writeEndElement();
+        xout.writeCharacters("\n");
+    }
+    private void writePkgInfo(File file) throws IOException {
+        Writer out = new BufferedWriter(new FileWriter(file));
 
-        for (int i = 0; i < files.length; i++) {
-          delete(files[i]);
+        try {
+            out.write(OS_TYPE_CODE + signature);
+            out.flush();
+        } finally {
+            out.close();
         }
-      }
-
-      Files.delete(filePath);
     }
-  }
 
+    private static void delete(File file) throws IOException {
+        Path filePath = file.toPath();
 
-  private static void copy(URL location, File file) throws IOException {
-    try (InputStream in = location.openStream()) {
-      Files.copy(in, file.toPath(),
-                 // can't do attributes when coming from URL
-                 StandardCopyOption.REPLACE_EXISTING);
+        if (Files.exists(filePath, LinkOption.NOFOLLOW_LINKS)) {
+            if (Files.isDirectory(filePath, LinkOption.NOFOLLOW_LINKS)) {
+                File[] files = file.listFiles();
+
+                for (int i = 0; i < files.length; i++) {
+                    delete(files[i]);
+                }
+            }
+
+            Files.delete(filePath);
+        }
     }
-  }
 
+    private static void copy(URL location, File file) throws IOException {
+        try (InputStream in = location.openStream()) {
+            Files.copy(in, file.toPath(), StandardCopyOption.REPLACE_EXISTING);
+        }
+        catch (Exception exc)
+        {
+        System.err.println ("Trying to copy " + location + " to " + file);
+            throw exc;
+        }
+    }
 
-  private static void copy(File source, File destination) throws IOException {
-    Path sourcePath = source.toPath();
-    Path destinationPath = destination.toPath();
+    static void copy(File source, File destination) throws IOException {
+        Path sourcePath = source.toPath();
+        Path destinationPath = destination.toPath();
 
-    destination.getParentFile().mkdirs();
+        destination.getParentFile().mkdirs();
 
-    Files.copy(sourcePath, destinationPath,
+        Files.copy(sourcePath, destinationPath,
                StandardCopyOption.REPLACE_EXISTING,
                StandardCopyOption.COPY_ATTRIBUTES,
                LinkOption.NOFOLLOW_LINKS);
 
-    if (Files.isDirectory(sourcePath, LinkOption.NOFOLLOW_LINKS)) {
-      String[] files = source.list();
+        if (Files.isDirectory(sourcePath)) {
+            String[] files = source.list();
 
-      for (String file : files) {
-        copy(new File(source, file), new File(destination, file));
-      }
+            for (String file : files) {
+              copy(new File(source, file), new File(destination, file));
+            }
+        }
     }
-  }
 }
diff --git a/build/macosx/appbundler/src/com/oracle/appbundler/BundleDocument.java b/build/macosx/appbundler/src/com/oracle/appbundler/BundleDocument.java
index 7e26d4391c..046ae4f1fc 100644
--- a/build/macosx/appbundler/src/com/oracle/appbundler/BundleDocument.java
+++ b/build/macosx/appbundler/src/com/oracle/appbundler/BundleDocument.java
@@ -18,12 +18,14 @@
  * 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.
- *
+ * 
  */
 
 package com.oracle.appbundler;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.tools.ant.BuildException;
 
@@ -31,95 +33,157 @@
 /**
  * Represent a CFBundleDocument.
  */
-public class BundleDocument {
-  private String name = "editor";
-  private String role = "";
-  private File icon = null;
-  private String[] extensions;
-  private boolean isPackage = false;
-
-
-  static private String capitalizeFirst(String string) {
-    char[] stringArray = string.toCharArray();
-    stringArray[0] = Character.toUpperCase(stringArray[0]);
-    return new String(stringArray);
-  }
-
-
-  public void setExtensions(String extensionsList) {
-    if (extensionsList == null) {
-      throw new BuildException("Extensions can't be null");
+public class BundleDocument implements IconContainer {
+    private String name = null;
+    private String role = "Editor";
+    private String icon = null;
+    private String handlerRank = null;
+    private List<String> extensions;
+    private List<String> contentTypes;
+    private List<String> exportableTypes;
+    private boolean isPackage = false;
+
+    private String capitalizeFirst(String string) {
+        char[] stringArray = string.toCharArray();
+        stringArray[0] = Character.toUpperCase(stringArray[0]);
+        return new String(stringArray);
     }
-
-    extensions = extensionsList.split(",");
-    for (int i = 0; i < extensions.length; i++) {
-      extensions[i] = extensions[i].trim().toLowerCase();
+    
+    public void setExtensions(String extensionsString) {
+        extensions = getListFromCommaSeparatedString(extensionsString, "Extensions", true);
     }
-  }
-
-
-  public void setIcon(File icon) {
-    this.icon = icon;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  public void setRole(String role) {
-    this.role = capitalizeFirst(role);
-  }
-
-
-  public void setIsPackage(String isPackageString) {
-    this.isPackage = isPackageString.trim().equalsIgnoreCase("true");
-  }
-
-
-  public String getIconName() {
-    return icon.getName();
-  }
-
-
-  public File getIconFile() {
-    return icon;
-  }
-
 
-  public String getName() {
-    return name;
-  }
+    public void setContentTypes(String contentTypesString) {
+        contentTypes = getListFromCommaSeparatedString(contentTypesString, "Content Types");
+    }
 
+    public void setExportableTypes(String exportableTypesString) {
+        exportableTypes = getListFromCommaSeparatedString(exportableTypesString, "Exportable Types");
+    }
 
-  public String getRole() {
-    return role;
-  }
+    public static List<String> getListFromCommaSeparatedString(String listAsString,
+            final String attributeName) {
+        return getListFromCommaSeparatedString(listAsString, attributeName, false);
+    }
+            
+    public static List<String> getListFromCommaSeparatedString(String listAsString,
+            final String attributeName, final boolean lowercase) {
+        if(listAsString == null) {
+            throw new BuildException(attributeName + " can't be null");
+        }
+        
+        String[] splittedListAsString = listAsString.split(",");
+        List<String> stringList = new ArrayList<String>();
+        
+        for (String extension : splittedListAsString) {
+            String cleanExtension = extension.trim();
+            if (lowercase) {
+                cleanExtension = cleanExtension.toLowerCase();
+            }
+            if (cleanExtension.length() > 0) {
+                stringList.add(cleanExtension);
+            }
+        }
+        
+        if (stringList.size() == 0) {
+            throw new BuildException(attributeName + " list must not be empty");
+        }
+        return stringList;
+    }
+    
+    public void setIcon(String icon) {
+      this.icon = icon;
+    }
 
+    public void setName(String name) {
+      this.name = name;
+    }
 
-  public String[] getExtensions() {
-    return extensions;
-  }
+    public void setRole(String role) {
+      this.role = capitalizeFirst(role);
+    }
+    
+    public void setHandlerRank(String handlerRank) {
+      this.handlerRank = capitalizeFirst(handlerRank);
+    } 
+      
+    public void setIsPackage(String isPackageString) {
+        if(isPackageString.trim().equalsIgnoreCase("true")) {
+            this.isPackage = true;
+        } else {
+            this.isPackage = false;
+        }
+    }
+    
+    public String getIcon() {
+        return icon;
+    }
 
+    public String getName() {
+        return name;
+    }
 
-  public boolean hasIcon() {
-    return icon != null;
-  }
+    public String getRole() {
+        return role;
+    }
 
+    public String getHandlerRank() {
+        return handlerRank;
+    }
+    
+    public List<String> getExtensions() {
+        return extensions;
+    }
+    
+    public List<String> getContentTypes() {
+        return contentTypes;
+    }
+    
+    public List<String> getExportableTypes() {
+        return exportableTypes;
+    }
+    
+    public File getIconFile() {
+        if (icon == null) { return null; }
 
-  public boolean isPackage() {
-    return isPackage;
-  }
+        File ifile = new File (icon);
+        
+        if (! ifile.exists ( ) || ifile.isDirectory ( )) { return null; }
 
+        return ifile;
+    }
+    
+    public boolean hasIcon() {
+        return icon != null;
+    }
+    
+    public boolean isPackage() {
+        return isPackage;
+    }
 
-  @Override
-  public String toString() {
-    StringBuilder s = new StringBuilder(getName());
-    s.append(" ").append(getRole()).append(" ").append(getIconName()).append(" ");
-    for (String extension : extensions) {
-      s.append(extension).append(" ");
+    @Override
+    public String toString() {
+        StringBuilder s = new StringBuilder(getName());
+        s.append(" ").append(getRole())
+        .append(" ").append(getIcon())
+        .append(" ").append(getHandlerRank())
+        .append(" ");
+        if (contentTypes != null) {
+            for(String contentType : contentTypes) {
+                s.append(contentType).append(" ");
+            }
+        }
+        if (extensions != null) {
+            for(String extension : extensions) {
+                s.append(extension).append(" ");
+            }
+        }
+        if (exportableTypes != null) {
+            for(String exportableType : exportableTypes) {
+                s.append(exportableType).append(" ");
+            }
+        }
+        
+        return s.toString();
     }
-    return s.toString();
-  }
 }
diff --git a/build/macosx/appbundler/src/com/oracle/appbundler/Environment.java b/build/macosx/appbundler/src/com/oracle/appbundler/Environment.java
new file mode 100644
index 0000000000..b782ab3093
--- /dev/null
+++ b/build/macosx/appbundler/src/com/oracle/appbundler/Environment.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015, 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 com.oracle.appbundler;
+
+public class Environment extends Option {
+    
+}
diff --git a/build/macosx/appbundler/src/com/oracle/appbundler/IconContainer.java b/build/macosx/appbundler/src/com/oracle/appbundler/IconContainer.java
new file mode 100644
index 0000000000..38691e3848
--- /dev/null
+++ b/build/macosx/appbundler/src/com/oracle/appbundler/IconContainer.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015, Quality First Software GmbH 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.
+ *
+ */
+
+package com.oracle.appbundler;
+
+import java.io.File;
+
+public interface IconContainer {
+    public boolean hasIcon();
+    public String getIcon();
+    public File getIconFile();
+}
diff --git a/build/macosx/appbundler/src/com/oracle/appbundler/Option.java b/build/macosx/appbundler/src/com/oracle/appbundler/Option.java
index d9eaf3f5e9..c88f2a8909 100644
--- a/build/macosx/appbundler/src/com/oracle/appbundler/Option.java
+++ b/build/macosx/appbundler/src/com/oracle/appbundler/Option.java
@@ -28,9 +28,33 @@
 
 /**
  * Class representing an option that will be passed to the JVM at startup.
+ * The class can optionally be named, which allows the bundled Java program
+ * itself to override the option. Changes will take effect upon restart of the
+ * application.<p>
+ * Assuming your {@code CFBundleIdentifier} (settable via {@link AppBundlerTask#setIdentifier(String)})
+ * is {@code com.oracle.appbundler}. Then you can override a named option by calling
+ * <xmp>
+ *     import java.util.prefs.Preferences;
+ *     [...]
+ *     Preferences jvmOptions = Preferences.userRoot().node("/com/oracle/appbundler/JVMOptions");
+ *     jvmOptions.put("name", "value");
+ *     jvmOptions.flush();
+ * </xmp>
+ * The corresponding entries will be stored in a file called
+ * {@code ~/Library/Preferences/com.oracle.appbundler.plist}.
+ * To manipulate the file without Java's {@link java.util.prefs.Preferences} from the command line,
+ * you should use the tool
+ * <a href="https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/defaults.1.html">defaults</a>.
+ * For example, to add an entry via the command line, use:
+ * <xmp>
+ *     defaults write com.oracle.appbundler /com/oracle/appbundler/ -dict-add JVMOptions/ '{"name"="value";}'
+ * </xmp>
+ *
+ * @author <a href="mailto:hs@tagtraum.com">Hendrik Schreiber</a> (preference related code only)
  */
 public class Option {
     private String value = null;
+    private String name = null;
 
     public String getValue() {
         return value;
@@ -40,8 +64,16 @@ public void setValue(String value) {
         this.value = value;
     }
 
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
     @Override
     public String toString() {
-        return value;
+        return name == null ? value : name + "=" + value;
     }
 }
diff --git a/build/macosx/appbundler/src/com/oracle/appbundler/PlistEntry.java b/build/macosx/appbundler/src/com/oracle/appbundler/PlistEntry.java
new file mode 100644
index 0000000000..beb4ea159d
--- /dev/null
+++ b/build/macosx/appbundler/src/com/oracle/appbundler/PlistEntry.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015, 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 com.oracle.appbundler;
+
+public class PlistEntry extends Option {
+    private String type = null;
+
+    public void setKey(String key) {
+        setName(key);
+    }
+
+    public String getKey() {
+        return getName();
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getType() {
+        return type;
+    }
+}
diff --git a/build/macosx/appbundler/src/com/oracle/appbundler/Runtime.java b/build/macosx/appbundler/src/com/oracle/appbundler/Runtime.java
new file mode 100644
index 0000000000..073e3abb28
--- /dev/null
+++ b/build/macosx/appbundler/src/com/oracle/appbundler/Runtime.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2012, 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 com.oracle.appbundler;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.types.FileSet;
+
+public class Runtime extends FileSet {
+
+    /* Override to provide canonical path so that runtime can be specified
+     * via a version-agnostic path (relative link, e.g. `current-jre`) while
+     * still preserving the original runtime directory name, e.g. `jre1.8.0_45.jre`.
+     */
+    @Override
+    public File getDir() {
+        File dir = super.getDir();
+        try {
+            return dir.getCanonicalFile();
+        } catch (IOException e) {
+            return dir;
+        }
+    }
+
+    private void detectType() {
+        boolean isJDK = new File(getDir(), "jre").isDirectory();
+        
+        if (isJDK) {
+            appendIncludes(new String[] {
+                    "jre/lib/",
+                    "jreCOPYRIGHT",
+                    "jre/LICENSE",
+                    "jre/README",
+                    "jre/THIRDPARTYLICENSEREADME-JAVAFX.txt",
+                    "jre/THIRDPARTYLICENSEREADME.txt",
+                    "jre/Welcome.html"
+            });
+            appendExcludes(new String[] {
+                    "jre/lib/deploy/",
+                    "jre/lib/deploy.jar",
+                    "jre/lib/javaws.jar",
+                    "jre/lib/libdeploy.dylib",
+                    "jre/lib/libnpjp2.dylib",
+                    "jre/lib/plugin.jar",
+                    "jre/lib/security/javaws.policy"
+                });
+        } else {
+            appendIncludes(new String[] {
+                    "lib/",
+                    "COPYRIGHT",
+                    "LICENSE",
+                    "README",
+                    "THIRDPARTYLICENSEREADME-JAVAFX.txt",
+                    "THIRDPARTYLICENSEREADME.txt",
+                    "Welcome.html"
+            });
+        }
+    }
+
+    void copyTo(File targetDir) throws IOException {
+        detectType();
+        
+        File runtimeHomeDirectory = getDir();
+        File runtimeContentsDirectory = runtimeHomeDirectory.getParentFile();
+        File runtimeDirectory = runtimeContentsDirectory.getParentFile();
+
+        // Create root plug-in directory
+        File pluginDirectory = new File(targetDir, runtimeDirectory.getName());
+        pluginDirectory.mkdir();
+
+        // Create Contents directory
+        File pluginContentsDirectory = new File(pluginDirectory, runtimeContentsDirectory.getName());
+        pluginContentsDirectory.mkdir();
+
+        // Copy MacOS directory
+        File runtimeMacOSDirectory = new File(runtimeContentsDirectory, "MacOS");
+        AppBundlerTask.copy(runtimeMacOSDirectory, new File(pluginContentsDirectory, runtimeMacOSDirectory.getName()));
+
+
+        // Copy Info.plist file
+        File runtimeInfoPlistFile = new File(runtimeContentsDirectory, "Info.plist");
+        AppBundlerTask.copy(runtimeInfoPlistFile, new File(pluginContentsDirectory, runtimeInfoPlistFile.getName()));
+
+        // Copy included contents of Home directory
+        File pluginHomeDirectory = new File(pluginContentsDirectory, runtimeHomeDirectory.getName());
+
+        DirectoryScanner directoryScanner = getDirectoryScanner(getProject());
+        String[] includedFiles = directoryScanner.getIncludedFiles();
+
+        for (int i = 0; i < includedFiles.length; i++) {
+            String includedFile = includedFiles[i];
+            File source = new File(runtimeHomeDirectory, includedFile);
+            File destination = new File(pluginHomeDirectory, includedFile);
+            AppBundlerTask.copy(source, destination);
+        }
+    }
+}
diff --git a/build/macosx/appbundler/src/com/oracle/appbundler/TypeDeclaration.java b/build/macosx/appbundler/src/com/oracle/appbundler/TypeDeclaration.java
new file mode 100644
index 0000000000..418fb5c409
--- /dev/null
+++ b/build/macosx/appbundler/src/com/oracle/appbundler/TypeDeclaration.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2015, Quality First Software GmbH 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.
+ *
+ */
+
+package com.oracle.appbundler;
+
+import static com.oracle.appbundler.BundleDocument.getListFromCommaSeparatedString;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Class representing an UTExportedTypeDeclaration or UTImportedTypeDeclaration in Info.plist
+ */
+public class TypeDeclaration implements IconContainer {
+
+    private boolean imported = false;
+    private String identifier = null;
+    private String referenceUrl = null;
+    private String description = null;
+    private String icon = null;
+    private List<String> conformsTo = null;
+    private List<String> osTypes = null;
+    private List<String> mimeTypes = null;
+    private List<String> extensions = null;
+
+    public TypeDeclaration() {
+        this.conformsTo = Arrays.asList(new String[]{"public.data"});
+    }
+    
+    public boolean isImported() {
+        return imported;
+    }
+
+    public void setImported(boolean imported) {
+        this.imported = imported;
+    }
+
+    public String getIdentifier() {
+        return identifier;
+    }
+
+    public void setIdentifier(String identifier) {
+        this.identifier = identifier;
+    }
+
+    public String getReferenceUrl() {
+        return referenceUrl;
+    }
+
+    public void setReferenceUrl(String referenceUrl) {
+        this.referenceUrl = referenceUrl;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+    public File getIconFile() {
+        if (icon == null) { return null; }
+
+        File ifile = new File (icon);
+        
+        if (! ifile.exists ( ) || ifile.isDirectory ( )) { return null; }
+
+        return ifile;
+    }
+    
+    public boolean hasIcon() {
+        return icon != null;
+    }
+    
+    public List<String> getConformsTo() {
+        return conformsTo;
+    }
+
+    public void setConformsTo(String conformsToAsString) {
+        this.conformsTo = getListFromCommaSeparatedString(conformsToAsString, "Conforms To");
+    }
+
+    public List<String> getOsTypes() {
+        return osTypes;
+    }
+
+    public void setOsTypes(String osTypesAsString) {
+        this.osTypes = getListFromCommaSeparatedString(osTypesAsString, "OS Types");
+    }
+
+    public List<String> getMimeTypes() {
+        return mimeTypes;
+    }
+
+    public void setMimeTypes(String mimeTypesAsString) {
+        this.mimeTypes = getListFromCommaSeparatedString(mimeTypesAsString, "Mime Types", true);
+    }
+
+    public List<String> getExtensions() {
+        return extensions;
+    }
+
+    public void setExtensions(String extensionsAsString) {
+        this.extensions = getListFromCommaSeparatedString(extensionsAsString, "Extensions", true);
+    }
+
+    @Override
+    public String toString() {
+        return "" + imported;
+    }
+}
diff --git a/build/shared/tools/MovieMaker/build.xml b/build/shared/tools/MovieMaker/build.xml
index 4669b8500a..f56fbc954a 100644
--- a/build/shared/tools/MovieMaker/build.xml
+++ b/build/shared/tools/MovieMaker/build.xml
@@ -1,23 +1,22 @@
 <?xml version="1.0"?>
 <project name="Movie Maker Tool" default="build">
-  
+
   <target name="clean" description="Clean the build directories">
     <delete dir="bin" />
     <delete file="tool/MovieMaker.jar" />
   </target>
 
-  <target name="compile" description="Compile sources">   
+  <target name="compile" description="Compile sources">
     <mkdir dir="bin" />
     <javac target="1.8"
 	   source="1.8"
-	   srcdir="src" 
-	   destdir="bin" 
+	   srcdir="src"
+	   destdir="bin"
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
-	   classpath="../../../../app/bin" 
-	   nowarn="true"
-	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
-      <compilerclasspath path="../../../../java/mode/org.eclipse.jdt.core.jar; 
+	   classpath="../../../../app/bin"
+	   nowarn="true">
+      <compilerclasspath path="../../../../java/mode/org.eclipse.jdt.core.jar;
                                ../../../../java/mode/jdtCompilerAdapter.jar" />
     </javac>
   </target>
diff --git a/build/windows/config-cmd.xml b/build/windows/config-cmd.xml
index 44cc9e9ca7..527c0d75e8 100755
--- a/build/windows/config-cmd.xml
+++ b/build/windows/config-cmd.xml
@@ -30,10 +30,12 @@
   <jre>
     <path>java</path>
     <!-- Deal with jokers who install JOGL, ANTLR, etc system-wide -->
-    <opt>-Djava.ext.dirs="%EXEDIR%\\java\\lib\\ext"</opt>
+    <!-- <opt>-Djava.ext.dirs="%EXEDIR%\\java\\lib\\ext"</opt> -->
     <!-- Prevent a user-installed JNA from conflicting with our version.
          https://github.com/processing/processing/issues/2239 -->
     <opt>-Djna.nosys=true</opt>
+    <!-- No scaling of swing (see #5753) -->
+    <opt>-Dsun.java2d.uiScale=1</opt>
     <!-- starting in 3.0, require Java 8 -->
     <minVersion>1.8.0_60</minVersion>
     <!-- increase available per PDE X request -->
diff --git a/build/windows/config.xml b/build/windows/config.xml
index 1184cb4066..e2e69575f5 100755
--- a/build/windows/config.xml
+++ b/build/windows/config.xml
@@ -27,11 +27,11 @@
   <jre>
     <path>java</path>
     <!-- Deal with jokers who install JOGL, ANTLR, etc system-wide -->
-    <opt>-Djava.ext.dirs="%EXEDIR%\\java\\lib\\ext"</opt>
+    <!-- <opt>-Djava.ext.dirs="%EXEDIR%\\java\\lib\\ext"</opt> -->
     <!-- https://github.com/processing/processing/issues/2239 -->
     <opt>-Djna.nosys=true</opt>
-    <!-- Because nosys is set to true, the DLL in the current working 
-	 directory won't be considered. And we can't specify the user's 
+    <!-- Because nosys is set to true, the DLL in the current working
+	 directory won't be considered. And we can't specify the user's
 	 directory here because that'll get us into encoding trouble.
 	 (See https://github.com/processing/processing/issues/3624)
 	 Instead, set this so that Native.loadNativeLibrary() will use
@@ -44,6 +44,8 @@
     <opt>-Dsun.java2d.d3d=false</opt>
     <opt>-Dsun.java2d.ddoffscreen=false</opt>
     <opt>-Dsun.java2d.noddraw=true</opt>
+    <!-- No scaling of swing (see #5753) -->
+    <opt>-Dsun.java2d.uiScale=1</opt>
     <!-- starting in 3.0, require Java 8 -->
     <minVersion>1.8.0_60</minVersion>
     <!-- increase available per PDE X request -->
diff --git a/core/.classpath b/core/.classpath
index d2a2b28efc..8cc9f1f798 100644
--- a/core/.classpath
+++ b/core/.classpath
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="lib" path="library/jogl-all.jar"/>
 	<classpathentry kind="lib" path="library/gluegen-rt.jar"/>
 	<classpathentry kind="lib" path="apple.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JavaFX11"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/build.xml b/core/build.xml
index e1bf0fd5fc..3951c7ed58 100644
--- a/core/build.xml
+++ b/core/build.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0"?>
 <project name="Processing Core" default="build">
 
+  <property environment="env"/>
+
   <target name="clean" description="Clean out the build directories">
     <delete dir="bin" />
+    <delete dir="bin-test" />
     <delete file="library/core.jar" />
   </target>
 
@@ -14,67 +17,102 @@
     <subant buildpath="methods" target="dist" />
   </target>
 
-  <target name="compile" description="Compile" depends="methods-build">
-    <taskdef name="methods"
-	     classname="PAppletMethods"
-	     classpath="methods/methods.jar" />
-    <methods dir="${basedir}/src/processing/core" recorder="true" />
-
-    <!-- Where can I expect to find Java Mode JARs? -->
-    <property name="java.mode" value="../java/mode/" />
-
-    <!-- Check for JDT compiler, since this is likely a PDE build. Using
-	 it allows us to build the PDE with only a JRE on Windows and Linux.
-	 So that the core can be built independently of the PDE,
-	 use javac (the "modern" compiler) if ecj is not present. -->
-    <property name="jdt.jar" value="${java.mode}/org.eclipse.jdt.core.jar" />
-    <condition property="build.compiler"
-	       value="org.eclipse.jdt.core.JDTCompilerAdapter"
-	       else="modern">
-      <available file="${jdt.jar}" />
-    </condition>
-    <!--<echo message="compiler is ${build.compiler}" />-->
-
-    <!-- JavaFX got removed from the Oracle's JDK for arm -->
-    <condition property="fx.unavailable" value="true">
-      <or>
-        <equals arg1="${os.arch}" arg2="arm" />
-        <equals arg1="${os.arch}" arg2="aarch64" />
-      </or>
-    </condition>
-
-    <!-- link against apple.jar for the ThinkDifferent class -->
-    <mkdir dir="bin" />
-    <javac source="1.8"
-	   target="1.8"
-	   encoding="UTF-8"
-	   includeAntRuntime="false"
-	   debug="true"
-	   destdir="bin"
-	   classpath="apple.jar;
-                      library/jogl-all.jar;
-                      library/gluegen-rt.jar"
-	   nowarn="true">
-      <!-- kinda gross, but if not using the JDT, this just ignored anyway -->
-      <compilerclasspath path="${jdt.jar}; ${java.mode}/jdtCompilerAdapter.jar" />
-      <src path="src" />
-      <include name="processing/**" />
-      <exclude name="processing/javafx/**" if="fx.unavailable" />
-    </javac>
-
-    <!-- Copy the jnilib to the bin folder so it's included. -->
-    <copy todir="bin/japplemenubar"
-	        file="src/japplemenubar/libjAppleMenuBar.jnilib"
-          preservelastmodified="true" />
-
-    <!-- Copy shaders to bin. (Eclipse does this automatically.) -->
-    <copy todir="bin" preservelastmodified="true">
-      <fileset dir="src">
-        <include name="processing/opengl/shaders/*.glsl" />
-        <include name="processing/opengl/cursors/*.png" />
-        <include name="icon/*.png" />
-      </fileset>
-    </copy>
+  <path id="classpath.base">
+    <!-- kinda gross, but if not using the JDT, this just ignored anyway -->
+    <pathelement location="apple.jar" />
+    <pathelement location="library/jogl-all.jar" />
+    <pathelement location="library/gluegen-rt.jar" />
+    <pathelement location="library/javafx-swt.jar" />
+    <pathelement location="library/javafx.base.jar" />
+    <pathelement location="library/javafx.controls.jar" />
+    <pathelement location="library/javafx.fxml.jar" />
+    <pathelement location="library/javafx.graphics.jar" />
+    <pathelement location="library/javafx.media.jar" />
+    <pathelement location="library/javafx.properties" />
+    <pathelement location="library/javafx.swing.jar" />
+    <pathelement location="library/javafx.web.jar" />
+  </path>
+
+  <path id="classpath.test">
+    <pathelement location="library-test/junit-4.8.1.jar" />
+    <pathelement location="library-test/mockito-all-1.10.19.jar" />
+    <pathelement location="bin-test" />
+    <path refid="classpath.base" />
+  </path>
+
+  <macrodef name="compilecommon">
+    <attribute name="destdir"/>
+    <attribute name="srcdir"/>
+    <attribute name="classpath"/>
+    <sequential>
+      <taskdef name="methods"
+  	     classname="PAppletMethods"
+  	     classpath="methods/methods.jar" />
+      <methods dir="${basedir}/src/processing/core" recorder="true" />
+
+      <!-- Where can I expect to find Java Mode JARs? -->
+      <property name="java.mode" value="../java/mode/" />
+
+      <!-- JavaFX got removed from the Oracle's JDK for arm and Java 11 -->
+      <condition property="fx.unavailable" value="true">
+        <or>
+          <equals arg1="${os.arch}" arg2="arm" />
+          <equals arg1="${os.arch}" arg2="aarch64" />
+        </or>
+      </condition>
+
+      <!-- link against apple.jar for the ThinkDifferent class -->
+      <mkdir dir="@{destdir}" />
+      <javac source="1.8"
+  	   target="1.8"
+  	   encoding="UTF-8"
+  	   includeAntRuntime="false"
+  	   debug="true"
+  	   destdir="@{destdir}"
+  	   nowarn="true">
+        <classpath refid="@{classpath}"/>
+        <src path="@{srcdir}" />
+        <include name="processing/**" />
+        <exclude name="processing/javafx/**" if="fx.unavailable" />
+      </javac>
+
+      <!-- Copy the jnilib to the bin folder so it's included. -->
+      <copy todir="bin/japplemenubar"
+  	  file="src/japplemenubar/libjAppleMenuBar.jnilib" />
+
+      <!-- Copy shaders to bin. (Eclipse does this automatically.) -->
+      <copy todir="bin">
+        <fileset dir="src">
+          <include name="processing/opengl/shaders/*.glsl" />
+          <include name="processing/opengl/cursors/*.png" />
+          <include name="icon/*.png" />
+        </fileset>
+      </copy>
+    </sequential>
+  </macrodef>
+
+  <target name="test-compile" description="Compile" depends="methods-build">
+    <compilecommon srcdir="src; test" destdir="bin-test" classpath="classpath.test" />
+  </target>
+
+  <target name="clean-pre-test" description="Required step prior to test">
+    <delete dir="resource-test/scratch" />
+  </target>
+
+  <target name="test" depends="test-compile, clean-pre-test">
+    <junit haltonfailure="true">
+      <classpath refid="classpath.test" />
+      <formatter type="brief" usefile="false" />
+      <batchtest>
+        <fileset dir="test">
+          <include name="**/*Test.java" />
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="compile" description="Compile" depends="test">
+    <compilecommon srcdir="src" destdir="bin" classpath="classpath.base" />
   </target>
 
   <target name="build" depends="compile" description="Build core library">
diff --git a/core/library-test/junit-4.8.1.jar b/core/library-test/junit-4.8.1.jar
new file mode 100644
index 0000000000..524cd65ce5
Binary files /dev/null and b/core/library-test/junit-4.8.1.jar differ
diff --git a/core/library-test/license.txt b/core/library-test/license.txt
new file mode 100644
index 0000000000..1c02486bae
--- /dev/null
+++ b/core/library-test/license.txt
@@ -0,0 +1,2 @@
+JUnit under EPL license: https://junit.org/junit4/license.html.
+Mockito under MIT license: https://github.com/mockito/mockito/blob/master/LICENSE.
diff --git a/core/library-test/mockito-all-1.10.19.jar b/core/library-test/mockito-all-1.10.19.jar
new file mode 100644
index 0000000000..c831489cd9
Binary files /dev/null and b/core/library-test/mockito-all-1.10.19.jar differ
diff --git a/core/library/export.txt b/core/library/export.txt
index a750489709..75553c1e5d 100644
--- a/core/library/export.txt
+++ b/core/library/export.txt
@@ -1,12 +1,18 @@
-# If you want to support more platforms, visit jogamp.org to get the 
-# natives libraries for the platform in question (i.e. Solaris). 
-
-name = OpenGL
-
-application.macosx=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-macosx-universal.jar,gluegen-rt-natives-macosx-universal.jar
-application.windows32=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-windows-i586.jar,gluegen-rt-natives-windows-i586.jar
-application.windows64=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-windows-amd64.jar,gluegen-rt-natives-windows-amd64.jar
-application.linux32=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-linux-i586.jar,gluegen-rt-natives-linux-i586.jar
-application.linux64=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-linux-amd64.jar,gluegen-rt-natives-linux-amd64.jar
-application.linux-armv6hf=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-linux-armv6hf.jar,gluegen-rt-natives-linux-armv6hf.jar
-application.linux-arm64=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-linux-aarch64.jar,gluegen-rt-natives-linux-aarch64.jar
+# If you want to support more platforms, visit jogamp.org to get the
+# natives libraries for the platform in question (i.e. Solaris).
+
+name = CoreOpenJFXOpenGL
+
+application.macosx=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-macosx-universal.jar,gluegen-rt-natives-macosx-universal.jar,javafx-swt.jar,javafx.base.jar,javafx.controls.jar,javafx.fxml.jar,javafx.graphics.jar,javafx.media.jar,javafx.swing.jar,javafx.web.jar,libdecora_sse.dylib,libfxplugins.dylib,libglass.dylib,libglib-lite.dylib,libgstreamer-lite.dylib,libjavafx_font.dylib,libjavafx_iio.dylib,libjfxmedia.dylib,libjfxmedia_avf.dylib,libjfxwebkit.dylib,libprism_common.dylib,libprism_es2.dylib,libprism_sw.dylib
+
+application.windows32=api-ms-win-core-console-l1-1-0.dll,api-ms-win-core-datetime-l1-1-0.dll,api-ms-win-core-debug-l1-1-0.dll,api-ms-win-core-errorhandling-l1-1-0.dll,api-ms-win-core-file-l1-1-0.dll,api-ms-win-core-file-l1-2-0.dll,api-ms-win-core-file-l2-1-0.dll,api-ms-win-core-handle-l1-1-0.dll,api-ms-win-core-heap-l1-1-0.dll,api-ms-win-core-interlocked-l1-1-0.dll,api-ms-win-core-libraryloader-l1-1-0.dll,api-ms-win-core-localization-l1-2-0.dll,api-ms-win-core-memory-l1-1-0.dll,api-ms-win-core-namedpipe-l1-1-0.dll,api-ms-win-core-processenvironment-l1-1-0.dll,api-ms-win-core-processthreads-l1-1-0.dll,api-ms-win-core-processthreads-l1-1-1.dll,api-ms-win-core-profile-l1-1-0.dll,api-ms-win-core-rtlsupport-l1-1-0.dll,api-ms-win-core-string-l1-1-0.dll,api-ms-win-core-synch-l1-1-0.dll,api-ms-win-core-synch-l1-2-0.dll,api-ms-win-core-sysinfo-l1-1-0.dll,api-ms-win-core-timezone-l1-1-0.dll,api-ms-win-core-util-l1-1-0.dll,api-ms-win-crt-conio-l1-1-0.dll,api-ms-win-crt-convert-l1-1-0.dll,api-ms-win-crt-environment-l1-1-0.dll,api-ms-win-crt-filesystem-l1-1-0.dll,api-ms-win-crt-heap-l1-1-0.dll,api-ms-win-crt-locale-l1-1-0.dll,api-ms-win-crt-math-l1-1-0.dll,api-ms-win-crt-multibyte-l1-1-0.dll,api-ms-win-crt-private-l1-1-0.dll,api-ms-win-crt-process-l1-1-0.dll,api-ms-win-crt-runtime-l1-1-0.dll,api-ms-win-crt-stdio-l1-1-0.dll,api-ms-win-crt-string-l1-1-0.dll,api-ms-win-crt-time-l1-1-0.dll,api-ms-win-crt-utility-l1-1-0.dll,concrt140.dll,core.jar,decora_sse.dll,fxplugins.dll,glass.dll,glib-lite.dll,gluegen-rt-natives-linux-aarch64.jar,gluegen-rt-natives-linux-amd64.jar,gluegen-rt-natives-linux-armv6hf.jar,gluegen-rt-natives-linux-i586.jar,gluegen-rt-natives-macosx-universal.jar,gluegen-rt-natives-windows-amd64.jar,gluegen-rt-natives-windows-i586.jar,gluegen-rt.jar,gstreamer-lite.dll,javafx-swt.jar,javafx.base.jar,javafx.controls.jar,javafx.fxml.jar,javafx.graphics.jar,javafx.media.jar,javafx.properties,javafx.swing.jar,javafx.web.jar,javafx_font.dll,javafx_iio.dll,jfxmedia.dll,jfxwebkit.dll,jogl-all-natives-linux-aarch64.jar,jogl-all-natives-linux-amd64.jar,jogl-all-natives-linux-armv6hf.jar,jogl-all-natives-linux-i586.jar,jogl-all-natives-macosx-universal.jar,jogl-all-natives-windows-amd64.jar,jogl-all-natives-windows-i586.jar,jogl-all.jar,msvcp140.dll,prism_common.dll,prism_d3d.dll,prism_sw.dll,ucrtbase.dll,vcruntime140.dll
+
+application.windows64=api-ms-win-core-console-l1-1-0.dll,api-ms-win-core-datetime-l1-1-0.dll,api-ms-win-core-debug-l1-1-0.dll,api-ms-win-core-errorhandling-l1-1-0.dll,api-ms-win-core-file-l1-1-0.dll,api-ms-win-core-file-l1-2-0.dll,api-ms-win-core-file-l2-1-0.dll,api-ms-win-core-handle-l1-1-0.dll,api-ms-win-core-heap-l1-1-0.dll,api-ms-win-core-interlocked-l1-1-0.dll,api-ms-win-core-libraryloader-l1-1-0.dll,api-ms-win-core-localization-l1-2-0.dll,api-ms-win-core-memory-l1-1-0.dll,api-ms-win-core-namedpipe-l1-1-0.dll,api-ms-win-core-processenvironment-l1-1-0.dll,api-ms-win-core-processthreads-l1-1-0.dll,api-ms-win-core-processthreads-l1-1-1.dll,api-ms-win-core-profile-l1-1-0.dll,api-ms-win-core-rtlsupport-l1-1-0.dll,api-ms-win-core-string-l1-1-0.dll,api-ms-win-core-synch-l1-1-0.dll,api-ms-win-core-synch-l1-2-0.dll,api-ms-win-core-sysinfo-l1-1-0.dll,api-ms-win-core-timezone-l1-1-0.dll,api-ms-win-core-util-l1-1-0.dll,api-ms-win-crt-conio-l1-1-0.dll,api-ms-win-crt-convert-l1-1-0.dll,api-ms-win-crt-environment-l1-1-0.dll,api-ms-win-crt-filesystem-l1-1-0.dll,api-ms-win-crt-heap-l1-1-0.dll,api-ms-win-crt-locale-l1-1-0.dll,api-ms-win-crt-math-l1-1-0.dll,api-ms-win-crt-multibyte-l1-1-0.dll,api-ms-win-crt-private-l1-1-0.dll,api-ms-win-crt-process-l1-1-0.dll,api-ms-win-crt-runtime-l1-1-0.dll,api-ms-win-crt-stdio-l1-1-0.dll,api-ms-win-crt-string-l1-1-0.dll,api-ms-win-crt-time-l1-1-0.dll,api-ms-win-crt-utility-l1-1-0.dll,concrt140.dll,core.jar,decora_sse.dll,fxplugins.dll,glass.dll,glib-lite.dll,gluegen-rt-natives-linux-aarch64.jar,gluegen-rt-natives-linux-amd64.jar,gluegen-rt-natives-linux-armv6hf.jar,gluegen-rt-natives-linux-i586.jar,gluegen-rt-natives-macosx-universal.jar,gluegen-rt-natives-windows-amd64.jar,gluegen-rt-natives-windows-i586.jar,gluegen-rt.jar,gstreamer-lite.dll,javafx-swt.jar,javafx.base.jar,javafx.controls.jar,javafx.fxml.jar,javafx.graphics.jar,javafx.media.jar,javafx.properties,javafx.swing.jar,javafx.web.jar,javafx_font.dll,javafx_iio.dll,jfxmedia.dll,jfxwebkit.dll,jogl-all-natives-linux-aarch64.jar,jogl-all-natives-linux-amd64.jar,jogl-all-natives-linux-armv6hf.jar,jogl-all-natives-linux-i586.jar,jogl-all-natives-macosx-universal.jar,jogl-all-natives-windows-amd64.jar,jogl-all-natives-windows-i586.jar,jogl-all.jar,msvcp140.dll,prism_common.dll,prism_d3d.dll,prism_sw.dll,ucrtbase.dll,vcruntime140.dll
+
+application.linux32=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-linux-i586.jar,gluegen-rt-natives-linux-i586.jar,javafx-swt.jar,javafx.base.jar,javafx.controls.jar,javafx.fxml.jar,javafx.graphics.jar,javafx.media.jar,javafx.swing.jar,javafx.web.jar,libavplugin-54.so,libavplugin-56.so,libavplugin-57.so,libavplugin-ffmpeg-56.so,libavplugin-ffmpeg-57.so,libdecora_sse.so,libfxplugins.so,libglass.so,libglassgtk2.so,libglassgtk3.so,libgstreamer-lite.so,libjavafx_font.so,libjavafx_font_freetype.so,libjavafx_font_pango.so,libjavafx_iio.so,libjfxmedia.so,libjfxwebkit.so,libprism_common.so,libprism_es2.so,libprism_sw.so
+
+application.linux64=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-linux-amd64.jar,gluegen-rt-natives-linux-amd64.jar,javafx-swt.jar,javafx.base.jar,javafx.controls.jar,javafx.fxml.jar,javafx.graphics.jar,javafx.media.jar,javafx.swing.jar,javafx.web.jar,libavplugin-54.so,libavplugin-56.so,libavplugin-57.so,libavplugin-ffmpeg-56.so,libavplugin-ffmpeg-57.so,libdecora_sse.so,libfxplugins.so,libglass.so,libglassgtk2.so,libglassgtk3.so,libgstreamer-lite.so,libjavafx_font.so,libjavafx_font_freetype.so,libjavafx_font_pango.so,libjavafx_iio.so,libjfxmedia.so,libjfxwebkit.so,libprism_common.so,libprism_es2.so,libprism_sw.so
+
+application.linux-armv6hf=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-linux-armv6hf.jar,gluegen-rt-natives-linux-armv6hf.jar,javafx-swt.jar,javafx.base.jar,javafx.controls.jar,javafx.fxml.jar,javafx.graphics.jar,javafx.media.jar,javafx.swing.jar,javafx.web.jar,libavplugin-54.so,libavplugin-56.so,libavplugin-57.so,libavplugin-ffmpeg-56.so,libavplugin-ffmpeg-57.so,libdecora_sse.so,libfxplugins.so,libglass.so,libglassgtk2.so,libglassgtk3.so,libgstreamer-lite.so,libjavafx_font.so,libjavafx_font_freetype.so,libjavafx_font_pango.so,libjavafx_iio.so,libjfxmedia.so,libjfxwebkit.so,libprism_common.so,libprism_es2.so,libprism_sw.so
+
+application.linux-arm64=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-linux-aarch64.jar,gluegen-rt-natives-linux-aarch64.jar,javafx-swt.jar,javafx.base.jar,javafx.controls.jar,javafx.fxml.jar,javafx.graphics.jar,javafx.media.jar,javafx.swing.jar,javafx.web.jar,libavplugin-54.so,libavplugin-56.so,libavplugin-57.so,libavplugin-ffmpeg-56.so,libavplugin-ffmpeg-57.so,libdecora_sse.so,libfxplugins.so,libglass.so,libglassgtk2.so,libglassgtk3.so,libgstreamer-lite.so,libjavafx_font.so,libjavafx_font_freetype.so,libjavafx_font_pango.so,libjavafx_iio.so,libjfxmedia.so,libjfxwebkit.so,libprism_common.so,libprism_es2.so,libprism_sw.so
diff --git a/core/library/javafx-swt.jar b/core/library/javafx-swt.jar
new file mode 100644
index 0000000000..e40db0ba72
Binary files /dev/null and b/core/library/javafx-swt.jar differ
diff --git a/core/library/javafx.base.jar b/core/library/javafx.base.jar
new file mode 100644
index 0000000000..c2e6d5cd8a
Binary files /dev/null and b/core/library/javafx.base.jar differ
diff --git a/core/library/javafx.controls.jar b/core/library/javafx.controls.jar
new file mode 100644
index 0000000000..90487f5076
Binary files /dev/null and b/core/library/javafx.controls.jar differ
diff --git a/core/library/javafx.fxml.jar b/core/library/javafx.fxml.jar
new file mode 100644
index 0000000000..5785c04e47
Binary files /dev/null and b/core/library/javafx.fxml.jar differ
diff --git a/core/library/javafx.graphics.jar b/core/library/javafx.graphics.jar
new file mode 100644
index 0000000000..6ea16205ad
Binary files /dev/null and b/core/library/javafx.graphics.jar differ
diff --git a/core/library/javafx.media.jar b/core/library/javafx.media.jar
new file mode 100644
index 0000000000..1a375dafc8
Binary files /dev/null and b/core/library/javafx.media.jar differ
diff --git a/core/library/javafx.properties b/core/library/javafx.properties
new file mode 100644
index 0000000000..ec30eae4a9
--- /dev/null
+++ b/core/library/javafx.properties
@@ -0,0 +1,3 @@
+javafx.version=11.0.1
+javafx.runtime.version=11.0.1+1
+javafx.runtime.build=1
diff --git a/core/library/javafx.swing.jar b/core/library/javafx.swing.jar
new file mode 100644
index 0000000000..a45fdc76f8
Binary files /dev/null and b/core/library/javafx.swing.jar differ
diff --git a/core/library/javafx.web.jar b/core/library/javafx.web.jar
new file mode 100644
index 0000000000..cbe55be660
Binary files /dev/null and b/core/library/javafx.web.jar differ
diff --git a/core/methods/build.xml b/core/methods/build.xml
index 36ed65ceda..ad919dc77d 100644
--- a/core/methods/build.xml
+++ b/core/methods/build.xml
@@ -2,36 +2,22 @@
 
   <target name="compile">
 
-    <!-- Check for JDT compiler, since this is likely a PDE build. Using
-	 it allows us to build the PDE with only a JRE on Windows and Linux.
-	 So that the core can be built independently of the PDE, 
-	 use javac (the "modern" compiler) if ecj is not present. -->
-    <property name="jdt.jar" value="../../java/mode/org.eclipse.jdt.core.jar" />
-    <condition property="build.compiler" 
-	       value="org.eclipse.jdt.core.JDTCompilerAdapter"
-	       else="modern">
-      <available file="${jdt.jar}" />
-    </condition>
-    <!--<echo message="compiler is ${build.compiler}" />-->
-
     <mkdir dir="bin" />
     <javac source="1.8"
            target="1.8"
-	   srcdir="src" 
-           destdir="bin" 
-	   debug="true" 
+	   srcdir="src"
+           destdir="bin"
+	   debug="true"
 	   includeantruntime="true"
 	   nowarn="true">
-      <!-- kinda gross, but if not using the JDT, this just ignored anyway -->
-      <compilerclasspath path="${jdt.jar}; 
-                               ../../java/mode/jdtCompilerAdapter.jar" />
+     
     </javac>
   </target>
-  
+
   <target name="dist" depends="compile">
     <jar basedir="bin" destfile="methods.jar" />
   </target>
-  
+
   <target name="demo" depends="dist">
     <mkdir dir="demo" />
 
@@ -41,12 +27,12 @@
       <fileset file="../src/processing/core/PImage.java" />
     </copy>
 
-    <taskdef name="methods" 
-	     classname="PAppletMethods" 
+    <taskdef name="methods"
+	     classname="PAppletMethods"
 	     classpath="methods.jar" />
     <methods dir="demo"/>
   </target>
-  
+
   <target name="clean">
     <delete dir="bin" />
     <delete file="methods.jar" />
diff --git a/core/resource-test/test.png b/core/resource-test/test.png
new file mode 100644
index 0000000000..403a717461
Binary files /dev/null and b/core/resource-test/test.png differ
diff --git a/core/resource-test/test.txt b/core/resource-test/test.txt
new file mode 100644
index 0000000000..bae42c55f9
--- /dev/null
+++ b/core/resource-test/test.txt
@@ -0,0 +1,2 @@
+test1
+test2
diff --git a/core/src/processing/core/PImage.java b/core/src/processing/core/PImage.java
index 049d198f44..d1b0ad9a61 100644
--- a/core/src/processing/core/PImage.java
+++ b/core/src/processing/core/PImage.java
@@ -61,6 +61,17 @@
  */
 public class PImage implements PConstants, Cloneable {
 
+  private static final byte TIFF_HEADER[] = {
+    77, 77, 0, 42, 0, 0, 0, 8, 0, 9, 0, -2, 0, 4, 0, 0, 0, 1, 0, 0,
+    0, 0, 1, 0, 0, 3, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 3, 0, 0, 0, 1,
+    0, 0, 0, 0, 1, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 122, 1, 6, 0, 3, 0,
+    0, 0, 1, 0, 2, 0, 0, 1, 17, 0, 4, 0, 0, 0, 1, 0, 0, 3, 0, 1, 21,
+    0, 3, 0, 0, 0, 1, 0, 3, 0, 0, 1, 22, 0, 3, 0, 0, 0, 1, 0, 0, 0, 0,
+    1, 23, 0, 4, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 8, 0, 8
+  };
+
+  private static final String TIFF_ERROR = "Error: Processing can only read its own TIFF files.";
+
   /**
    * Format for this image, one of RGB, ARGB or ALPHA.
    * note that RGB images still require 0xff in the high byte
@@ -286,6 +297,40 @@ protected void checkAlpha() {
 
   //////////////////////////////////////////////////////////////
 
+  public PImage(int width, int height, int[] pixels, boolean requiresCheckAlpha, PApplet parent) {
+    initFromPixels(
+        width,
+        height,
+        pixels,
+        RGB,
+        1
+    );
+
+    this.parent = parent;
+
+    if (requiresCheckAlpha) {
+      checkAlpha();
+    }
+  }
+
+  public PImage(int width, int height, int[] pixels, boolean requiresCheckAlpha, PApplet parent,
+                int format, int factor) {
+
+    initFromPixels(width, height, pixels, format, factor);
+    this.parent = parent;
+
+    if (requiresCheckAlpha) {
+      checkAlpha();
+    }
+  }
+
+  private void initFromPixels(int width, int height, int[] pixels, int format, int factor) {
+    this.width = width;
+    this.height = height;
+    this.format = format;
+    this.pixelDensity = factor;
+    this.pixels = pixels;
+  }
 
   /**
    * Construct a new PImage from a java.awt.Image. This constructor assumes
@@ -2947,20 +2992,6 @@ private static int blend_burn(int dst, int src) {
 
   // FILE I/O
 
-
-  static byte TIFF_HEADER[] = {
-    77, 77, 0, 42, 0, 0, 0, 8, 0, 9, 0, -2, 0, 4, 0, 0, 0, 1, 0, 0,
-    0, 0, 1, 0, 0, 3, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 3, 0, 0, 0, 1,
-    0, 0, 0, 0, 1, 2, 0, 3, 0, 0, 0, 3, 0, 0, 0, 122, 1, 6, 0, 3, 0,
-    0, 0, 1, 0, 2, 0, 0, 1, 17, 0, 4, 0, 0, 0, 1, 0, 0, 3, 0, 1, 21,
-    0, 3, 0, 0, 0, 1, 0, 3, 0, 0, 1, 22, 0, 3, 0, 0, 0, 1, 0, 0, 0, 0,
-    1, 23, 0, 4, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 8, 0, 8
-  };
-
-
-  static final String TIFF_ERROR =
-    "Error: Processing can only read its own TIFF files.";
-
   static protected PImage loadTIFF(byte tiff[]) {
     if ((tiff[42] != tiff[102]) ||  // width/height in both places
         (tiff[43] != tiff[103])) {
@@ -3008,7 +3039,6 @@ static protected PImage loadTIFF(byte tiff[]) {
     return outgoing;
   }
 
-
   protected boolean saveTIFF(OutputStream output) {
     // shutting off the warning, people can figure this out themselves
     /*
@@ -3019,7 +3049,13 @@ protected boolean saveTIFF(OutputStream output) {
     */
     try {
       byte tiff[] = new byte[768];
-      System.arraycopy(TIFF_HEADER, 0, tiff, 0, TIFF_HEADER.length);
+      System.arraycopy(
+          TIFF_HEADER,
+          0,
+          tiff,
+          0,
+          TIFF_HEADER.length
+      );
 
       tiff[30] = (byte) ((pixelWidth >> 8) & 0xff);
       tiff[31] = (byte) ((pixelWidth) & 0xff);
@@ -3328,10 +3364,10 @@ private IIOMetadata imageioDPI(ImageWriter writer, ImageWriteParam param, double
   /**
    * ( begin auto-generated from PImage_save.xml )
    *
-   * Saves the image into a file. Append a file extension to the name of 
-   * the file, to indicate the file format to be used: either TIFF (.tif), 
-   * TARGA (.tga), JPEG (.jpg), or PNG (.png). If no extension is included 
-   * in the filename, the image will save in TIFF format and .tif will be 
+   * Saves the image into a file. Append a file extension to the name of
+   * the file, to indicate the file format to be used: either TIFF (.tif),
+   * TARGA (.tga), JPEG (.jpg), or PNG (.png). If no extension is included
+   * in the filename, the image will save in TIFF format and .tif will be
    * added to the name.  These files are saved to the sketch's folder, which
    * may be opened by selecting "Show sketch folder" from the "Sketch" menu.
    * <br /><br />To save an image created within the code, rather
@@ -3371,68 +3407,68 @@ private IIOMetadata imageioDPI(ImageWriter writer, ImageWriteParam param, double
    * @usage application
    * @param filename a sequence of letters and numbers
    */
-  public boolean save(String filename) {  // ignore
-    boolean success = false;
+   public boolean save(String filename) {  // ignore
+     boolean success = false;
 
-    if (parent != null) {
-      // use savePath(), so that the intermediate directories are created
-      filename = parent.savePath(filename);
+     if (parent != null) {
+       // use savePath(), so that the intermediate directories are created
+       filename = parent.savePath(filename);
 
-    } else {
-      File file = new File(filename);
-      if (file.isAbsolute()) {
-        // make sure that the intermediate folders have been created
-        PApplet.createPath(file);
-      } else {
-        String msg =
-          "PImage.save() requires an absolute path. " +
-          "Use createImage(), or pass savePath() to save().";
-        PGraphics.showException(msg);
-      }
-    }
+     } else {
+       File file = new File(filename);
+       if (file.isAbsolute()) {
+         // make sure that the intermediate folders have been created
+         PApplet.createPath(file);
+       } else {
+         String msg =
+           "PImage.save() requires an absolute path. " +
+           "Use createImage(), or pass savePath() to save().";
+         PGraphics.showException(msg);
+       }
+     }
 
-    // Make sure the pixel data is ready to go
-    loadPixels();
+     // Make sure the pixel data is ready to go
+     loadPixels();
 
-    try {
-      OutputStream os = null;
+     try {
+       OutputStream os = null;
 
-      if (saveImageFormats == null) {
-        saveImageFormats = javax.imageio.ImageIO.getWriterFormatNames();
-      }
-      if (saveImageFormats != null) {
-        for (int i = 0; i < saveImageFormats.length; i++) {
-          if (filename.endsWith("." + saveImageFormats[i])) {
-            if (!saveImageIO(filename)) {
-              System.err.println("Error while saving image.");
-              return false;
-            }
-            return true;
-          }
-        }
-      }
+       if (saveImageFormats == null) {
+         saveImageFormats = javax.imageio.ImageIO.getWriterFormatNames();
+       }
+       if (saveImageFormats != null) {
+         for (int i = 0; i < saveImageFormats.length; i++) {
+           if (filename.endsWith("." + saveImageFormats[i])) {
+             if (!saveImageIO(filename)) {
+               System.err.println("Error while saving image.");
+               return false;
+             }
+             return true;
+           }
+         }
+       }
 
-      if (filename.toLowerCase().endsWith(".tga")) {
-        os = new BufferedOutputStream(new FileOutputStream(filename), 32768);
-        success = saveTGA(os); //, pixels, width, height, format);
+       if (filename.toLowerCase().endsWith(".tga")) {
+         os = new BufferedOutputStream(new FileOutputStream(filename), 32768);
+         success = saveTGA(os); //, pixels, width, height, format);
 
-      } else {
-        if (!filename.toLowerCase().endsWith(".tif") &&
-            !filename.toLowerCase().endsWith(".tiff")) {
-          // if no .tif extension, add it..
-          filename += ".tif";
-        }
-        os = new BufferedOutputStream(new FileOutputStream(filename), 32768);
-        success = saveTIFF(os); //, pixels, width, height);
-      }
-      os.flush();
-      os.close();
+       } else {
+         if (!filename.toLowerCase().endsWith(".tif") &&
+             !filename.toLowerCase().endsWith(".tiff")) {
+           // if no .tif extension, add it..
+           filename += ".tif";
+         }
+         os = new BufferedOutputStream(new FileOutputStream(filename), 32768);
+         success = saveTIFF(os); //, pixels, width, height);
+       }
+       os.flush();
+       os.close();
 
-    } catch (IOException e) {
-      System.err.println("Error while saving image.");
-      e.printStackTrace();
-      success = false;
-    }
-    return success;
-  }
+     } catch (IOException e) {
+       System.err.println("Error while saving image.");
+       e.printStackTrace();
+       success = false;
+     }
+     return success;
+   }
 }
diff --git a/core/src/processing/core/PShape.java b/core/src/processing/core/PShape.java
index b587e3e9b0..d101cdfdaf 100644
--- a/core/src/processing/core/PShape.java
+++ b/core/src/processing/core/PShape.java
@@ -29,7 +29,7 @@
 import java.util.Map;
 
 import javax.swing.ImageIcon;
-import javax.xml.bind.DatatypeConverter;
+import java.util.Base64;
 
 
 /**
@@ -1910,16 +1910,29 @@ private void loadFileSystemImage(PGraphics g){
     }
   }
 
- private void loadBase64Image(){
-    String[] parts = this.imagePath.split(";base64,");
+  private void loadBase64Image() {
+    PImage loadedImage = parseBase64Image(this.imagePath);
+    if (loadedImage != null) {
+      setTexture(loadedImage);
+    }
+  }
+
+  /**
+   * Parse a base 64 encoded image within an image path.
+   *
+   * @param imagePath The image path containing the base 64 image data.
+   * @return Newly loaded PImage.
+   */
+  protected static PImage parseBase64Image(String imagePath) {
+    String[] parts = imagePath.split(";base64,");
     String extension = parts[0].substring(11);
     String encodedData = parts[1];
 
-    byte[] decodedBytes = DatatypeConverter.parseBase64Binary(encodedData);
+    byte[] decodedBytes = Base64.getDecoder().decode(encodedData);
 
     if(decodedBytes == null){
       System.err.println("Decode Error on image: " + imagePath.substring(0, 20));
-      return;
+      return null;
     }
 
     Image awtImage = new ImageIcon(decodedBytes).getImage();
@@ -1928,22 +1941,26 @@ private void loadBase64Image(){
       BufferedImage buffImage = (BufferedImage) awtImage;
       int space = buffImage.getColorModel().getColorSpace().getType();
       if (space == ColorSpace.TYPE_CMYK) {
-       return;
+        System.err.println("Could not load CMYK color space on image: " + imagePath.substring(0, 20));
+       return null;
       }
     }
 
+    // if it's a .gif image, test to see if it has transparency
+    boolean requiresCheckAlpha = extension.equals("gif") || extension.equals("png") ||
+        extension.equals("unknown");
+
     PImage loadedImage = new PImage(awtImage);
-    if (loadedImage.width == -1) {
-      // error...
+
+    if (requiresCheckAlpha) {
+        loadedImage.checkAlpha();
     }
 
-    // if it's a .gif image, test to see if it has transparency
-    if (extension.equals("gif") || extension.equals("png") ||
-      extension.equals("unknown")) {
-    loadedImage.checkAlpha();
+    if (loadedImage.width == -1) {
+      // error...
     }
 
-    setTexture(loadedImage);
+    return loadedImage;
   }
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
diff --git a/core/src/processing/core/ThinkDifferent.java b/core/src/processing/core/ThinkDifferent.java
index 8596696198..78497fd591 100644
--- a/core/src/processing/core/ThinkDifferent.java
+++ b/core/src/processing/core/ThinkDifferent.java
@@ -22,75 +22,99 @@
 
 package processing.core;
 
-import java.awt.Image;
-
-import com.apple.eawt.AppEvent.QuitEvent;
-import com.apple.eawt.Application;
-import com.apple.eawt.QuitHandler;
-import com.apple.eawt.QuitResponse;
+import java.awt.*;
 
 
 /**
- * Deal with issues related to thinking differently.
+ * Deal with issues related to Mac OS window behavior.
  *
  * We have to register a quit handler to safely shut down the sketch,
  * otherwise OS X will just kill the sketch when a user hits Cmd-Q.
  * In addition, we have a method to set the dock icon image so we look more
- * like a native application.
+ * like a native desktop.
  *
  * This is a stripped-down version of what's in processing.app.platform to fix
  * <a href="https://github.com/processing/processing/issues/3301">3301</a>.
  */
 public class ThinkDifferent {
 
-  // http://developer.apple.com/documentation/Java/Reference/1.4.2/appledoc/api/com/apple/eawt/Application.html
-  private static Application application;
+  private static Desktop desktop;
+  private static Taskbar taskbar;
 
   // True if user has tried to quit once. Prevents us from canceling the quit
   // call if the sketch is held up for some reason, like an exception that's
   // managed to put the sketch in a bad state.
   static boolean attemptedQuit;
 
-
+  /**
+   * Initialize the sketch with the quit handler.
+   *
+   * Initialize the sketch with the quit handler such that, if there is no known
+   * crash, the application will not exit on its own if this is the first quit
+   * attempt.
+   *
+   * @param sketch The sketch whose quit handler callback should be set.
+   */
   static public void init(final PApplet sketch) {
-    if (application == null) {
-      application = Application.getApplication();
-    }
+    getDesktop().setQuitHandler((event, quitResponse) -> {
+      sketch.exit();
 
-    application.setQuitHandler(new QuitHandler() {
-      public void handleQuitRequestWith(QuitEvent event, QuitResponse response) {
-        sketch.exit();
-        if (PApplet.uncaughtThrowable == null &&  // no known crash
-            !attemptedQuit) {  // haven't tried yet
-          response.cancelQuit();  // tell OS X we'll handle this
-          attemptedQuit = true;
-        } else {
-          response.performQuit();  // just force it this time
-        }
+      boolean noKnownCrash = PApplet.uncaughtThrowable == null;
+
+      if (noKnownCrash && !attemptedQuit) {  // haven't tried yet
+        quitResponse.cancelQuit();  // tell OS X we'll handle this
+        attemptedQuit = true;
+      } else {
+        quitResponse.performQuit();  // just force it this time
       }
     });
   }
 
+  /**
+   * Remove the quit handler.
+   */
   static public void cleanup() {
-    if (application == null) {
-      application = Application.getApplication();
-    }
-    application.setQuitHandler(null);
+    getDesktop().setQuitHandler(null);
   }
 
-  // Called via reflection from PSurfaceAWT and others
+  /**
+   * Called via reflection from PSurfaceAWT and others, set the dock icon image.
+   *
+   * @param image The image to provide for Processing icon.
+   */
   static public void setIconImage(Image image) {
-    // When already set, is a sun.awt.image.MultiResolutionCachedImage on OS X
-//    Image current = application.getDockIconImage();
-//    System.out.println("current dock icon image is " + current);
-//    System.out.println("changing to " + image);
+    getTaskbar().setIconImage(image);
+  }
+
+  /**
+   * Get the taskbar where OS visual settings can be provided.
+   *
+   * @return Cached taskbar singleton instance.
+   */
+  static private Taskbar getTaskbar() {
+    if (taskbar == null) {
+      taskbar = Taskbar.getTaskbar();
+    }
+
+    return taskbar;
+  }
+
+  /**
+   * Get the desktop where OS behavior can be provided.
+   *
+   * @return Cached desktop singleton instance.
+   */
+  static private Desktop getDesktop() {
+    if (desktop == null) {
+      desktop = Desktop.getDesktop();
+    }
 
-    application.setDockIconImage(image);
+    return desktop;
   }
 
 
   // Instead, just use Application.getApplication() inside your app
 //  static public Application getApplication() {
-//    return application;
+//    return desktop;
 //  }
 }
diff --git a/core/src/processing/javafx/PSurfaceFX.java b/core/src/processing/javafx/PSurfaceFX.java
index 4061f36fca..19a91f1646 100644
--- a/core/src/processing/javafx/PSurfaceFX.java
+++ b/core/src/processing/javafx/PSurfaceFX.java
@@ -246,13 +246,14 @@ public void start(final Stage stage) {
 
       PApplet sketch = surface.sketch;
 
-      float renderScale = Screen.getMainScreen().getRenderScale();
+      // See JEP 263
+      float renderScale = Screen.getMainScreen().getRecommendedOutputScaleX();
       if (PApplet.platform == PConstants.MACOSX) {
         for (Screen s : Screen.getScreens()) {
-          renderScale = Math.max(renderScale, s.getRenderScale());
+          renderScale = Math.max(renderScale, s.getRecommendedOutputScaleX());
         }
       }
-      float uiScale = Screen.getMainScreen().getUIScale();
+      float uiScale = Screen.getMainScreen().getRecommendedOutputScaleX();
       if (sketch.pixelDensity == 2 && renderScale < 2) {
         sketch.pixelDensity = 1;
         sketch.g.pixelDensity = 1;
@@ -314,14 +315,14 @@ public void start(final Stage stage) {
       int sketchHeight = sketch.sketchHeight();
 
       if (fullScreen || spanDisplays) {
-        sketchWidth = (int) (screenRect.getWidth() / uiScale);
-        sketchHeight = (int) (screenRect.getHeight() / uiScale);
+        sketchWidth = (int) screenRect.getWidth();
+        sketchHeight = (int) screenRect.getHeight();
 
         stage.initStyle(StageStyle.UNDECORATED);
-        stage.setX(screenRect.getMinX() / uiScale);
-        stage.setY(screenRect.getMinY() / uiScale);
-        stage.setWidth(screenRect.getWidth() / uiScale);
-        stage.setHeight(screenRect.getHeight() / uiScale);
+        stage.setX(screenRect.getMinX());
+        stage.setY(screenRect.getMinY());
+        stage.setWidth(screenRect.getWidth());
+        stage.setHeight(screenRect.getHeight());
       }
 
       Canvas canvas = surface.canvas;
@@ -812,7 +813,7 @@ public void focusLost(FocusEvent e) {
 
 
   static Map<EventType<? extends MouseEvent>, Integer> mouseMap =
-    new HashMap<EventType<? extends MouseEvent>, Integer>();
+    new HashMap<>();
   static {
     mouseMap.put(MouseEvent.MOUSE_PRESSED, processing.event.MouseEvent.PRESS);
     mouseMap.put(MouseEvent.MOUSE_RELEASED, processing.event.MouseEvent.RELEASE);
@@ -952,7 +953,7 @@ private int getKeyCode(KeyEvent fxEvent) {
       default:
         break;
     }
-    return kc.impl_getCode();
+    return kc.getCode();
   }
 
 
@@ -1051,7 +1052,7 @@ private char getKeyChar(KeyEvent fxEvent) {
     if (fxEvent.getEventType() == KeyEvent.KEY_TYPED) {
       ch = fxEvent.getCharacter();
     } else {
-      ch = kc.impl_getChar();
+      ch = kc.getChar();
     }
 
     if (ch.length() < 1) return PConstants.CODED;
diff --git a/core/test/processing/core/Base64StringImageLoadTest.java b/core/test/processing/core/Base64StringImageLoadTest.java
new file mode 100644
index 0000000000..94aa4936ad
--- /dev/null
+++ b/core/test/processing/core/Base64StringImageLoadTest.java
@@ -0,0 +1,33 @@
+package processing.core;
+
+import org.junit.Assert;
+import org.junit.Test;
+import processing.core.PApplet;
+import processing.core.PImage;
+
+import java.awt.*;
+
+
+public class Base64StringImageLoadTest {
+
+  // Simple pattern to try loading. Would be part of SVG.
+  private static final String TEST_CONTENT = "data:image/svg;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAFCAMAAAC+RAbqAAAADFBMVEUAAAA0AP67u7v///+votL2AAAAGElEQVR4AWNgYAZBIIIAIJ8RyGGC8WHyAAYpAE9LN1znAAAAAElFTkSuQmCC";
+
+  @Test
+  public void testLoad() {
+    PImage results = PShape.parseBase64Image(TEST_CONTENT);
+
+    // Simply check a few sample pixels from the above pattern
+    Assert.assertEquals(7, results.pixelWidth);
+    Assert.assertEquals(5, results.pixelHeight);
+    Assert.assertEquals(7, results.width);
+    Assert.assertEquals(5, results.height);
+
+    int valueBlack = results.get(0, 0);
+    int valueBlue = results.get(2, 2);
+
+    Assert.assertEquals(Color.BLACK, new Color(valueBlack));
+    Assert.assertEquals(new Color(52, 0, 254), new Color(valueBlue));
+  }
+
+}
diff --git a/java/build.xml b/java/build.xml
index 0fda9c2c55..5edeb36e80 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -2,14 +2,14 @@
 <project name="Java Mode" default="build">
 
   <property name="generated"
-	          value="${basedir}/generated/processing/mode/java/preproc" />
+	    value="${basedir}/generated/processing/mode/java/preproc" />
   <mkdir dir="${generated}" />
 
   <property name="grammars"
-	          value="${basedir}/src/processing/mode/java/preproc" />
+	    value="${basedir}/src/processing/mode/java/preproc" />
 
   <property name="antlr_jar"
-	          value="${basedir}/mode/antlr.jar" />
+	    value="${basedir}/mode/antlr.jar" />
 
   <property name="mode_jar"
             value="${basedir}/mode/JavaMode.jar" />
@@ -20,6 +20,7 @@
 
   <target name="clean" description="Clean the build directories">
     <delete dir="bin" />
+    <delete dir="bin-test" />
     <delete file="${mode_jar}" />
     <delete>
       <fileset dir="${generated}">
@@ -38,8 +39,8 @@
       <classpath path="${antlr_jar}" />
     </antlr>
     <antlr target="${grammars}/pde.g"
-	         outputdirectory="${generated}"
-	         glib="${grammars}/java15.g">
+	   outputdirectory="${generated}"
+	   glib="${grammars}/java15.g">
       <classpath path="${antlr_jar}" />
     </antlr>
 
@@ -71,71 +72,102 @@
     <!-- end of workaround for old antlr -->
   </target>
 
-  <target name="compile" depends="preproc" description="Compile sources">
-    <condition property="core-built">
-      <available file="../core/library/core.jar" />
-    </condition>
-    <fail unless="core-built" message="Please first build the core library and make sure it is located at ../core/library/core.jar" />
-
-    <condition property="app-built">
-      <available file="../app/pde.jar" />
-    </condition>
-    <fail unless="app-built" message="Please build app first and make sure it is located at ../app/pde.jar" />
-
-    <mkdir dir="bin" />
+  <path id="classpath.base">
+    <pathelement location="../core/library/core.jar" />
+    <pathelement location="../app/pde.jar" />
+    <pathelement location="../app/lib/ant.jar" />
+    <pathelement location="../app/lib/ant-launcher.jar" />
+    <pathelement location="../app/lib/apple.jar" />
+    <pathelement location="../app/lib/jna.jar" />
+    <pathelement location="../app/lib/jna-platform.jar" />
+    <pathelement location="mode/antlr.jar" />
+    <pathelement location="mode/classpath-explorer-1.0.jar" />
+    <pathelement location="mode/jsoup-1.7.1.jar" />
+    <pathelement location="mode/org.netbeans.swing.outline.jar" />
+    <pathelement location="mode/jdi.jar" />
+    <pathelement location="mode/jdimodel.jar" />
+    <pathelement location="mode/com.ibm.icu.jar" />
+    <pathelement location="mode/org.eclipse.core.contenttype.jar" />
+    <pathelement location="mode/org.eclipse.core.jobs.jar" />
+    <pathelement location="mode/org.eclipse.core.resources.jar" />
+    <pathelement location="mode/org.eclipse.core.runtime.jar" />
+    <pathelement location="mode/org.eclipse.equinox.common.jar" />
+    <pathelement location="mode/org.eclipse.equinox.preferences.jar" />
+    <pathelement location="mode/org.eclipse.jdt.compiler.apt.jar" />
+    <pathelement location="mode/org.eclipse.jdt.core.jar" />
+    <pathelement location="mode/org.eclipse.osgi.jar" />
+    <pathelement location="mode/org.eclipse.text.jar" />
+  </path>
+
+  <path id="classpath.test">
+    <pathelement location="../core/library-test/junit-4.8.1.jar" />
+    <pathelement location="../core/library-test/mockito-all-1.10.19.jar" />
+    <pathelement location = "bin-test" />
+    <path refid="classpath.base" />
+  </path>
+
+  <macrodef name="compilecommon">
+    <attribute name="destdir"/>
+    <attribute name="srcdir"/>
+    <attribute name="classpath"/>
+    <sequential>
+      <condition property="core-built">
+        <available file="../core/library/core.jar" />
+      </condition>
+      <fail unless="core-built" message="Please first build the core library and make sure it is located at ../core/library/core.jar" />
+
+      <condition property="app-built">
+        <available file="../app/pde.jar" />
+      </condition>
+      <fail unless="app-built" message="Please build app first and make sure it is located at ../app/pde.jar" />
+
+      <mkdir dir="@{destdir}" />
+
+      <!-- in some cases, pde.jar was not getting built
+  	 https://github.com/processing/processing/issues/1792 -->
+      <delete file="${mode_jar}" />
+
+      <!-- env used to set classpath below -->
+      <property environment="env" />
+
+      <javac source="1.8"
+  	   target="1.8"
+  	   destdir="@{destdir}"
+  	   excludes="**/tools/format/**"
+  	   encoding="UTF-8"
+  	   includeAntRuntime="false"
+  	   debug="on"
+  	   nowarn="true"
+  	   compiler="modern">
+        <src path="@{srcdir}" />
+        <src path="generated" />
+        <classpath refid="@{classpath}"/>
+      </javac>
+    </sequential>
+  </macrodef>
+
+  <target name="test-compile" depends="preproc">
+    <compilecommon srcdir="src; test" destdir="bin-test" classpath="classpath.test" />
+  </target>
 
-    <!-- in some cases, pde.jar was not getting built
-	       https://github.com/processing/processing/issues/1792 -->
-    <delete file="${mode_jar}" />
+  <target name="test" depends="test-compile">
+    <junit haltonfailure="true">
+      <classpath refid="classpath.test" />
+      <formatter type="brief" usefile="false" />
+      <batchtest>
+        <fileset dir="test">
+          <include name="**/*Test.java" />
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
 
-    <!-- env used to set classpath below -->
-    <property environment="env" />
-
-    <javac source="1.8"
-      	   target="1.8"
-      	   destdir="bin"
-      	   excludes="**/tools/format/**"
-      	   encoding="UTF-8"
-      	   includeAntRuntime="false"
-      	   classpath="../core/library/core.jar;
-
-                      ../app/pde.jar;
-                      ../app/lib/ant.jar;
-                      ../app/lib/ant-launcher.jar;
-                      ../app/lib/apple.jar;
-                      ../app/lib/jna.jar;
-                      ../app/lib/jna-platform.jar;
-
-                      mode/antlr.jar;
-                      mode/classpath-explorer-1.0.jar;
-                      mode/jsoup-1.7.1.jar;
-                      mode/org.netbeans.swing.outline.jar;
-
-                      mode/jdi.jar;
-                      mode/jdimodel.jar;
-
-                      mode/com.ibm.icu.jar;
-
-                      mode/org.eclipse.core.contenttype.jar;
-                      mode/org.eclipse.core.jobs.jar;
-                      mode/org.eclipse.core.resources.jar;
-                      mode/org.eclipse.core.runtime.jar;
-                      mode/org.eclipse.equinox.common.jar;
-                      mode/org.eclipse.equinox.preferences.jar;
-                      mode/org.eclipse.jdt.core.jar;
-                      mode/org.eclipse.osgi.jar;
-                      mode/org.eclipse.text.jar"
-      	   debug="on"
-      	   nowarn="true"
-      	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
-      <src path="src" />
-      <src path="generated" />
-      <compilerclasspath path="mode/org.eclipse.jdt.core.jar;
-                               mode/jdtCompilerAdapter.jar" />
-    </javac>
+  <target name="compile" depends="test" description="Compile sources">
+    <compilecommon srcdir="src" destdir="bin" classpath="classpath.base" />
   </target>
 
   <target name="build" depends="compile" description="Build PDE">
     <jar basedir="bin" destfile="${mode_jar}" />
   </target>
+
 </project>
diff --git a/java/libraries/dxf/build.xml b/java/libraries/dxf/build.xml
index f5c0ed021e..9cb88085c2 100644
--- a/java/libraries/dxf/build.xml
+++ b/java/libraries/dxf/build.xml
@@ -1,31 +1,28 @@
 <?xml version="1.0"?>
 <project name="Processing DXF Library" default="build">
-  
+
   <target name="clean" description="Clean the build directories">
     <delete dir="bin" />
     <delete file="library/dxf.jar" />
   </target>
-  
+
   <target name="compile" description="Compile sources">
     <condition property="core-built">
       <available file="../../../core/library/core.jar" />
     </condition>
     <fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />
-    
+
     <mkdir dir="bin" />
     <javac source="1.8"
 	   target="1.8"
-	   srcdir="src" destdir="bin" 
+	   srcdir="src" destdir="bin"
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
 	   classpath="../../../core/library/core.jar"
-	   nowarn="true"
-	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
-      <compilerclasspath path="../../mode/org.eclipse.jdt.core.jar; 
-                               ../../mode/jdtCompilerAdapter.jar" />
+	   nowarn="true">
     </javac>
   </target>
-  
+
   <target name="build" depends="compile" description="Build DXF library">
     <jar basedir="bin" destfile="library/dxf.jar" />
   </target>
diff --git a/java/libraries/net/build.xml b/java/libraries/net/build.xml
index 9ee83b9d5d..40e22e7f70 100644
--- a/java/libraries/net/build.xml
+++ b/java/libraries/net/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <project name="Processing Net Library" default="build">
-  
+
   <target name="clean" description="Clean the build directories">
     <delete dir="bin" />
     <delete file="library/net.jar" />
@@ -11,18 +11,15 @@
       <available file="../../../core/library/core.jar" />
     </condition>
     <fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />
-    
+
     <mkdir dir="bin" />
     <javac source="1.8"
 	   target="1.8"
-	   srcdir="src" destdir="bin" 
+	   srcdir="src" destdir="bin"
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
 	   classpath="../../../core/library/core.jar"
-	   nowarn="true"
-	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
-      <compilerclasspath path="../../mode/org.eclipse.jdt.core.jar; 
-                               ../../mode/jdtCompilerAdapter.jar" />
+	   nowarn="true">
     </javac>
   </target>
 
diff --git a/java/libraries/pdf/build.xml b/java/libraries/pdf/build.xml
index 13a472c60a..46b7d0408a 100644
--- a/java/libraries/pdf/build.xml
+++ b/java/libraries/pdf/build.xml
@@ -1,31 +1,28 @@
 <?xml version="1.0"?>
 <project name="Processing PDF Library" default="build">
-  
+
   <target name="clean" description="Clean the build directories">
     <delete dir="bin" />
     <delete file="library/pdf.jar" />
   </target>
-  
+
   <target name="compile" description="Compile sources">
     <condition property="core-built">
       <available file="../../../core/library/core.jar" />
     </condition>
     <fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />
-    
+
     <mkdir dir="bin" />
     <javac source="1.8"
 	   target="1.8"
-	   srcdir="src" destdir="bin" 
+	   srcdir="src" destdir="bin"
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
 	   classpath="../../../core/library/core.jar; library/itext.jar"
-	   nowarn="true"
-	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
-      <compilerclasspath path="../../mode/org.eclipse.jdt.core.jar; 
-                               ../../mode/jdtCompilerAdapter.jar" />
+	   nowarn="true">
     </javac>
   </target>
-  
+
   <target name="build" depends="compile" description="Build PDF library">
     <jar basedir="bin" destfile="library/pdf.jar" />
   </target>
diff --git a/java/libraries/serial/build.xml b/java/libraries/serial/build.xml
index a26fe2f0e0..4a50d2e604 100644
--- a/java/libraries/serial/build.xml
+++ b/java/libraries/serial/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <project name="Processing Serial Library" default="build">
-  
+
   <target name="clean" description="Clean the build directories">
     <delete dir="bin" />
     <delete file="library/serial.jar" />
@@ -15,17 +15,14 @@
     <mkdir dir="bin" />
     <javac source="1.8"
 	   target="1.8"
-	   srcdir="src" destdir="bin" 
+	   srcdir="src" destdir="bin"
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
 	   classpath="../../../core/library/core.jar; library/jssc.jar"
-	   nowarn="true"
-	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
-      <compilerclasspath path="../../mode/org.eclipse.jdt.core.jar; 
-                               ../../mode/jdtCompilerAdapter.jar" />
+	   nowarn="true">
     </javac>
   </target>
-  
+
   <target name="build" depends="compile" description="Build serial library">
     <jar basedir="bin" destfile="library/serial.jar" />
   </target>
diff --git a/java/libraries/svg/build.xml b/java/libraries/svg/build.xml
index 54cd9c2075..4477eedf8c 100644
--- a/java/libraries/svg/build.xml
+++ b/java/libraries/svg/build.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0"?>
 <project name="Processing SVG Library" default="build">
-  
+
   <target name="clean" description="Clean the build directories">
     <delete dir="bin" />
     <delete file="library/svg.jar" />
   </target>
-  
+
   <target name="compile" description="Compile sources">
     <condition property="core-built">
       <available file="../../../core/library/core.jar" />
     </condition>
     <fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />
-    
+
     <mkdir dir="bin" />
     <javac source="1.8"
 	   target="1.8"
-	   srcdir="src" destdir="bin" 
+	   srcdir="src" destdir="bin"
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
 	   classpath="../../../core/library/core.jar;
@@ -25,13 +25,10 @@
                       library/batik-svggen-1.8.jar;
                       library/batik-util-1.8.jar;
                       library/batik-xml-1.8.jar"
-	   nowarn="true"
-	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
-      <compilerclasspath path="../../mode/org.eclipse.jdt.core.jar; 
-                               ../../mode/jdtCompilerAdapter.jar" />
+	   nowarn="true">
     </javac>
   </target>
-  
+
   <target name="build" depends="compile" description="Build SVG library">
     <jar basedir="bin" destfile="library/svg.jar" />
   </target>
diff --git a/java/mode/.options b/java/mode/.options
new file mode 100644
index 0000000000..d558214448
--- /dev/null
+++ b/java/mode/.options
@@ -0,0 +1,133 @@
+# Turn on debug tracing for org.eclipse.jdt.core plugin
+org.eclipse.jdt.core/debug=false
+
+# Reports buffer manager activity
+org.eclipse.jdt.core/debug/buffermanager=false
+
+# Reports java  builder activity : nature of build, built state reading, indictment process
+org.eclipse.jdt.core/debug/builder=false
+
+# Reports java builder stats
+org.eclipse.jdt.core/debug/builder/stats=false
+
+# Reports compiler activity
+org.eclipse.jdt.core/debug/compiler=false
+
+# Reports codeassist completion activity : recovered unit, inferred completions
+org.eclipse.jdt.core/debug/completion=false
+
+# Reports classpath variable initialization, and classpath container resolution
+org.eclipse.jdt.core/debug/cpresolution=false
+
+# Reports internals of classpath variable initialization, and classpath container resolution (to be used on the JDT/Core team request only)
+org.eclipse.jdt.core/debug/cpresolution/advanced=false
+
+# Reports failures during classpath variable initialization, and classpath container resolution
+org.eclipse.jdt.core/debug/cpresolution/failure=false
+
+# Reports bad node nesting in DOM AST (for interactive usage)
+org.eclipse.jdt.core/debug/dom/ast=false
+
+# Throws an exception in case of bad node nesting in DOM AST (enabled in tests)
+org.eclipse.jdt.core/debug/dom/ast/throw=false
+
+# Reports type errors when using ASTRewrite (throws exceptions; not enabled by default, since some non-typesafe operations are fine in practice)
+org.eclipse.jdt.core/debug/dom/rewrite=false
+
+# Report type hierarchy connections, refreshes and deltas
+org.eclipse.jdt.core/debug/hierarchy=false
+
+# Reports background indexer activity: indexing, saving index file, index queries
+org.eclipse.jdt.core/debug/indexmanager=false
+
+# Reports internals of indexer activity (to be used on the JDT/Core team request only)
+org.eclipse.jdt.core/debug/indexmanager/advanced=false
+
+# Print notified Java element deltas
+org.eclipse.jdt.core/debug/javadelta=false
+org.eclipse.jdt.core/debug/javadelta/verbose=false
+
+# Reports various Java model activities
+org.eclipse.jdt.core/debug/javamodel=false
+
+# Reports Java model elements opening/closing
+org.eclipse.jdt.core/debug/javamodel/cache=false
+
+# Reports changes in the Java classpath and classpath resolution
+org.eclipse.jdt.core/debug/javamodel/classpath=false
+
+# Reports all insertions and removals from the java model cache
+org.eclipse.jdt.core/debug/javamodel/insertions=false
+
+# Records information about the invalid archive cache
+org.eclipse.jdt.core/debug/javamodel/invalid_archives=false
+
+# Runs self-diagnostics on the free space lists. This is expensive and will slow down indexing.
+org.eclipse.jdt.core/debug/index/freespacetest=false
+
+# Controls the amount of memory used by the traceback log, in megabytes (suggested size = 1024).
+# If nonzero, the index will print out detailed traceback information when corruption is detected. 
+org.eclipse.jdt.core/debug/index/logsizemegs=0
+
+# Logs every time a page is allocated, flushed, or inserted/removed from the page cache (very verbose)
+org.eclipse.jdt.core/debug/index/pagecache=false
+
+# Prints information about when the indexer runs and what files are being indexed
+org.eclipse.jdt.core/debug/index/indexer=false
+
+# Prints a line whenever a class is added to or removed from the index
+org.eclipse.jdt.core/debug/index/insertions=false
+
+# Prints diagnostic information about index database locks
+org.eclipse.jdt.core/debug/index/locks=false
+
+# Prints a message whenever the indexer is scheduled. Useful for tracking race conditions in the unit tests.
+org.eclipse.jdt.core/debug/index/scheduling=false
+
+# Prints statistics about database memory usage
+org.eclipse.jdt.core/debug/index/space=false
+
+# Performs self-testing during indexing by reading back every class and comparing it with the original .class file
+org.eclipse.jdt.core/debug/index/selftest=false
+
+# Prints statistics about indexing time
+org.eclipse.jdt.core/debug/index/timing=false
+
+# Reports post actions addition/run
+org.eclipse.jdt.core/debug/postaction=false
+
+# Reports name resolution activity
+org.eclipse.jdt.core/debug/resolution=false
+
+# Reports java search activity
+org.eclipse.jdt.core/debug/search=false
+
+# Reports source mapper activity
+org.eclipse.jdt.core/debug/sourcemapper=false
+
+# Reports code formatter activity
+org.eclipse.jdt.core/debug/formatter=false
+
+# Reports open on selection activity : recovered unit, inferred selection
+org.eclipse.jdt.core/debug/selection=false
+
+# Reports access to zip and jar files through the Java model
+org.eclipse.jdt.core/debug/zipaccess=false
+
+# Reports the time to perform code completion.
+org.eclipse.jdt.core/perf/completion=300
+
+# Reports the time to perform code selection.
+org.eclipse.jdt.core/perf/selection=300
+
+# Reports the time to process a java element delta.
+org.eclipse.jdt.core/perf/javadeltalistener=500
+
+# Reports the time to perform an initialization of a classpath variable.
+org.eclipse.jdt.core/perf/variableinitializer=5000
+
+# Reports the time to perform an initialization of a classpath container.
+org.eclipse.jdt.core/perf/containerinitializer=5000
+
+# Reports the time to perform a reconcile operation.
+org.eclipse.jdt.core/perf/reconcile=1000
diff --git a/java/mode/about.html b/java/mode/about.html
new file mode 100644
index 0000000000..f0810d12f3
--- /dev/null
+++ b/java/mode/about.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+	
+<h3>Disassembler</h3>
+<p>This plug-in contains a bytecode disassembler (&quot;Disassembler&quot;) that can produce a listing of the Java assembler mnemonics (&quot;Assembler Mnemonics&quot;) for a Java method.  If you 
+use the Disassembler to view the Assembler Mnemonics for a method, you should ensure that doing so will not violate the terms of any licenses that apply to your use of that method, as
+such licenses may not permit you to reverse engineer, decompile, or disassemble method bytecodes.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/java/mode/jdtCompilerAdapter.jar b/java/mode/jdtCompilerAdapter.jar
index 114cabbb91..ec244efffc 100755
Binary files a/java/mode/jdtCompilerAdapter.jar and b/java/mode/jdtCompilerAdapter.jar differ
diff --git a/java/mode/org.eclipse.core.resources.jar b/java/mode/org.eclipse.core.resources.jar
index dd04e3eefc..b55e7c0e1c 100644
Binary files a/java/mode/org.eclipse.core.resources.jar and b/java/mode/org.eclipse.core.resources.jar differ
diff --git a/java/mode/org.eclipse.core.runtime.jar b/java/mode/org.eclipse.core.runtime.jar
index 4b46a12621..5ce8bf72e8 100644
Binary files a/java/mode/org.eclipse.core.runtime.jar and b/java/mode/org.eclipse.core.runtime.jar differ
diff --git a/java/mode/org.eclipse.equinox.common.jar b/java/mode/org.eclipse.equinox.common.jar
index c2a745e120..fd7334f66b 100644
Binary files a/java/mode/org.eclipse.equinox.common.jar and b/java/mode/org.eclipse.equinox.common.jar differ
diff --git a/java/mode/org.eclipse.jdt.compiler.apt.jar b/java/mode/org.eclipse.jdt.compiler.apt.jar
new file mode 100644
index 0000000000..1e553dbf78
Binary files /dev/null and b/java/mode/org.eclipse.jdt.compiler.apt.jar differ
diff --git a/java/mode/org.eclipse.jdt.core.jar b/java/mode/org.eclipse.jdt.core.jar
index 2b675bc844..b749e518b8 100644
Binary files a/java/mode/org.eclipse.jdt.core.jar and b/java/mode/org.eclipse.jdt.core.jar differ
diff --git a/java/mode/plugin.properties b/java/mode/plugin.properties
new file mode 100644
index 0000000000..7611e97e29
--- /dev/null
+++ b/java/mode/plugin.properties
@@ -0,0 +1,34 @@
+###############################################################################
+# Copyright (c) 2000, 2014 IBM Corporation and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+#     Harry Terkelsen (het@google.com) - Bug 449262 - Allow the use of third-party Java formatters
+###############################################################################
+providerName=Eclipse.org
+pluginName=Java Development Tools Core
+javaNatureName=Java
+javaBuilderName=Java Builder
+javaProblemName=Java Problem
+buildPathProblemName=Build Path Problem
+transientJavaProblemName=Transient Java Problem
+classpathVariableInitializersName=Classpath Variable Initializers
+classpathContainerInitializersName=Classpath Container Initializers
+codeFormattersName=Source Code Formatters
+compilationParticipantsName=Compilation Participants
+annotationProcessorManagerName=Java 6 Annotation Processor Manager
+javaTaskName=Java Task
+javaPropertiesName=Java Properties File
+javaSourceName=Java Source File
+javaClassName=Java Class File
+jarManifestName=JAR Manifest File
+traceComponentLabel=JDT Core
+javaFormatterName=Java Formatter
+defaultJavaFormatterName=Eclipse [built-in]
diff --git a/java/mode/plugin.xml b/java/mode/plugin.xml
new file mode 100644
index 0000000000..315397d7cb
--- /dev/null
+++ b/java/mode/plugin.xml
@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<!--
+    Copyright (c) 2004, 2014 IBM Corporation and others.
+
+    This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+    
+    Contributors:
+        IBM Corporation - initial API and implementation
+        Harry Terkelsen (het@google.com) - Bug 449262 - Allow the use of third-party Java formatters
+ -->
+
+<!-- =================================================================================== -->
+<!-- JDT/CORE Plug-in Manifest                                                           -->
+<!-- =================================================================================== -->
+<plugin>
+
+<!-- =================================================================================== -->
+<!-- Prerequisite Plug-ins                                                               -->
+<!-- =================================================================================== -->
+
+
+<!-- =================================================================================== -->
+<!-- Runtime Libraries                                                                   -->
+<!-- =================================================================================== -->
+
+
+<!-- =================================================================================== -->
+<!-- Extension Point: Initializers of Classpath Variables                                -->
+<!-- =================================================================================== -->
+
+<extension-point name="%classpathVariableInitializersName" 
+	id="classpathVariableInitializer"
+	schema="schema/classpathVariableInitializer.exsd"/>
+  
+<!-- =================================================================================== -->
+<!-- Extension Point: Initializers of Classpath Containers                               -->
+<!-- =================================================================================== -->
+
+<extension-point name="%classpathContainerInitializersName" 
+	id="classpathContainerInitializer" 
+	schema="schema/classpathContainerInitializer.exsd"/>
+
+<!-- =================================================================================== -->
+<!-- Extension Point: Formatter of Source Code                                           -->
+<!-- =================================================================================== -->
+
+<extension-point name="%codeFormattersName" 
+	id="codeFormatter"
+	schema="schema/codeFormatter.exsd"/>
+
+<!-- =================================================================================== -->
+<!-- Extension Point: Compilation Participant                                            -->
+<!-- =================================================================================== -->
+
+<extension-point name="%compilationParticipantsName" 
+	id="compilationParticipant"
+	schema="schema/compilationParticipant.exsd"/>
+
+<!-- =================================================================================== -->
+<!-- Extension Point: Java 6 Annotation Processor Manager                                -->
+<!-- =================================================================================== -->
+
+<extension-point name="%annotationProcessorManagerName" 
+	id="annotationProcessorManager"
+	schema="schema/annotationProcessorManager.exsd"/>
+
+<!-- =================================================================================== -->
+<!-- Extension Point: Java Source Formatter                                              -->
+<!-- =================================================================================== -->
+
+<extension-point name="%javaFormatterName"
+  id="javaFormatter"
+  schema="schema/javaFormatter.exsd"/>
+
+<!-- =================================================================================== -->
+<!-- Extension: Java Nature                                                              -->
+<!-- =================================================================================== -->
+
+<extension 
+	point="org.eclipse.core.resources.natures" 
+	id="javanature"
+	name="%javaNatureName">
+	<runtime>
+		<run class="org.eclipse.jdt.internal.core.JavaProject">
+		</run>
+	</runtime>
+</extension>
+
+
+<!-- =================================================================================== -->
+<!-- Extension: Java Builder                                                             -->
+<!-- =================================================================================== -->
+
+<extension 
+	point="org.eclipse.core.resources.builders" 
+	id="javabuilder"
+	name="%javaBuilderName">
+	<builder>
+		<run class="org.eclipse.jdt.internal.core.builder.JavaBuilder">
+		</run>
+		<dynamicReference class="org.eclipse.jdt.internal.core.DynamicProjectReferences"/>
+	</builder>
+</extension>
+
+<!-- =================================================================================== -->
+<!-- Extension: Java Problem                                                             -->
+<!-- =================================================================================== -->
+<extension id="problem" point="org.eclipse.core.resources.markers" name="%javaProblemName">
+	<super type="org.eclipse.core.resources.problemmarker"/>
+	<super type="org.eclipse.core.resources.textmarker"/>
+	<persistent value="true"/>
+	<attribute name="id"/>
+	<attribute name="flags"/>
+	<attribute name="arguments"/>
+	<attribute name="categoryId"/>
+</extension>   
+
+<!-- =================================================================================== -->
+<!-- Extension: Java Buildpath Problem                                                   -->
+<!-- =================================================================================== -->
+<extension id="buildpath_problem" point="org.eclipse.core.resources.markers" name="%buildPathProblemName">
+	<super type="org.eclipse.core.resources.problemmarker"/>
+	<super type="org.eclipse.core.resources.textmarker"/>
+	<persistent value="true"/>
+	<attribute name ="cycleDetected"/>
+	<attribute name="id"/>
+	<attribute name="arguments"/>
+</extension>   
+
+<!-- =================================================================================== -->
+<!-- Extension: Java Transient Problem                                                   -->
+<!-- =================================================================================== -->
+<extension id="transient_problem" point="org.eclipse.core.resources.markers" name="%transientJavaProblemName">
+	<super type="org.eclipse.core.resources.textmarker"/>
+	<persistent value="false"/>
+	<attribute name="id"/>
+	<attribute name="flags"/>
+	<attribute name="arguments"/>
+</extension>
+
+<!-- =================================================================================== -->
+<!-- Extension: Java Task                                                                -->
+<!-- =================================================================================== -->
+<extension id="task" name="%javaTaskName" point="org.eclipse.core.resources.markers">
+    <super type="org.eclipse.core.resources.taskmarker"/> 
+    <persistent value="true"/>
+</extension>
+    
+<!-- =================================================================================== -->
+<!-- Extension: Javac Ant Adapter                                                        -->
+<!-- =================================================================================== -->
+<extension 
+	point="org.eclipse.ant.core.extraClasspathEntries">
+	<extraClasspathEntry
+		library="jdtCompilerAdapter.jar">
+	</extraClasspathEntry>
+</extension> 
+
+<!-- =================================================================================== -->
+<!-- Extension: Javac Ant Task                                                           -->
+<!-- =================================================================================== -->
+<extension point="org.eclipse.ant.core.antTasks">
+	<antTask
+		name="eclipse.checkDebugAttributes"
+		class="org.eclipse.jdt.core.CheckDebugAttributes"
+		library="jdtCompilerAdapter.jar">
+	</antTask>
+	<antTask
+		name="eclipse.buildJarIndex"
+		class="org.eclipse.jdt.core.BuildJarIndex"
+		library="jdtCompilerAdapter.jar">
+	</antTask>
+</extension>
+      
+<!-- =================================================================================== -->
+<!-- Extension: User Library Container                                                   -->
+<!-- =================================================================================== -->
+<extension
+      point="org.eclipse.jdt.core.classpathContainerInitializer">
+      <classpathContainerInitializer
+            class="org.eclipse.jdt.internal.core.UserLibraryClasspathContainerInitializer"
+            id="org.eclipse.jdt.USER_LIBRARY">
+      </classpathContainerInitializer>
+   </extension>
+
+<!-- =================================================================================== -->
+<!-- Extension: Module Path Container                                                   -->
+<!-- =================================================================================== -->
+<extension
+      point="org.eclipse.jdt.core.classpathContainerInitializer">
+      <classpathContainerInitializer
+            class="org.eclipse.jdt.internal.core.ModulePathContainerInitializer"
+            id="org.eclipse.jdt.MODULE_PATH">
+      </classpathContainerInitializer>
+   </extension>
+
+<!-- =================================================================================== -->
+<!-- Extension: Java File Types                                                          -->
+<!-- =================================================================================== -->
+<extension point="org.eclipse.team.core.fileTypes">
+	<fileTypes extension="java" type="text"/>
+	<fileTypes extension="classpath" type="text"/>
+	<fileTypes extension="properties" type="text"/>
+	<fileTypes extension="class" type="binary"/>
+	<fileTypes extension="jar" type="binary"/>
+	<fileTypes extension="jardesc" type="text"/>
+	<fileTypes extension="zip" type="binary"/>
+</extension>
+
+<!-- =================================================================================== -->
+<!-- Extension: Java Code Formatter                                                      -->
+<!-- =================================================================================== -->
+<extension
+      id="JavaCodeFormatter"
+      point="org.eclipse.core.runtime.applications">
+      	<application>
+      		<run class="org.eclipse.jdt.core.formatter.CodeFormatterApplication" />
+		</application>
+</extension>
+
+<!-- =================================================================================== -->
+<!-- Extension: Java Generate Indexer                                                    -->
+<!-- =================================================================================== -->
+<extension
+      id="JavaIndexer"
+      point="org.eclipse.core.runtime.applications">
+   		<application>
+      		<run class="org.eclipse.jdt.core.index.JavaIndexerApplication" />
+   		</application>
+</extension>
+
+<!-- =================================================================================== -->
+<!-- Extension: Java Content Types                                                       -->
+<!-- =================================================================================== -->
+<extension point="org.eclipse.core.contenttype.contentTypes">
+	<!-- declares a content type for Java Properties files -->
+	<content-type id="javaProperties" name="%javaPropertiesName" 
+		base-type="org.eclipse.core.runtime.text"
+		priority="high"				
+		file-extensions="properties"
+		default-charset="ISO-8859-1"/>
+	<!-- Associates .classpath to the XML content type -->
+	<file-association 
+		content-type="org.eclipse.core.runtime.xml" 
+		file-names=".classpath"/>  
+	<!-- declares a content type for Java Source files -->
+	<content-type id="javaSource" name="%javaSourceName" 
+		base-type="org.eclipse.core.runtime.text"
+		priority="high"				
+		file-extensions="java"/>
+	<!-- declares a content type for Java class files -->
+    <content-type id="javaClass" name="%javaClassName" 
+        priority="high"				
+        file-extensions="class">        
+        <describer
+            class="org.eclipse.core.runtime.content.BinarySignatureDescriber">
+            <parameter name="signature" value="CA, FE, BA, BE"/>
+        </describer>
+    </content-type>        
+	<!-- declares a content type for JAR manifest files -->
+    <content-type id="JARManifest" name="%jarManifestName" 
+        base-type="org.eclipse.core.runtime.text"
+        priority="high"				
+        file-names="MANIFEST.MF"
+        default-charset="UTF-8"/>
+</extension>
+      
+<!-- =================================================================================== -->
+<!-- Extension: Eclipse preferences initializer                                          -->
+<!-- =================================================================================== -->
+<extension
+      point="org.eclipse.core.runtime.preferences">
+   <initializer class="org.eclipse.jdt.internal.core.JavaCorePreferenceInitializer"/>
+</extension>
+<extension
+      point="org.eclipse.core.runtime.preferences">
+   <modifier class="org.eclipse.jdt.internal.core.JavaCorePreferenceModifyListener"/>
+</extension>
+
+<!-- =================================================================================== -->
+<!-- Extension: Eclipse tracing                                                          -->
+<!-- =================================================================================== -->
+<extension
+      point="org.eclipse.ui.trace.traceComponents">
+   <component
+         id="org.eclipse.jdt.core.trace"
+         label="%traceComponentLabel">
+      <bundle
+            consumed="false"
+            name="org.eclipse.jdt.core">
+      </bundle>
+   </component>
+</extension>
+
+<!-- =================================================================================== -->
+<!-- Extension: Java Code Formatter                                                      -->
+<!-- =================================================================================== -->
+<extension
+      point="org.eclipse.jdt.core.javaFormatter">
+   <javaFormatter
+         class="org.eclipse.jdt.internal.formatter.DefaultCodeFormatter"
+         id="org.eclipse.jdt.core.defaultJavaFormatter"
+         name="%defaultJavaFormatterName">
+   </javaFormatter>
+</extension>
+
+</plugin>
diff --git a/java/mode/readme.txt b/java/mode/readme.txt
index 5b94b7a70e..29d51b2e91 100644
--- a/java/mode/readme.txt
+++ b/java/mode/readme.txt
@@ -13,7 +13,7 @@ This Mode does not use ecj.jar from the original Java mode, because its files ar
 For 3.0 alpha 11, the signature files were removed from oorg.eclipse.jdt.core.jar to fix a signing conflict with Android Mode and Ant.
 https://github.com/processing/processing/pull/3324
 
-. . . 
+. . .
 
 http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/plugins/com.ibm.icu_54.1.1.v201501272100.jar
 
@@ -35,7 +35,7 @@ http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/plugins/org
 
 http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/plugins/org.eclipse.text_3.5.400.v20150505-1044.jar
 
-. . . 
+. . .
 
 Updated 19 January 2015 to fix Java 8 support. The previous versions gave an "Annotation processing got disabled, since it requires a 1.6 compliant JVM" error.
 
@@ -43,3 +43,7 @@ Updated 21 March 2016 to newest version (from R-4.4.1-201409250400 to R-4.5.2-20
 
 Finally, the archive site contains additional jars for the 4.5.2 release, including the JDT Core Batch Compiler (ECJ):
 http://archive.eclipse.org/eclipse/downloads/drops4/R-4.5.2-201602121500/
+
+. . .
+
+Updated the org.eclipse libs. For eclipse projects, please see https://www.eclipse.org/legal/epl-2.0/ for licensing.
diff --git a/java/src/processing/mode/java/JavaBuild.java b/java/src/processing/mode/java/JavaBuild.java
index 85413a4eae..b50b1816d3 100644
--- a/java/src/processing/mode/java/JavaBuild.java
+++ b/java/src/processing/mode/java/JavaBuild.java
@@ -54,6 +54,8 @@
 import processing.data.StringList;
 import processing.data.XML;
 import processing.mode.java.pdex.SourceUtils;
+import processing.mode.java.pdex.util.runtime.RuntimeConst;
+import processing.mode.java.pdex.util.runtime.strategy.JavaFxRuntimePathFactory;
 import processing.mode.java.preproc.PdePreprocessor;
 import processing.mode.java.preproc.PreprocessorResult;
 import processing.mode.java.preproc.SurfaceInfo;
@@ -785,10 +787,10 @@ protected boolean exportApplication(File destFolder,
     if (exportPlatform == PConstants.MACOSX) {
       dotAppFolder = new File(destFolder, sketch.getName() + ".app");
 
-      File contentsOrig = new File(Platform.getJavaHome(), "../../../../..");
+      File contentsOrig = new File(Platform.getJavaHome(), "../../../..");
 
       if (embedJava) {
-        File jdkFolder = new File(Platform.getJavaHome(), "../../..");
+        File jdkFolder = new File(Platform.getJavaHome(), "../..");
         String jdkFolderName = jdkFolder.getCanonicalFile().getName();
         jvmRuntime = "<key>JVMRuntime</key>\n    <string>" + jdkFolderName + "</string>";
         jdkPath = new File(dotAppFolder, "Contents/PlugIns/" + jdkFolderName).getAbsolutePath();
@@ -920,7 +922,6 @@ protected boolean exportApplication(File destFolder,
     for (Library library : importedLibraries) {
       // add each item from the library folder / export list to the output
       for (File exportFile : library.getApplicationExports(exportPlatform, exportVariant)) {
-//        System.out.println("export: " + exportFile);
         String exportName = exportFile.getName();
         if (!exportFile.exists()) {
           System.err.println(exportFile.getName() +
@@ -943,7 +944,6 @@ protected boolean exportApplication(File destFolder,
       }
     }
 
-
     /// create platform-specific CLASSPATH based on included jars
 
     String exportClassPath = null;
@@ -972,23 +972,14 @@ protected boolean exportApplication(File destFolder,
     }
     // https://github.com/processing/processing/issues/2239
     runOptions.append("-Djna.nosys=true");
-    // https://github.com/processing/processing/issues/4608
-    if (embedJava) {
-      // if people don't embed Java, it might be a mess, but what can we do?
-      if (exportPlatform == PConstants.MACOSX) {
-        runOptions.append("-Djava.ext.dirs=$APP_ROOT/Contents/PlugIns/jdk" +
-                          PApplet.javaVersionName +
-                          ".jdk/Contents/Home/jre/lib/ext");
-      } else if (exportPlatform == PConstants.WINDOWS) {
-        runOptions.append("-Djava.ext.dirs=\"%EXEDIR%\\java\\lib\\ext\"");
-      } else if (exportPlatform == PConstants.LINUX) {
-        runOptions.append("-Djava.ext.dirs=\"$APPDIR/java/lib/ext\"");
-      }
-    }
 
     // https://github.com/processing/processing/issues/2559
     if (exportPlatform == PConstants.WINDOWS) {
       runOptions.append("-Djava.library.path=\"%EXEDIR%\\lib\"");
+
+      // No scaling of swing (see #5753) on zoomed displays until some issues regarding JEP 263
+      // with rendering artifacts are sorted out.
+      runOptions.append("-Dsun.java2d.uiScale=1");
     }
 
 
diff --git a/java/src/processing/mode/java/pdex/ErrorChecker.java b/java/src/processing/mode/java/pdex/ErrorChecker.java
index 4c735bc7f9..246eb75d00 100644
--- a/java/src/processing/mode/java/pdex/ErrorChecker.java
+++ b/java/src/processing/mode/java/pdex/ErrorChecker.java
@@ -103,6 +103,7 @@ private void handleSketchProblems(PreprocessedSketch ps) {
 
     if (problems.isEmpty()) {
       AtomicReference<ClassPath> searchClassPath = new AtomicReference<>(null);
+
       List<Problem> cuProblems = Arrays.stream(iproblems)
           // Filter Warnings if they are not enabled
           .filter(iproblem -> !(iproblem.isWarning() && !JavaMode.warningsEnabled))
@@ -312,6 +313,7 @@ static public String[] getImportSuggestions(ClassPath cp, String className) {
         // replace inner class separators with dots
         .map(res -> res.replace('$', '.'))
         // sort, prioritize clases from java. package
+        .map(res -> res.startsWith("classes.") ? res.substring(8) : res)
         .sorted((o1, o2) -> {
           // put java.* first, should be prioritized more
           boolean o1StartsWithJava = o1.startsWith("java");
@@ -324,4 +326,4 @@ static public String[] getImportSuggestions(ClassPath cp, String className) {
         })
         .toArray(String[]::new);
   }
-}
\ No newline at end of file
+}
diff --git a/java/src/processing/mode/java/pdex/PreprocessingService.java b/java/src/processing/mode/java/pdex/PreprocessingService.java
index b50e117990..8fdaaf43ba 100644
--- a/java/src/processing/mode/java/pdex/PreprocessingService.java
+++ b/java/src/processing/mode/java/pdex/PreprocessingService.java
@@ -2,7 +2,7 @@
 
 /*
 Part of the Processing project - http://processing.org
-Copyright (c) 2012-15 The Processing Foundation
+Copyright (c) 2012-19 The Processing Foundation
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License version 2
@@ -20,20 +20,8 @@
 
 package processing.mode.java.pdex;
 
-import com.google.classpath.ClassPathFactory;
-
 import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CompletableFuture;
@@ -54,17 +42,16 @@
 import org.eclipse.jdt.core.dom.ASTParser;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 
-import processing.app.Library;
 import processing.app.Messages;
 import processing.app.Sketch;
 import processing.app.SketchCode;
-import processing.app.SketchException;
 import processing.app.Util;
 import processing.data.IntList;
 import processing.data.StringList;
 import processing.mode.java.JavaEditor;
 import processing.mode.java.JavaMode;
 import processing.mode.java.pdex.TextTransform.OffsetMapper;
+import processing.mode.java.pdex.util.runtime.RuntimePathBuilder;
 import processing.mode.java.preproc.PdePreprocessor;
 import processing.mode.java.preproc.PdePreprocessor.Mode;
 
@@ -78,8 +65,6 @@ public class PreprocessingService {
 
   protected final ASTParser parser = ASTParser.newParser(AST.JLS8);
 
-  private final ClassPathFactory classPathFactory = new ClassPathFactory();
-
   private final Thread preprocessingThread;
   private final BlockingQueue<Boolean> requestQueue = new ArrayBlockingQueue<>(1);
 
@@ -326,22 +311,15 @@ private PreprocessedSketch preprocessSketch(PreprocessedSketch prevResult) {
     toParsable.addAll(SourceUtils.wrapSketch(sketchMode, className, workBuffer.length()));
 
     { // Refresh sketch classloader and classpath if imports changed
-      if (javaRuntimeClassPath == null) {
-        javaRuntimeClassPath = buildJavaRuntimeClassPath();
-        sketchModeClassPath = buildModeClassPath(javaMode, false);
-        searchModeClassPath = buildModeClassPath(javaMode, true);
-      }
-
       if (reloadLibraries) {
-        coreLibraryClassPath = buildCoreLibraryClassPath(javaMode);
+        runtimePathBuilder.markLibrariesChanged();
       }
 
       boolean rebuildLibraryClassPath = reloadLibraries ||
           checkIfImportsChanged(programImports, prevResult.programImports);
 
       if (rebuildLibraryClassPath) {
-        sketchLibraryClassPath = buildSketchLibraryClassPath(javaMode, programImports);
-        searchLibraryClassPath = buildSearchLibraryClassPath(javaMode);
+        runtimePathBuilder.markLibraryImportsChanged();
       }
 
       boolean rebuildClassPath = reloadCodeFolder || rebuildLibraryClassPath ||
@@ -349,45 +327,11 @@ private PreprocessedSketch preprocessSketch(PreprocessedSketch prevResult) {
           prevResult.classPathArray == null || prevResult.searchClassPathArray == null;
 
       if (reloadCodeFolder) {
-        codeFolderClassPath = buildCodeFolderClassPath(sketch);
+        runtimePathBuilder.markCodeFolderChanged();
       }
 
       if (rebuildClassPath) {
-        { // Sketch class path
-          List<String> sketchClassPath = new ArrayList<>();
-          sketchClassPath.addAll(javaRuntimeClassPath);
-          sketchClassPath.addAll(sketchModeClassPath);
-          sketchClassPath.addAll(sketchLibraryClassPath);
-          sketchClassPath.addAll(coreLibraryClassPath);
-          sketchClassPath.addAll(codeFolderClassPath);
-
-          String[] classPathArray = sketchClassPath.stream().toArray(String[]::new);
-          URL[] urlArray = Arrays.stream(classPathArray)
-              .map(path -> {
-                try {
-                  return Paths.get(path).toUri().toURL();
-                } catch (MalformedURLException e) {
-                  Messages.loge("malformed URL when preparing sketch classloader", e);
-                  return null;
-                }
-              })
-              .filter(url -> url != null)
-              .toArray(URL[]::new);
-          result.classLoader = new URLClassLoader(urlArray, null);
-          result.classPath = classPathFactory.createFromPaths(classPathArray);
-          result.classPathArray = classPathArray;
-        }
-
-        { // Search class path
-          List<String> searchClassPath = new ArrayList<>();
-          searchClassPath.addAll(javaRuntimeClassPath);
-          searchClassPath.addAll(searchModeClassPath);
-          searchClassPath.addAll(searchLibraryClassPath);
-          searchClassPath.addAll(coreLibraryClassPath);
-          searchClassPath.addAll(codeFolderClassPath);
-
-          result.searchClassPathArray = searchClassPath.stream().toArray(String[]::new);
-        }
+        runtimePathBuilder.prepareClassPath(result, javaMode);
       } else {
         result.classLoader = prevResult.classLoader;
         result.classPath = prevResult.classPath;
@@ -493,141 +437,7 @@ private static boolean checkIfImportsChanged(List<ImportStatement> prevImports,
 
   /// CLASSPATHS ---------------------------------------------------------------
 
-
-  private List<String> javaRuntimeClassPath;
-
-  private List<String> sketchModeClassPath;
-  private List<String> searchModeClassPath;
-
-  private List<String> coreLibraryClassPath;
-
-  private List<String> codeFolderClassPath;
-
-  private List<String> sketchLibraryClassPath;
-  private List<String> searchLibraryClassPath;
-
-
-  private static List<String> buildCodeFolderClassPath(Sketch sketch) {
-    StringBuilder classPath = new StringBuilder();
-
-    // Code folder
-    if (sketch.hasCodeFolder()) {
-      File codeFolder = sketch.getCodeFolder();
-      String codeFolderClassPath = Util.contentsToClassPath(codeFolder);
-      classPath.append(codeFolderClassPath);
-    }
-
-    return sanitizeClassPath(classPath.toString());
-  }
-
-
-  private static List<String> buildModeClassPath(JavaMode mode, boolean search) {
-    StringBuilder classPath = new StringBuilder();
-
-    if (search) {
-      String searchClassPath = mode.getSearchPath();
-      if (searchClassPath != null) {
-        classPath.append(File.pathSeparator).append(searchClassPath);
-      }
-    } else {
-      Library coreLibrary = mode.getCoreLibrary();
-      String coreClassPath = coreLibrary != null ?
-          coreLibrary.getClassPath() : mode.getSearchPath();
-      if (coreClassPath != null) {
-        classPath.append(File.pathSeparator).append(coreClassPath);
-      }
-    }
-
-    return sanitizeClassPath(classPath.toString());
-  }
-
-
-  private static List<String> buildCoreLibraryClassPath(JavaMode mode) {
-    StringBuilder classPath = new StringBuilder();
-
-    for (Library lib : mode.coreLibraries) {
-      classPath.append(File.pathSeparator).append(lib.getClassPath());
-    }
-
-    return sanitizeClassPath(classPath.toString());
-  }
-
-
-  private static List<String> buildSearchLibraryClassPath(JavaMode mode) {
-    StringBuilder classPath = new StringBuilder();
-
-    for (Library lib : mode.contribLibraries) {
-      classPath.append(File.pathSeparator).append(lib.getClassPath());
-    }
-
-    return sanitizeClassPath(classPath.toString());
-  }
-
-
-  static private List<String> buildSketchLibraryClassPath(JavaMode mode,
-                                                          List<ImportStatement> programImports) {
-    StringBuilder classPath = new StringBuilder();
-
-    programImports.stream()
-        .map(ImportStatement::getPackageName)
-        .filter(pckg -> !ignorableImport(pckg))
-        .map(pckg -> {
-          try {
-            return mode.getLibrary(pckg);
-          } catch (SketchException e) {
-            return null;
-          }
-        })
-        .filter(lib -> lib != null)
-        .map(Library::getClassPath)
-        .forEach(cp -> classPath.append(File.pathSeparator).append(cp));
-
-    return sanitizeClassPath(classPath.toString());
-  }
-
-
-  static private List<String> buildJavaRuntimeClassPath() {
-    StringBuilder classPath = new StringBuilder();
-
-    { // Java runtime
-      String rtPath = System.getProperty("java.home") +
-          File.separator + "lib" + File.separator + "rt.jar";
-      if (new File(rtPath).exists()) {
-        classPath.append(File.pathSeparator).append(rtPath);
-      } else {
-        rtPath = System.getProperty("java.home") + File.separator + "jre" +
-            File.separator + "lib" + File.separator + "rt.jar";
-        if (new File(rtPath).exists()) {
-          classPath.append(File.pathSeparator).append(rtPath);
-        }
-      }
-    }
-
-    { // JavaFX runtime
-      String jfxrtPath = System.getProperty("java.home") +
-          File.separator + "lib" + File.separator + "ext" + File.separator + "jfxrt.jar";
-      if (new File(jfxrtPath).exists()) {
-        classPath.append(File.pathSeparator).append(jfxrtPath);
-      } else {
-        jfxrtPath = System.getProperty("java.home") + File.separator + "jre" +
-            File.separator + "lib" + File.separator + "ext" + File.separator + "jfxrt.jar";
-        if (new File(jfxrtPath).exists()) {
-          classPath.append(File.pathSeparator).append(jfxrtPath);
-        }
-      }
-    }
-
-    return sanitizeClassPath(classPath.toString());
-  }
-
-
-  private static List<String> sanitizeClassPath(String classPathString) {
-    // Make sure class path does not contain empty string (home dir)
-    return Arrays.stream(classPathString.split(File.pathSeparator))
-        .filter(p -> p != null && !p.trim().isEmpty())
-        .distinct()
-        .collect(Collectors.toList());
-  }
+  private RuntimePathBuilder runtimePathBuilder = new RuntimePathBuilder();
 
   /// --------------------------------------------------------------------------
 
@@ -662,20 +472,13 @@ private static CompilationUnit makeASTWithBindings(ASTParser parser,
   }
 
 
-  /**
-   * Ignore processing packages, java.*.*. etc.
-   */
-  static private boolean ignorableImport(String packageName) {
-    return (packageName.startsWith("java.") ||
-            packageName.startsWith("javax."));
-  }
-
-
   static private final Map<String, String> COMPILER_OPTIONS;
   static {
     Map<String, String> compilerOptions = new HashMap<>();
 
-    JavaCore.setComplianceOptions(JavaCore.VERSION_1_7, compilerOptions);
+    compilerOptions.put(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_11);
+    compilerOptions.put(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_11);
+    compilerOptions.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_11);
 
     // See http://help.eclipse.org/mars/index.jsp?topic=%2Forg.eclipse.jdt.doc.isv%2Fguide%2Fjdt_api_options.htm&anchor=compiler
 
diff --git a/java/src/processing/mode/java/pdex/util/runtime/RuntimeConst.java b/java/src/processing/mode/java/pdex/util/runtime/RuntimeConst.java
new file mode 100644
index 0000000000..58e41d1844
--- /dev/null
+++ b/java/src/processing/mode/java/pdex/util/runtime/RuntimeConst.java
@@ -0,0 +1,118 @@
+/*
+Part of the Processing project - http://processing.org
+
+Copyright (c) 2019 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation,
+Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+package processing.mode.java.pdex.util.runtime;
+
+
+/**
+ * Constants related to runtime component enumeration.
+ */
+public class RuntimeConst {
+
+  /**
+   * The modules comprising the Java standard modules.
+   */
+  public static final String[] STANDARD_MODULES = {
+      "java.base.jmod",
+      "java.compiler.jmod",
+      "java.datatransfer.jmod",
+      "java.desktop.jmod",
+      "java.instrument.jmod",
+      "java.logging.jmod",
+      "java.management.jmod",
+      "java.management.rmi.jmod",
+      "java.naming.jmod",
+      "java.net.http.jmod",
+      "java.prefs.jmod",
+      "java.rmi.jmod",
+      "java.scripting.jmod",
+      "java.se.jmod",
+      "java.security.jgss.jmod",
+      "java.security.sasl.jmod",
+      "java.smartcardio.jmod",
+      "java.sql.jmod",
+      "java.sql.rowset.jmod",
+      "java.transaction.xa.jmod",
+      "java.xml.crypto.jmod",
+      "java.xml.jmod",
+      "jdk.accessibility.jmod",
+      "jdk.aot.jmod",
+      "jdk.attach.jmod",
+      "jdk.charsets.jmod",
+      "jdk.compiler.jmod",
+      "jdk.crypto.cryptoki.jmod",
+      "jdk.crypto.ec.jmod",
+      "jdk.dynalink.jmod",
+      "jdk.editpad.jmod",
+      "jdk.hotspot.agent.jmod",
+      "jdk.httpserver.jmod",
+      "jdk.internal.ed.jmod",
+      "jdk.internal.jvmstat.jmod",
+      "jdk.internal.le.jmod",
+      "jdk.internal.opt.jmod",
+      "jdk.internal.vm.ci.jmod",
+      "jdk.internal.vm.compiler.jmod",
+      "jdk.internal.vm.compiler.management.jmod",
+      "jdk.jartool.jmod",
+      "jdk.javadoc.jmod",
+      "jdk.jcmd.jmod",
+      "jdk.jconsole.jmod",
+      "jdk.jdeps.jmod",
+      "jdk.jdi.jmod",
+      "jdk.jdwp.agent.jmod",
+      "jdk.jfr.jmod",
+      "jdk.jlink.jmod",
+      "jdk.jshell.jmod",
+      "jdk.jsobject.jmod",
+      "jdk.jstatd.jmod",
+      "jdk.localedata.jmod",
+      "jdk.management.agent.jmod",
+      "jdk.management.jfr.jmod",
+      "jdk.management.jmod",
+      "jdk.naming.dns.jmod",
+      "jdk.naming.rmi.jmod",
+      "jdk.net.jmod",
+      "jdk.pack.jmod",
+      "jdk.rmic.jmod",
+      "jdk.scripting.nashorn.jmod",
+      "jdk.scripting.nashorn.shell.jmod",
+      "jdk.sctp.jmod",
+      "jdk.security.auth.jmod",
+      "jdk.security.jgss.jmod",
+      "jdk.unsupported.desktop.jmod",
+      "jdk.unsupported.jmod",
+      "jdk.xml.dom.jmod",
+      "jdk.zipfs.jmod"
+  };
+
+  /**
+   * The jars required for OpenJFX.
+   */
+  public static final String[] JAVA_FX_JARS = {
+      "javafx-swt.jar",
+      "javafx.base.jar",
+      "javafx.controls.jar",
+      "javafx.fxml.jar",
+      "javafx.graphics.jar",
+      "javafx.media.jar",
+      "javafx.swing.jar",
+      "javafx.web.jar"
+  };
+
+}
diff --git a/java/src/processing/mode/java/pdex/util/runtime/RuntimePathBuilder.java b/java/src/processing/mode/java/pdex/util/runtime/RuntimePathBuilder.java
new file mode 100644
index 0000000000..9128de09ca
--- /dev/null
+++ b/java/src/processing/mode/java/pdex/util/runtime/RuntimePathBuilder.java
@@ -0,0 +1,220 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 2012-19 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime;
+
+import com.google.classpath.ClassPathFactory;
+import processing.app.Messages;
+import processing.app.Sketch;
+import processing.mode.java.JavaMode;
+import processing.mode.java.pdex.ImportStatement;
+import processing.mode.java.pdex.PreprocessedSketch;
+import processing.mode.java.pdex.util.runtime.strategy.*;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Stream;
+
+
+/**
+ * Builder which generates runtime paths using a series of caches.
+ *
+ * <p>
+ * Builder which helps generate classpath (and module path) entries for sketches using stateful
+ * and individually invalidate-able caches to prevent duplicate work.
+ * </p>
+ */
+public class RuntimePathBuilder {
+  private final List<CachedRuntimePathFactory> libraryDependentCaches;
+  private final List<CachedRuntimePathFactory> libraryImportsDependentCaches;
+  private final List<CachedRuntimePathFactory> codeFolderDependentCaches;
+
+  private final List<RuntimePathFactoryStrategy> sketchClassPathStrategies;
+  private final List<RuntimePathFactoryStrategy> searchClassPathStrategies;
+
+  private final ClassPathFactory classPathFactory;
+
+  /**
+   * Create a new runtime path builder with empty caches.
+   */
+  public RuntimePathBuilder() {
+    classPathFactory  = new ClassPathFactory();
+
+    // Declare caches to be built
+    CachedRuntimePathFactory javaRuntimePathFactory;
+    CachedRuntimePathFactory modeSketchPathFactory;
+    CachedRuntimePathFactory modeSearchPathFactory;
+    CachedRuntimePathFactory librarySketchPathFactory;
+    CachedRuntimePathFactory librarySearchPathFactory;
+    CachedRuntimePathFactory coreLibraryPathFactory;
+    CachedRuntimePathFactory codeFolderPathFactory;
+
+    // Create collections
+    sketchClassPathStrategies = new ArrayList<>();
+    searchClassPathStrategies = new ArrayList<>();
+
+    libraryDependentCaches = new ArrayList<>();
+    libraryImportsDependentCaches = new ArrayList<>();
+    codeFolderDependentCaches = new ArrayList<>();
+
+    // Create strategies
+    List<RuntimePathFactoryStrategy> runtimeStrategies = new ArrayList<>();
+    runtimeStrategies.add(new JavaRuntimePathFactory());
+    runtimeStrategies.add(new JavaFxRuntimePathFactory());
+    javaRuntimePathFactory = new CachedRuntimePathFactory(
+        new RuntimePathFactoryStrategyCollection(runtimeStrategies)
+    );
+
+    modeSketchPathFactory = new CachedRuntimePathFactory(new ModeSketchRuntimePathFactory());
+    modeSearchPathFactory = new CachedRuntimePathFactory(new ModeSearchRuntimePathFactory());
+
+    librarySketchPathFactory = new CachedRuntimePathFactory(new LibrarySketchRuntimePathFactory());
+    librarySearchPathFactory = new CachedRuntimePathFactory(new LibrarySearchRuntimePathFactory());
+
+    coreLibraryPathFactory = new CachedRuntimePathFactory(new CoreLibraryRuntimePathFactory());
+    codeFolderPathFactory = new CachedRuntimePathFactory(new CodeFolderRuntimePathFactory());
+
+    // Assign strategies to collections for producing paths
+    sketchClassPathStrategies.add(javaRuntimePathFactory);
+    sketchClassPathStrategies.add(modeSketchPathFactory);
+    sketchClassPathStrategies.add(librarySketchPathFactory);
+    sketchClassPathStrategies.add(coreLibraryPathFactory);
+    sketchClassPathStrategies.add(codeFolderPathFactory);
+
+    searchClassPathStrategies.add(javaRuntimePathFactory);
+    searchClassPathStrategies.add(modeSearchPathFactory);
+    searchClassPathStrategies.add(librarySearchPathFactory);
+    searchClassPathStrategies.add(coreLibraryPathFactory);
+    searchClassPathStrategies.add(codeFolderPathFactory);
+
+    // Assign strategies to collections for cache invalidation
+    libraryDependentCaches.add(coreLibraryPathFactory);
+
+    libraryImportsDependentCaches.add(librarySketchPathFactory);
+    libraryImportsDependentCaches.add(librarySearchPathFactory);
+
+    codeFolderDependentCaches.add(codeFolderPathFactory);
+  }
+
+  /**
+   * Invalidate all of the runtime path caches associated with sketch libraries.
+   */
+  public void markLibrariesChanged() {
+    invalidateAll(libraryDependentCaches);
+  }
+
+  /**
+   * Invalidate all of the runtime path caches associated with sketch library imports.
+   */
+  public void markLibraryImportsChanged() {
+    invalidateAll(libraryImportsDependentCaches);
+  }
+
+  /**
+   * Invalidate all of the runtime path caches associated with the code folder having changed.
+   */
+  public void markCodeFolderChanged() {
+    invalidateAll(codeFolderDependentCaches);
+  }
+
+  /**
+   * Generate a classpath and inject it into a {PreprocessedSketch.Builder}.
+   *
+   * @param result The {PreprocessedSketch.Builder} into which the classpath should be inserted.
+   * @param mode The {JavaMode} for which the classpath should be generated.
+   */
+  public void prepareClassPath(PreprocessedSketch.Builder result, JavaMode mode) {
+    List<ImportStatement> programImports = result.programImports;
+    Sketch sketch = result.sketch;
+
+    prepareSketchClassPath(result, mode, programImports, sketch);
+    prepareSearchClassPath(result, mode, programImports, sketch);
+  }
+
+  /**
+   * Invalidate all of the caches in a provided collection.
+   *
+   * @param caches The caches to invalidate so that, when their value is requested again, the value
+   *    is generated again.
+   */
+  private void invalidateAll(List<CachedRuntimePathFactory> caches) {
+    for (CachedRuntimePathFactory cache : caches) {
+      cache.invalidateCache();
+    }
+  }
+
+  /**
+   * Prepare the classpath required for the sketch's execution.
+   *
+   * @param result The PreprocessedSketch builder into which the classpath and class loader should
+   *    be injected.
+   * @param mode The JavaMode for which a sketch classpath should be generated.
+   * @param programImports The imports listed by the sketch (user imports).
+   * @param sketch The sketch for which the classpath is being generated.
+   */
+  private void prepareSketchClassPath(PreprocessedSketch.Builder result, JavaMode mode,
+        List<ImportStatement> programImports, Sketch sketch) {
+
+    Stream<String> sketchClassPath = sketchClassPathStrategies.stream()
+        .flatMap((x) -> x.buildClasspath(mode, programImports, sketch).stream());
+
+    String[] classPathArray = sketchClassPath.toArray(String[]::new);
+    URL[] urlArray = Arrays.stream(classPathArray)
+        .map(path -> {
+          try {
+            return Paths.get(path).toUri().toURL();
+          } catch (MalformedURLException e) {
+            Messages.loge("malformed URL when preparing sketch classloader", e);
+            return null;
+          }
+        })
+        .filter(Objects::nonNull)
+        .toArray(URL[]::new);
+
+    result.classLoader = new URLClassLoader(urlArray, null);
+    result.classPath = classPathFactory.createFromPaths(classPathArray);
+    result.classPathArray = classPathArray;
+  }
+
+  /**
+   * Prepare the classpath for searching in case of import suggestions.
+   *
+   * @param result The PreprocessedSketch builder into which the search classpath should be
+   *    injected.
+   * @param mode The JavaMode for which a sketch classpath should be generated.
+   * @param programImports The imports listed by the sketch (user imports).
+   * @param sketch The sketch for which the classpath is being generated.
+   */
+  private void prepareSearchClassPath(PreprocessedSketch.Builder result, JavaMode mode,
+        List<ImportStatement> programImports, Sketch sketch) {
+
+    Stream<String> searchClassPath = searchClassPathStrategies.stream()
+        .flatMap((x) -> x.buildClasspath(mode, programImports, sketch).stream());
+
+    result.searchClassPathArray = searchClassPath.toArray(String[]::new);
+  }
+
+}
diff --git a/java/src/processing/mode/java/pdex/util/runtime/RuntimePathUtil.java b/java/src/processing/mode/java/pdex/util/runtime/RuntimePathUtil.java
new file mode 100644
index 0000000000..8d6abebdec
--- /dev/null
+++ b/java/src/processing/mode/java/pdex/util/runtime/RuntimePathUtil.java
@@ -0,0 +1,48 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 2012-19 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+/**
+ * Common convenience functions for runtime path formulation.
+ */
+public class RuntimePathUtil {
+
+  /**
+   * Remove invalid entries in a classpath string.
+   *
+   * @param classPathString The classpath to clean.
+   * @return The cleaned classpath entries without invalid entries.
+   */
+  public static List<String> sanitizeClassPath(String classPathString) {
+    // Make sure class path does not contain empty string (home dir)
+    return Arrays.stream(classPathString.split(File.pathSeparator))
+        .filter(p -> p != null && !p.trim().isEmpty())
+        .distinct()
+        .collect(Collectors.toList());
+  }
+
+}
diff --git a/java/src/processing/mode/java/pdex/util/runtime/strategy/CachedRuntimePathFactory.java b/java/src/processing/mode/java/pdex/util/runtime/strategy/CachedRuntimePathFactory.java
new file mode 100644
index 0000000000..5a42eb00d0
--- /dev/null
+++ b/java/src/processing/mode/java/pdex/util/runtime/strategy/CachedRuntimePathFactory.java
@@ -0,0 +1,84 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 2019 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime.strategy;
+
+import processing.app.Sketch;
+import processing.mode.java.JavaMode;
+import processing.mode.java.pdex.ImportStatement;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
+
+/**
+ * Runtime path factory which caches the results of another runtime path factory.
+ *
+ * <p>
+ * Runtime path factory which decorates another {RuntimePathFactoryStrategy} that caches the
+ * results of another runtime path factory. This is a lazy cached getter so the value will not be
+ * resolved until it is requested.
+ * </p>
+ */
+public class CachedRuntimePathFactory implements RuntimePathFactoryStrategy {
+
+  private AtomicReference<List<String>> cachedResult;
+  private RuntimePathFactoryStrategy innerStrategy;
+
+  /**
+   * Create a new cache around {RuntimePathFactoryStrategy}.
+   *
+   * @param newInnerStrategy The strategy to cache.
+   */
+  public CachedRuntimePathFactory(RuntimePathFactoryStrategy newInnerStrategy) {
+    cachedResult = new AtomicReference<>(null);
+    innerStrategy = newInnerStrategy;
+  }
+
+  /**
+   * Invalidate the cached path so that, when requested next time, it will be rebuilt from scratch.
+   */
+  public void invalidateCache() {
+    cachedResult.set(null);
+  }
+
+  /**
+   * Return the cached classpath or, if not cached, build a classpath using the inner strategy.
+   *
+   * <p>
+   * Return the cached classpath or, if not cached, build a classpath using the inner strategy.
+   * Note that this getter will not check to see if mode, imports, or sketch have changed. If a
+   * cached value is available, it will be returned without examining the identity of the
+   * parameters.
+   * </p>
+   *
+   * @param mode The {JavaMode} for which the classpath should be built.
+   * @param imports The sketch (user) imports.
+   * @param sketch The sketch for which a classpath is to be returned.
+   * @return Newly generated classpath.
+   */
+  @Override
+  public List<String> buildClasspath(JavaMode mode, List<ImportStatement> imports, Sketch sketch) {
+    return cachedResult.updateAndGet((cachedValue) ->
+      cachedValue == null ? innerStrategy.buildClasspath(mode, imports, sketch) : cachedValue
+    );
+  }
+
+}
diff --git a/java/src/processing/mode/java/pdex/util/runtime/strategy/CodeFolderRuntimePathFactory.java b/java/src/processing/mode/java/pdex/util/runtime/strategy/CodeFolderRuntimePathFactory.java
new file mode 100644
index 0000000000..6c2a31856d
--- /dev/null
+++ b/java/src/processing/mode/java/pdex/util/runtime/strategy/CodeFolderRuntimePathFactory.java
@@ -0,0 +1,52 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 2012-19 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime.strategy;
+
+import processing.app.Sketch;
+import processing.app.Util;
+import processing.mode.java.JavaMode;
+import processing.mode.java.pdex.ImportStatement;
+import processing.mode.java.pdex.util.runtime.RuntimePathUtil;
+
+import java.io.File;
+import java.util.List;
+
+
+/**
+ * Path factory which includes resources like jars within the sketch code folder.
+ */
+public class CodeFolderRuntimePathFactory implements RuntimePathFactoryStrategy {
+
+  @Override
+  public List<String> buildClasspath(JavaMode mode, List<ImportStatement> imports, Sketch sketch) {
+    StringBuilder classPath = new StringBuilder();
+
+    // Code folder
+    if (sketch.hasCodeFolder()) {
+      File codeFolder = sketch.getCodeFolder();
+      String codeFolderClassPath = Util.contentsToClassPath(codeFolder);
+      classPath.append(codeFolderClassPath);
+    }
+
+    return RuntimePathUtil.sanitizeClassPath(classPath.toString());
+  }
+
+}
diff --git a/java/src/processing/mode/java/pdex/util/runtime/strategy/CoreLibraryRuntimePathFactory.java b/java/src/processing/mode/java/pdex/util/runtime/strategy/CoreLibraryRuntimePathFactory.java
new file mode 100644
index 0000000000..cf2d9c1f0f
--- /dev/null
+++ b/java/src/processing/mode/java/pdex/util/runtime/strategy/CoreLibraryRuntimePathFactory.java
@@ -0,0 +1,49 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 2012-19 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime.strategy;
+
+import processing.app.Library;
+import processing.app.Sketch;
+import processing.mode.java.JavaMode;
+import processing.mode.java.pdex.ImportStatement;
+import processing.mode.java.pdex.util.runtime.RuntimePathUtil;
+
+import java.io.File;
+import java.util.List;
+
+
+/**
+ * Runtime path factory for libraries part of the processing mode (like {JavaMode}).
+ */
+public class CoreLibraryRuntimePathFactory implements RuntimePathFactoryStrategy {
+
+  @Override
+  public List<String> buildClasspath(JavaMode mode, List<ImportStatement> imports, Sketch sketch) {
+    StringBuilder classPath = new StringBuilder();
+
+    for (Library lib : mode.coreLibraries) {
+      classPath.append(File.pathSeparator).append(lib.getClassPath());
+    }
+
+    return RuntimePathUtil.sanitizeClassPath(classPath.toString());
+  }
+
+}
diff --git a/java/src/processing/mode/java/pdex/util/runtime/strategy/JavaFxRuntimePathFactory.java b/java/src/processing/mode/java/pdex/util/runtime/strategy/JavaFxRuntimePathFactory.java
new file mode 100644
index 0000000000..343394b199
--- /dev/null
+++ b/java/src/processing/mode/java/pdex/util/runtime/strategy/JavaFxRuntimePathFactory.java
@@ -0,0 +1,64 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 2012-19 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime.strategy;
+
+import processing.app.Sketch;
+import processing.mode.java.JavaMode;
+import processing.mode.java.pdex.ImportStatement;
+import processing.mode.java.pdex.util.runtime.RuntimeConst;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+import java.util.StringJoiner;
+import java.util.stream.Collectors;
+
+
+/**
+ * Runtime path factory which generates classpath entries for JavaFX / OpenFX.
+ */
+public class JavaFxRuntimePathFactory implements RuntimePathFactoryStrategy {
+
+  @Override
+  public List<String> buildClasspath(JavaMode mode, List<ImportStatement> imports, Sketch sketch) {
+    return Arrays.stream(RuntimeConst.JAVA_FX_JARS)
+        .map(this::buildEntry)
+        .collect(Collectors.toList());
+  }
+
+  /**
+   * Build a single classpath entry for OpenJFX.
+   *
+   * @param jarName The jar name like "javafx.base.jar" for which a fully qualified entry should be
+   *    created.
+   * @return The fully qualified classpath entry like ".../Processing.app/Contents/PlugIns/
+   *    adoptopenjdk-11.0.1.jdk/Contents/Home/lib/javafx.base.jar"
+   */
+  private String buildEntry(String jarName) {
+    StringJoiner joiner = new StringJoiner(File.separator);
+    joiner.add(System.getProperty("java.home"));
+    joiner.add("lib");
+    joiner.add(jarName);
+
+    return joiner.toString();
+  }
+
+}
diff --git a/java/src/processing/mode/java/pdex/util/runtime/strategy/JavaRuntimePathFactory.java b/java/src/processing/mode/java/pdex/util/runtime/strategy/JavaRuntimePathFactory.java
new file mode 100644
index 0000000000..535275800a
--- /dev/null
+++ b/java/src/processing/mode/java/pdex/util/runtime/strategy/JavaRuntimePathFactory.java
@@ -0,0 +1,62 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 2012-19 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime.strategy;
+
+import processing.app.Sketch;
+import processing.mode.java.JavaMode;
+import processing.mode.java.pdex.ImportStatement;
+import processing.mode.java.pdex.util.runtime.RuntimeConst;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+import java.util.StringJoiner;
+import java.util.stream.Collectors;
+
+
+/**
+ * Runtime path factory which enumerates the modules as part of the java runtime.
+ */
+public class JavaRuntimePathFactory implements RuntimePathFactoryStrategy {
+
+  @Override
+  public List<String> buildClasspath(JavaMode mode, List<ImportStatement> imports, Sketch sketch) {
+    return Arrays.stream(RuntimeConst.STANDARD_MODULES)
+        .map(this::buildForModule)
+        .collect(Collectors.toList());
+  }
+
+  /**
+   * Build a classpath entry for a module.
+   *
+   * @param moduleName The name of the module like "java.base.jmod".
+   * @return The fully qualified classpath entry like ".../Processing.app/Contents/PlugIns/
+   *    *    adoptopenjdk-11.0.1.jdk/Contents/Home/jmods/java.base.jmod"
+   */
+  private String buildForModule(String moduleName) {
+    StringJoiner jmodPathJoiner = new StringJoiner(File.separator);
+    jmodPathJoiner.add(System.getProperty("java.home"));
+    jmodPathJoiner.add("jmods");
+    jmodPathJoiner.add(moduleName);
+    return jmodPathJoiner.toString();
+  }
+
+}
diff --git a/java/src/processing/mode/java/pdex/util/runtime/strategy/LibrarySearchRuntimePathFactory.java b/java/src/processing/mode/java/pdex/util/runtime/strategy/LibrarySearchRuntimePathFactory.java
new file mode 100644
index 0000000000..6ce1a01d38
--- /dev/null
+++ b/java/src/processing/mode/java/pdex/util/runtime/strategy/LibrarySearchRuntimePathFactory.java
@@ -0,0 +1,55 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 2012-19 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime.strategy;
+
+import processing.app.Library;
+import processing.app.Sketch;
+import processing.mode.java.JavaMode;
+import processing.mode.java.pdex.ImportStatement;
+import processing.mode.java.pdex.util.runtime.RuntimePathUtil;
+
+import java.io.File;
+import java.util.List;
+import java.util.StringJoiner;
+
+
+/**
+ * Runtime path factory to generate search classpath entries for third party libraries.
+ *
+ * <p>
+ * Runtime path factory to generate classpath entries for third party libraries that are used when
+ * generating import recommendations.
+ * </p>
+ */
+public class LibrarySearchRuntimePathFactory implements RuntimePathFactoryStrategy {
+
+  @Override
+  public List<String> buildClasspath(JavaMode mode, List<ImportStatement> imports, Sketch sketch) {
+    StringJoiner classPathBuilder = new StringJoiner(File.pathSeparator);
+
+    for (Library lib : mode.contribLibraries) {
+      classPathBuilder.add(lib.getClassPath());
+    }
+
+    return RuntimePathUtil.sanitizeClassPath(classPathBuilder.toString());
+  }
+
+}
diff --git a/java/src/processing/mode/java/pdex/util/runtime/strategy/LibrarySketchRuntimePathFactory.java b/java/src/processing/mode/java/pdex/util/runtime/strategy/LibrarySketchRuntimePathFactory.java
new file mode 100644
index 0000000000..240dc59668
--- /dev/null
+++ b/java/src/processing/mode/java/pdex/util/runtime/strategy/LibrarySketchRuntimePathFactory.java
@@ -0,0 +1,76 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 2012-19 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime.strategy;
+
+import processing.app.Library;
+import processing.app.Sketch;
+import processing.app.SketchException;
+import processing.mode.java.JavaMode;
+import processing.mode.java.pdex.ImportStatement;
+import processing.mode.java.pdex.util.runtime.RuntimePathUtil;
+
+import java.io.File;
+import java.util.List;
+import java.util.StringJoiner;
+
+
+/**
+ * Runtime path factory to generate sketch classpath entries for third party libraries.
+ *
+ * <p>
+ * Runtime path factory to generate classpath entries for third party libraries that are required
+ * for running the sketch.
+ * </p>
+ */
+public class LibrarySketchRuntimePathFactory implements RuntimePathFactoryStrategy {
+
+  @Override
+  public List<String> buildClasspath(JavaMode mode, List<ImportStatement> imports, Sketch sketch) {
+    StringJoiner classPathBuilder = new StringJoiner(File.pathSeparator);
+
+    imports.stream()
+        .map(ImportStatement::getPackageName)
+        .filter(pckg -> !isIgnorable(pckg))
+        .map(pckg -> {
+          try {
+            return mode.getLibrary(pckg);
+          } catch (SketchException e) {
+            return null;
+          }
+        })
+        .filter(lib -> lib != null)
+        .map(Library::getClassPath)
+        .forEach(cp -> classPathBuilder.add(cp));
+
+    return RuntimePathUtil.sanitizeClassPath(classPathBuilder.toString());
+  }
+
+  /**
+   * Determine if a package is ignorable.
+   *
+   * @param packageName The name of the package to evaluate.
+   * @return True if the package is part of standard Java (like java.lang.*). False otherwise.
+   */
+  private boolean isIgnorable(String packageName) {
+    return (packageName.startsWith("java.") || packageName.startsWith("javax."));
+  }
+
+}
diff --git a/java/src/processing/mode/java/pdex/util/runtime/strategy/ModeSearchRuntimePathFactory.java b/java/src/processing/mode/java/pdex/util/runtime/strategy/ModeSearchRuntimePathFactory.java
new file mode 100644
index 0000000000..e368c09aba
--- /dev/null
+++ b/java/src/processing/mode/java/pdex/util/runtime/strategy/ModeSearchRuntimePathFactory.java
@@ -0,0 +1,53 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 2012-19 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime.strategy;
+
+import processing.app.Sketch;
+import processing.mode.java.JavaMode;
+import processing.mode.java.pdex.ImportStatement;
+import processing.mode.java.pdex.util.runtime.RuntimePathUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * Runtime path factory to generate search classpath entries for the processing mode.
+ *
+ * <p>
+ * Runtime path factory to generate classpath entries for the processing mode (like {JavaMode}) used
+ * when generating import recommendations.
+ * </p>
+ */
+public class ModeSearchRuntimePathFactory implements RuntimePathFactoryStrategy {
+
+  @Override
+  public List<String> buildClasspath(JavaMode mode, List<ImportStatement> imports, Sketch sketch) {
+    String searchClassPath = mode.getSearchPath();
+
+    if (searchClassPath != null) {
+      return RuntimePathUtil.sanitizeClassPath(searchClassPath);
+    } else {
+      return new ArrayList<>();
+    }
+  }
+
+}
diff --git a/java/src/processing/mode/java/pdex/util/runtime/strategy/ModeSketchRuntimePathFactory.java b/java/src/processing/mode/java/pdex/util/runtime/strategy/ModeSketchRuntimePathFactory.java
new file mode 100644
index 0000000000..0751139f41
--- /dev/null
+++ b/java/src/processing/mode/java/pdex/util/runtime/strategy/ModeSketchRuntimePathFactory.java
@@ -0,0 +1,50 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 2012-19 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime.strategy;
+
+import processing.app.Library;
+import processing.app.Sketch;
+import processing.mode.java.JavaMode;
+import processing.mode.java.pdex.ImportStatement;
+import processing.mode.java.pdex.util.runtime.RuntimePathUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * Runtime path factory for classpath entries required by the processing mode like {JavaMode}.
+ */
+public class ModeSketchRuntimePathFactory implements RuntimePathFactoryStrategy {
+
+  @Override
+  public List<String> buildClasspath(JavaMode mode, List<ImportStatement> imports, Sketch sketch) {
+    Library coreLibrary = mode.getCoreLibrary();
+    String coreClassPath = coreLibrary != null ?
+        coreLibrary.getClassPath() : mode.getSearchPath();
+    if (coreClassPath != null) {
+      return RuntimePathUtil.sanitizeClassPath(coreClassPath);
+    } else {
+      return new ArrayList<>();
+    }
+  }
+
+}
diff --git a/java/src/processing/mode/java/pdex/util/runtime/strategy/RuntimePathFactoryStrategy.java b/java/src/processing/mode/java/pdex/util/runtime/strategy/RuntimePathFactoryStrategy.java
new file mode 100644
index 0000000000..bb053c79db
--- /dev/null
+++ b/java/src/processing/mode/java/pdex/util/runtime/strategy/RuntimePathFactoryStrategy.java
@@ -0,0 +1,51 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 2019 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime.strategy;
+
+import processing.app.Sketch;
+import processing.mode.java.JavaMode;
+import processing.mode.java.pdex.ImportStatement;
+
+import java.util.List;
+
+
+/**
+ * Strategy which generates part of the classpath and/or module path.
+ *
+ * <p>
+ * Strategy for factories each of which generate part of the classpath and/or module path required
+ * by a sketch through user supplied requirements, mode (as in JavaMode) requirements, or transitive
+ * requirements imposed by third party libraries.
+ * </p>
+ */
+public interface RuntimePathFactoryStrategy {
+
+  /**
+   * Create classpath and/or module path entries.
+   *
+   * @param mode The mode engaged by the user like JavaMode.
+   * @param programImports The program imports imposed by the user within their sketch.
+   * @param sketch The sketch provided by the user.
+   * @return List of classpath and/or module path entries.
+   */
+  List<String> buildClasspath(JavaMode mode, List<ImportStatement> programImports, Sketch sketch);
+
+}
diff --git a/java/src/processing/mode/java/pdex/util/runtime/strategy/RuntimePathFactoryStrategyCollection.java b/java/src/processing/mode/java/pdex/util/runtime/strategy/RuntimePathFactoryStrategyCollection.java
new file mode 100644
index 0000000000..28cd4870d1
--- /dev/null
+++ b/java/src/processing/mode/java/pdex/util/runtime/strategy/RuntimePathFactoryStrategyCollection.java
@@ -0,0 +1,54 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 20119 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime.strategy;
+
+import processing.app.Sketch;
+import processing.mode.java.JavaMode;
+import processing.mode.java.pdex.ImportStatement;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+/**
+ * Strategy which concatenates paths generated from a collection of RuntimePathFactoryStrategies.
+ */
+public class RuntimePathFactoryStrategyCollection implements RuntimePathFactoryStrategy {
+
+  private final List<RuntimePathFactoryStrategy> strategies;
+
+  /**
+   * Create a new path concatenation operation.
+   *
+   * @param newStrategies
+   */
+  public RuntimePathFactoryStrategyCollection(List<RuntimePathFactoryStrategy> newStrategies) {
+    strategies = newStrategies;
+  }
+
+  @Override
+  public List<String> buildClasspath(JavaMode mode, List<ImportStatement> imports, Sketch sketch) {
+    return strategies.stream()
+        .flatMap((strategy) -> strategy.buildClasspath(mode, imports, sketch).stream())
+        .collect(Collectors.toList());
+  }
+
+}
diff --git a/java/src/processing/mode/java/runner/Runner.java b/java/src/processing/mode/java/runner/Runner.java
index 5d2bbe9fef..b19d6c0309 100644
--- a/java/src/processing/mode/java/runner/Runner.java
+++ b/java/src/processing/mode/java/runner/Runner.java
@@ -330,7 +330,8 @@ protected StringList getMachineParams() {
     params.append("-Djna.nosys=true");
 
     // Added for 3.2.1, was still using the default ext.dirs in the PDE
-    try {
+    // java.ext.dirs no longer supported in Java 11
+    /*try {
       String extPath =
         new File(Platform.getJavaHome(), "lib/ext").getCanonicalPath();
       // quoting this on OS X causes it to fail
@@ -338,7 +339,7 @@ protected StringList getMachineParams() {
       params.append("-Djava.ext.dirs=" + extPath);
     } catch (IOException e) {
       e.printStackTrace();
-    }
+    }*/
 
     if (Platform.isMacOS()) {
       // This successfully sets the application menu name,
@@ -347,13 +348,22 @@ protected StringList getMachineParams() {
       // No longer needed / doesn't seem to do anything differently
       //params.append("-Dcom.apple.mrj.application.apple.menu.about.name=" +
       //              build.getSketchClassName());
+    } else if (Platform.isWindows()) {
+      // No scaling of swing (see #5753) on zoomed displays until some issues regarding JEP 263
+      // with rendering artifacts are sorted out.
+      params.append("-Dsun.java2d.uiScale=1");
     }
+
     // sketch.libraryPath might be ""
     // librariesClassPath will always have sep char prepended
-    params.append("-Djava.library.path=" +
-                  build.getJavaLibraryPath() +
+    String javaLibraryPath = build.getJavaLibraryPath();
+
+    String javaLibraryPathParam = "-Djava.library.path=" +
+                  javaLibraryPath +
                   File.pathSeparator +
-                  System.getProperty("java.library.path"));
+                  System.getProperty("java.library.path");
+
+    params.append(javaLibraryPathParam);
 
     params.append("-cp");
     params.append(build.getClassPath());
diff --git a/java/test/processing/mode/java/pdex/util/runtime/RuntimePathBuilderTest.java b/java/test/processing/mode/java/pdex/util/runtime/RuntimePathBuilderTest.java
new file mode 100644
index 0000000000..f29756e2c1
--- /dev/null
+++ b/java/test/processing/mode/java/pdex/util/runtime/RuntimePathBuilderTest.java
@@ -0,0 +1,127 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 2019 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime;
+
+import org.junit.Before;
+import org.junit.Test;
+import processing.app.Sketch;
+import processing.mode.java.JavaMode;
+import processing.mode.java.pdex.ImportStatement;
+import processing.mode.java.pdex.PreprocessedSketch;
+import processing.mode.java.pdex.util.runtime.strategy.RuntimePathFactoryTestUtil;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+
+public class RuntimePathBuilderTest {
+
+  private RuntimePathBuilder builder;
+  private JavaMode testMode;
+  private List<ImportStatement> testImports;
+  private Sketch testSketch;
+  private PreprocessedSketch.Builder result;
+
+  @Before
+  public void setUp() throws Exception {
+    builder = new RuntimePathBuilder();
+    testMode = RuntimePathFactoryTestUtil.createTestJavaMode();
+    testImports = RuntimePathFactoryTestUtil.createTestImports();
+    testSketch = RuntimePathFactoryTestUtil.createTestSketch();
+
+    result = new PreprocessedSketch.Builder();
+    result.programImports.addAll(testImports);
+    result.sketch = testSketch;
+
+    builder.prepareClassPath(result, testMode);
+  }
+
+  @Test
+  public void testClassPathLoader() {
+    assertNotNull(result.classLoader);
+  }
+
+  @Test
+  public void testClassPathObj() {
+    assertNotNull(result.classPath);
+  }
+
+  @Test
+  public void testSketchClassPathStrategiesJava() {
+    checkPresent(result.classPathArray, "java.base.jmod");
+  }
+
+  @Test
+  public void testSketchClassPathStrategiesLibrary() {
+    checkPresent(result.classPathArray, "library3");
+  }
+
+  @Test
+  public void testSketchClassPathStrategiesCore() {
+    checkPresent(result.classPathArray, "library3");
+  }
+
+  @Test
+  public void testSketchClassPathStrategiesMode() {
+    checkPresent(result.classPathArray, "library6");
+  }
+
+  @Test
+  public void testSketchClassPathStrategiesCodeFolder() {
+    checkPresent(result.classPathArray, "file1.jar");
+  }
+
+  @Test
+  public void testSearchClassPathStrategiesCodeJava() {
+    checkPresent(result.searchClassPathArray, "java.base.jmod");
+  }
+
+  @Test
+  public void testSearchClassPathStrategiesCodeMode() {
+    checkPresent(result.classPathArray, "library6");
+  }
+
+  @Test
+  public void testSearchClassPathStrategiesCodeLibrary() {
+    checkPresent(result.classPathArray, "library3");
+  }
+
+  @Test
+  public void testSearchClassPathStrategiesCodeCore() {
+    checkPresent(result.classPathArray, "library1");
+  }
+
+  @Test
+  public void testSearchClassPathStrategiesCodeCodeFolder() {
+    checkPresent(result.classPathArray, "file3.zip");
+  }
+
+  private void checkPresent(String[] classPathArray, String target) {
+    long count = Arrays.stream(classPathArray)
+        .filter((x) -> x.contains(target))
+        .count();
+
+    assertTrue(count > 0);
+  }
+
+}
\ No newline at end of file
diff --git a/java/test/processing/mode/java/pdex/util/runtime/RuntimePathUtilTest.java b/java/test/processing/mode/java/pdex/util/runtime/RuntimePathUtilTest.java
new file mode 100644
index 0000000000..6b9cd4c877
--- /dev/null
+++ b/java/test/processing/mode/java/pdex/util/runtime/RuntimePathUtilTest.java
@@ -0,0 +1,61 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 2019 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime;
+
+import org.junit.Test;
+
+import java.io.File;
+import java.util.List;
+import java.util.StringJoiner;
+
+import static org.junit.Assert.*;
+
+
+public class RuntimePathUtilTest {
+
+  @Test
+  public void sanitizeClassPath() {
+    StringJoiner testStrJoiner = new StringJoiner(File.pathSeparator);
+    testStrJoiner.add("test1");
+    testStrJoiner.add("");
+    testStrJoiner.add("test2");
+
+    List<String> classPath = RuntimePathUtil.sanitizeClassPath(testStrJoiner.toString());
+    assertEquals(2, classPath.size());
+    assertEquals("test1", classPath.get(0));
+    assertEquals("test2", classPath.get(1));
+  }
+
+  @Test
+  public void sanitizeClassPathNoDuplicate() {
+    StringJoiner testStrJoiner = new StringJoiner(File.pathSeparator);
+    testStrJoiner.add("test1");
+    testStrJoiner.add("");
+    testStrJoiner.add("test2");
+    testStrJoiner.add("test2");
+
+    List<String> classPath = RuntimePathUtil.sanitizeClassPath(testStrJoiner.toString());
+    assertEquals(2, classPath.size());
+    assertEquals("test1", classPath.get(0));
+    assertEquals("test2", classPath.get(1));
+  }
+
+}
\ No newline at end of file
diff --git a/java/test/processing/mode/java/pdex/util/runtime/strategy/CachedRuntimePathFactoryTest.java b/java/test/processing/mode/java/pdex/util/runtime/strategy/CachedRuntimePathFactoryTest.java
new file mode 100644
index 0000000000..15eb763d69
--- /dev/null
+++ b/java/test/processing/mode/java/pdex/util/runtime/strategy/CachedRuntimePathFactoryTest.java
@@ -0,0 +1,100 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 2019 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime.strategy;
+
+import org.junit.Before;
+import org.junit.Test;
+import processing.app.Sketch;
+import processing.mode.java.JavaMode;
+import processing.mode.java.pdex.ImportStatement;
+import processing.mode.java.pdex.util.runtime.RuntimePathUtilTest;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+
+public class CachedRuntimePathFactoryTest {
+
+  private CachedRuntimePathFactory cachedRuntimePathFactory;
+  private JavaMode testMode;
+  private List<ImportStatement> testImports;
+  private Sketch testSketch;
+
+  @Before
+  public void setUp() throws Exception {
+    cachedRuntimePathFactory = new CachedRuntimePathFactory(new RuntimePathFactoryStrategy() {
+
+      private int calls = 0;
+
+      @Override
+      public List<String> buildClasspath(JavaMode mode, List<ImportStatement> imports,
+            Sketch sketch) {
+
+        String retVal = String.format("Test%d", calls);
+        calls++;
+
+        List<String> retList = new ArrayList<>();
+        retList.add(retVal);
+        return retList;
+      }
+    });
+
+    testMode = RuntimePathFactoryTestUtil.createTestJavaMode();
+    testImports = RuntimePathFactoryTestUtil.createTestImports();
+    testSketch = RuntimePathFactoryTestUtil.createTestSketch();
+  }
+
+  @Test
+  public void buildClasspath() {
+    List<String> classpath = cachedRuntimePathFactory.buildClasspath(
+        testMode,
+        testImports,
+        testSketch
+    );
+
+    assertEquals(1, classpath.size());
+    assertEquals("Test0", classpath.get(0));
+  }
+
+  @Test
+  public void invalidateCache() {
+    cachedRuntimePathFactory.buildClasspath(
+        testMode,
+        testImports,
+        testSketch
+    );
+
+    cachedRuntimePathFactory.invalidateCache();
+
+    List<String> classpath = cachedRuntimePathFactory.buildClasspath(
+        testMode,
+        testImports,
+        testSketch
+    );
+
+    assertEquals(1, classpath.size());
+    assertEquals("Test1", classpath.get(0));
+  }
+
+}
\ No newline at end of file
diff --git a/java/test/processing/mode/java/pdex/util/runtime/strategy/CodeFolderRuntimePathFactoryTest.java b/java/test/processing/mode/java/pdex/util/runtime/strategy/CodeFolderRuntimePathFactoryTest.java
new file mode 100644
index 0000000000..afe2cddb69
--- /dev/null
+++ b/java/test/processing/mode/java/pdex/util/runtime/strategy/CodeFolderRuntimePathFactoryTest.java
@@ -0,0 +1,65 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 2019 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime.strategy;
+
+import org.junit.Before;
+import org.junit.Test;
+import processing.app.Sketch;
+import processing.mode.java.JavaMode;
+import processing.mode.java.pdex.ImportStatement;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+public class CodeFolderRuntimePathFactoryTest {
+
+  private CodeFolderRuntimePathFactory factory;
+  private JavaMode testMode;
+  private List<ImportStatement> testImports;
+  private Sketch testSketch;
+
+  private List<String> classpath;
+
+  @Before
+  public void setUp() throws Exception {
+    factory = new CodeFolderRuntimePathFactory();
+    testMode = RuntimePathFactoryTestUtil.createTestJavaMode();
+    testImports = RuntimePathFactoryTestUtil.createTestImports();
+    testSketch = RuntimePathFactoryTestUtil.createTestSketch();
+
+    classpath = factory.buildClasspath(testMode, testImports, testSketch);
+  }
+
+  @Test
+  public void testBuildClasspathSize() {
+    assertEquals(2, classpath.size());
+  }
+
+  @Test
+  public void testBuildClasspathValues() {
+    assertEquals("testdir" + File.separator + "file1.jar", classpath.get(0));
+    assertEquals("testdir" + File.separator + "file3.zip", classpath.get(1));
+  }
+
+}
\ No newline at end of file
diff --git a/java/test/processing/mode/java/pdex/util/runtime/strategy/CoreLibraryRuntimePathFactoryTest.java b/java/test/processing/mode/java/pdex/util/runtime/strategy/CoreLibraryRuntimePathFactoryTest.java
new file mode 100644
index 0000000000..e038c18eba
--- /dev/null
+++ b/java/test/processing/mode/java/pdex/util/runtime/strategy/CoreLibraryRuntimePathFactoryTest.java
@@ -0,0 +1,64 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 2019 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime.strategy;
+
+import org.junit.Before;
+import org.junit.Test;
+import processing.app.Sketch;
+import processing.mode.java.JavaMode;
+import processing.mode.java.pdex.ImportStatement;
+
+import java.io.IOException;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+public class CoreLibraryRuntimePathFactoryTest {
+
+  private CoreLibraryRuntimePathFactory factory;
+  private JavaMode testMode;
+  private List<ImportStatement> testImports;
+  private Sketch testSketch;
+  private List<String> classPath;
+
+  @Before
+  public void setUp() throws Exception {
+    factory = new CoreLibraryRuntimePathFactory();
+    testMode = RuntimePathFactoryTestUtil.createTestJavaMode();
+    testImports = RuntimePathFactoryTestUtil.createTestImports();
+    testSketch = RuntimePathFactoryTestUtil.createTestSketch();
+
+    classPath = factory.buildClasspath(testMode, testImports, testSketch);
+  }
+
+  @Test
+  public void testBuildClasspathSize() {
+    assertEquals(2, classPath.size());
+  }
+
+  @Test
+  public void testBuildClasspathValue() {
+    assertEquals("library1", classPath.get(0));
+    assertEquals("library2", classPath.get(1));
+  }
+
+
+}
\ No newline at end of file
diff --git a/java/test/processing/mode/java/pdex/util/runtime/strategy/JavaFxRuntimePathFactoryTest.java b/java/test/processing/mode/java/pdex/util/runtime/strategy/JavaFxRuntimePathFactoryTest.java
new file mode 100644
index 0000000000..3b478e218d
--- /dev/null
+++ b/java/test/processing/mode/java/pdex/util/runtime/strategy/JavaFxRuntimePathFactoryTest.java
@@ -0,0 +1,69 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 2019 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime.strategy;
+
+import org.junit.Before;
+import org.junit.Test;
+import processing.app.Sketch;
+import processing.mode.java.JavaMode;
+import processing.mode.java.pdex.ImportStatement;
+import processing.mode.java.pdex.util.runtime.RuntimeConst;
+
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+
+public class JavaFxRuntimePathFactoryTest {
+
+  private JavaFxRuntimePathFactory factory;
+  private JavaMode testMode;
+  private List<ImportStatement> testImports;
+  private Sketch testSketch;
+  private List<String> classpath;
+
+  @Before
+  public void setUp() throws Exception {
+    factory = new JavaFxRuntimePathFactory();
+    testMode = RuntimePathFactoryTestUtil.createTestJavaMode();
+    testImports = RuntimePathFactoryTestUtil.createTestImports();
+    testSketch = RuntimePathFactoryTestUtil.createTestSketch();
+
+    classpath = factory.buildClasspath(testMode, testImports, testSketch);
+  }
+
+  @Test
+  public void testBuildClasspathSize() {
+    assertEquals(RuntimeConst.JAVA_FX_JARS.length, classpath.size());
+  }
+
+  @Test
+  public void testBuildClasspathValues() {
+    boolean foundTarget = false;
+    for (String entry : classpath) {
+      boolean justFound = entry.contains("javafx.base.jar") && entry.contains("lib");
+      foundTarget = foundTarget || justFound;
+    }
+
+    assertTrue(foundTarget);
+  }
+
+}
\ No newline at end of file
diff --git a/java/test/processing/mode/java/pdex/util/runtime/strategy/JavaRuntimePathFactoryTest.java b/java/test/processing/mode/java/pdex/util/runtime/strategy/JavaRuntimePathFactoryTest.java
new file mode 100644
index 0000000000..695209cfbc
--- /dev/null
+++ b/java/test/processing/mode/java/pdex/util/runtime/strategy/JavaRuntimePathFactoryTest.java
@@ -0,0 +1,71 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 2019 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime.strategy;
+
+import org.junit.Before;
+import org.junit.Test;
+import processing.app.Sketch;
+import processing.mode.java.JavaMode;
+import processing.mode.java.pdex.ImportStatement;
+import processing.mode.java.pdex.util.runtime.RuntimeConst;
+
+import java.io.IOException;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+
+public class JavaRuntimePathFactoryTest {
+
+  private JavaRuntimePathFactory factory;
+  private JavaMode testMode;
+  private List<ImportStatement> testImports;
+  private Sketch testSketch;
+
+  private List<String> classpath;
+
+  @Before
+  public void setUp() throws Exception {
+    factory = new JavaRuntimePathFactory();
+    testMode = RuntimePathFactoryTestUtil.createTestJavaMode();
+    testImports = RuntimePathFactoryTestUtil.createTestImports();
+    testSketch = RuntimePathFactoryTestUtil.createTestSketch();
+
+    classpath = factory.buildClasspath(testMode, testImports, testSketch);
+  }
+
+  @Test
+  public void testBuildClasspathSize() {
+    assertEquals(RuntimeConst.STANDARD_MODULES.length, classpath.size());
+  }
+
+  @Test
+  public void testBuildClasspathValues() {
+    boolean foundTarget = false;
+    for (String entry : classpath) {
+      boolean justFound = entry.contains("java.base.jmod") && entry.contains("jmods");
+      foundTarget = foundTarget || justFound;
+    }
+
+    assertTrue(foundTarget);
+  }
+
+}
\ No newline at end of file
diff --git a/java/test/processing/mode/java/pdex/util/runtime/strategy/LibrarySearchRuntimePathFactoryTest.java b/java/test/processing/mode/java/pdex/util/runtime/strategy/LibrarySearchRuntimePathFactoryTest.java
new file mode 100644
index 0000000000..e36b3a3178
--- /dev/null
+++ b/java/test/processing/mode/java/pdex/util/runtime/strategy/LibrarySearchRuntimePathFactoryTest.java
@@ -0,0 +1,65 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 2019 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime.strategy;
+
+import org.junit.Before;
+import org.junit.Test;
+import processing.app.Sketch;
+import processing.mode.java.JavaMode;
+import processing.mode.java.pdex.ImportStatement;
+
+import java.io.IOException;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+public class LibrarySearchRuntimePathFactoryTest {
+
+  private LibrarySearchRuntimePathFactory factory;
+  private JavaMode testMode;
+  private List<ImportStatement> testImports;
+  private Sketch testSketch;
+
+  private List<String> classpath;
+
+  @Before
+  public void setUp() throws Exception {
+    factory = new LibrarySearchRuntimePathFactory();
+    testMode = RuntimePathFactoryTestUtil.createTestJavaMode();
+    testImports = RuntimePathFactoryTestUtil.createTestImports();
+    testSketch = RuntimePathFactoryTestUtil.createTestSketch();
+
+    classpath = factory.buildClasspath(testMode, testImports, testSketch);
+  }
+
+  @Test
+  public void testBuildClasspathSize() {
+    assertEquals(3, classpath.size());
+  }
+
+  @Test
+  public void testBuildClasspathValues() {
+    assertTrue(classpath.get(0).contains("library3"));
+    assertTrue(classpath.get(1).contains("java.library4"));
+    assertTrue(classpath.get(2).contains("library5"));
+  }
+
+}
\ No newline at end of file
diff --git a/java/test/processing/mode/java/pdex/util/runtime/strategy/LibrarySketchRuntimePathFactoryTest.java b/java/test/processing/mode/java/pdex/util/runtime/strategy/LibrarySketchRuntimePathFactoryTest.java
new file mode 100644
index 0000000000..9f756fa445
--- /dev/null
+++ b/java/test/processing/mode/java/pdex/util/runtime/strategy/LibrarySketchRuntimePathFactoryTest.java
@@ -0,0 +1,64 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 2019 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime.strategy;
+
+import org.junit.Before;
+import org.junit.Test;
+import processing.app.Sketch;
+import processing.mode.java.JavaMode;
+import processing.mode.java.pdex.ImportStatement;
+
+import java.io.IOException;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+
+public class LibrarySketchRuntimePathFactoryTest {
+
+  private LibrarySketchRuntimePathFactory factory;
+  private JavaMode testMode;
+  private List<ImportStatement> testImports;
+  private Sketch testSketch;
+  private List<String> classpathEntries;
+
+  @Before
+  public void setUp() throws Exception {
+    factory = new LibrarySketchRuntimePathFactory();
+    testMode = RuntimePathFactoryTestUtil.createTestJavaMode();
+    testImports = RuntimePathFactoryTestUtil.createTestImports();
+    testSketch = RuntimePathFactoryTestUtil.createTestSketch();
+
+    classpathEntries = factory.buildClasspath(testMode, testImports, testSketch);
+  }
+
+  @Test
+  public void testBuildClasspathSize() {
+    assertEquals(2, classpathEntries.size());
+  }
+
+  @Test
+  public void testBuildClasspathValues() {
+    assertTrue(classpathEntries.get(0).contains("library3"));
+    assertTrue(classpathEntries.get(1).contains("library5"));
+  }
+
+}
\ No newline at end of file
diff --git a/java/test/processing/mode/java/pdex/util/runtime/strategy/ModeSearchRuntimePathFactoryTest.java b/java/test/processing/mode/java/pdex/util/runtime/strategy/ModeSearchRuntimePathFactoryTest.java
new file mode 100644
index 0000000000..ff3ad21df3
--- /dev/null
+++ b/java/test/processing/mode/java/pdex/util/runtime/strategy/ModeSearchRuntimePathFactoryTest.java
@@ -0,0 +1,63 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 2019 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime.strategy;
+
+import org.junit.Before;
+import org.junit.Test;
+import processing.app.Sketch;
+import processing.mode.java.JavaMode;
+import processing.mode.java.pdex.ImportStatement;
+
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+public class ModeSearchRuntimePathFactoryTest {
+
+  private ModeSearchRuntimePathFactory factory;
+  private JavaMode testMode;
+  private List<ImportStatement> testImports;
+  private Sketch testSketch;
+  private List<String> classpath;
+
+  @Before
+  public void setUp() throws Exception {
+    factory = new ModeSearchRuntimePathFactory();
+    testMode = RuntimePathFactoryTestUtil.createTestJavaMode();
+    testImports = RuntimePathFactoryTestUtil.createTestImports();
+    testSketch = RuntimePathFactoryTestUtil.createTestSketch();
+
+    classpath = factory.buildClasspath(testMode, testImports, testSketch);
+  }
+
+  @Test
+  public void buildClasspathLength() {
+    assertEquals(3, classpath.size());
+  }
+
+  @Test
+  public void buildClasspathValues() {
+    assertEquals("library6", classpath.get(0));
+    assertEquals("javax.library7", classpath.get(1));
+    assertEquals("library8", classpath.get(2));
+  }
+
+}
\ No newline at end of file
diff --git a/java/test/processing/mode/java/pdex/util/runtime/strategy/ModeSketchRuntimePathFactoryTest.java b/java/test/processing/mode/java/pdex/util/runtime/strategy/ModeSketchRuntimePathFactoryTest.java
new file mode 100644
index 0000000000..e119bd5657
--- /dev/null
+++ b/java/test/processing/mode/java/pdex/util/runtime/strategy/ModeSketchRuntimePathFactoryTest.java
@@ -0,0 +1,63 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 2019 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime.strategy;
+
+import org.junit.Before;
+import org.junit.Test;
+import processing.app.Sketch;
+import processing.mode.java.JavaMode;
+import processing.mode.java.pdex.ImportStatement;
+
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+public class ModeSketchRuntimePathFactoryTest {
+
+  private ModeSketchRuntimePathFactory factory;
+  private JavaMode testMode;
+  private List<ImportStatement> testImports;
+  private Sketch testSketch;
+  private List<String> classpath;
+
+  @Before
+  public void setUp() throws Exception {
+    factory = new ModeSketchRuntimePathFactory();
+    testMode = RuntimePathFactoryTestUtil.createTestJavaMode();
+    testImports = RuntimePathFactoryTestUtil.createTestImports();
+    testSketch = RuntimePathFactoryTestUtil.createTestSketch();
+
+    classpath = factory.buildClasspath(testMode, testImports, testSketch);
+  }
+
+  @Test
+  public void buildClasspathLength() {
+    assertEquals(3, classpath.size());
+  }
+
+  @Test
+  public void buildClasspathValues() {
+    assertEquals("library6", classpath.get(0));
+    assertEquals("javax.library7", classpath.get(1));
+    assertEquals("library8", classpath.get(2));
+  }
+
+}
\ No newline at end of file
diff --git a/java/test/processing/mode/java/pdex/util/runtime/strategy/RuntimePathFactoryStrategyCollectionTest.java b/java/test/processing/mode/java/pdex/util/runtime/strategy/RuntimePathFactoryStrategyCollectionTest.java
new file mode 100644
index 0000000000..30fc309cc5
--- /dev/null
+++ b/java/test/processing/mode/java/pdex/util/runtime/strategy/RuntimePathFactoryStrategyCollectionTest.java
@@ -0,0 +1,76 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 2019 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime.strategy;
+
+import org.junit.Before;
+import org.junit.Test;
+import processing.app.Sketch;
+import processing.mode.java.JavaMode;
+import processing.mode.java.pdex.ImportStatement;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+
+public class RuntimePathFactoryStrategyCollectionTest {
+
+  private RuntimePathFactoryStrategyCollection factory;
+  private JavaMode testMode;
+  private List<ImportStatement> testImports;
+  private Sketch testSketch;
+  private List<String> classpath;
+
+  @Before
+  public void setUp() throws Exception {
+    List<RuntimePathFactoryStrategy> innerFactories = new ArrayList<>();
+    innerFactories.add(createInnerFactory("test1"));
+    innerFactories.add(createInnerFactory("test2"));
+    factory = new RuntimePathFactoryStrategyCollection(innerFactories);
+
+    testMode = RuntimePathFactoryTestUtil.createTestJavaMode();
+    testImports = RuntimePathFactoryTestUtil.createTestImports();
+    testSketch = RuntimePathFactoryTestUtil.createTestSketch();
+
+    classpath = factory.buildClasspath(testMode, testImports, testSketch);
+  }
+
+  private RuntimePathFactoryStrategy createInnerFactory(String retStr) {
+    return (mode, imports, sketch) -> {
+      List<String> retList = new ArrayList<>();
+      retList.add(retStr);
+      return retList;
+    };
+  }
+
+  @Test
+  public void testBuildClasspathLength() {
+    assertEquals(2, classpath.size());
+  }
+
+  @Test
+  public void testBuildClasspathContent() {
+    assertEquals("test1", classpath.get(0));
+    assertEquals("test2", classpath.get(1));
+  }
+
+}
\ No newline at end of file
diff --git a/java/test/processing/mode/java/pdex/util/runtime/strategy/RuntimePathFactoryTestUtil.java b/java/test/processing/mode/java/pdex/util/runtime/strategy/RuntimePathFactoryTestUtil.java
new file mode 100644
index 0000000000..cf0ab57fdc
--- /dev/null
+++ b/java/test/processing/mode/java/pdex/util/runtime/strategy/RuntimePathFactoryTestUtil.java
@@ -0,0 +1,123 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+Part of the Processing project - http://processing.org
+Copyright (c) 2019 The Processing Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+package processing.mode.java.pdex.util.runtime.strategy;
+
+import org.mockito.Mockito;
+import processing.app.Library;
+import processing.app.Sketch;
+import processing.app.SketchException;
+import processing.mode.java.JavaMode;
+import processing.mode.java.pdex.ImportStatement;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringJoiner;
+
+
+public class RuntimePathFactoryTestUtil {
+
+  public static JavaMode createTestJavaMode() throws SketchException {
+    JavaMode mode = Mockito.mock(JavaMode.class);
+
+    List<Library> fakeCoreLibraries = new ArrayList<>();
+    Library testLib1 = createTestLibrary("library1");
+    Library testLib2 = createTestLibrary("library2");
+    fakeCoreLibraries.add(testLib1);
+    fakeCoreLibraries.add(testLib2);
+    mode.coreLibraries = fakeCoreLibraries;
+
+    List<Library> fakeContribLibraries = new ArrayList<>();
+    Library testLib3 = createTestLibrary("library3");
+    Library testLib4 = createTestLibrary("java.library4");
+    Library testLib5 = createTestLibrary("library5");
+    fakeContribLibraries.add(testLib3);
+    fakeContribLibraries.add(testLib4);
+    fakeContribLibraries.add(testLib5);
+    mode.contribLibraries = fakeContribLibraries;
+
+    Library testLib6 = createTestLibrary("library6");
+    Library testLib7 = createTestLibrary("javax.library7");
+    Library testLib8 = createTestLibrary("library8");
+    StringJoiner searchPathBuilder = new StringJoiner(File.pathSeparator);
+    searchPathBuilder.add("library6");
+    searchPathBuilder.add("javax.library7");
+    searchPathBuilder.add("library8");
+    Mockito.when(mode.getSearchPath()).thenReturn(searchPathBuilder.toString());
+
+    Mockito.when(mode.getLibrary("library1")).thenReturn(testLib1);
+    Mockito.when(mode.getLibrary("library2")).thenReturn(testLib2);
+    Mockito.when(mode.getLibrary("library3")).thenReturn(testLib3);
+    Mockito.when(mode.getLibrary("java.library4")).thenReturn(testLib4);
+    Mockito.when(mode.getLibrary("library5")).thenReturn(testLib5);
+    Mockito.when(mode.getLibrary("library6")).thenReturn(testLib6);
+    Mockito.when(mode.getLibrary("javax.library7")).thenReturn(testLib7);
+    Mockito.when(mode.getLibrary("library8")).thenReturn(testLib8);
+
+    return mode;
+  }
+
+  public static List<ImportStatement> createTestImports() {
+    List<ImportStatement> importStatements = new ArrayList<>();
+
+    importStatements.add(createTestImportStatement("library3"));
+    importStatements.add(createTestImportStatement("java.library4"));
+    importStatements.add(createTestImportStatement("library5"));
+
+    return importStatements;
+  }
+
+  public static Sketch createTestSketch() throws IOException {
+    Sketch retSketch = Mockito.mock(Sketch.class);
+
+    File fakeCodeFolder = createFakeCodeFolder();
+
+    Mockito.when(retSketch.hasCodeFolder()).thenReturn(true);
+    Mockito.when(retSketch.getCodeFolder()).thenReturn(fakeCodeFolder);
+
+    return retSketch;
+  }
+
+  private static File createFakeCodeFolder() throws IOException {
+    File fakeCodeFolder = Mockito.mock(File.class);
+
+    Mockito.when(fakeCodeFolder.getCanonicalPath()).thenReturn("testdir");
+    Mockito.when(fakeCodeFolder.list()).thenReturn(
+        new String[]{"file1.jar", "file2.txt", "file3.zip"}
+    );
+
+    return fakeCodeFolder;
+  }
+
+  private static Library createTestLibrary(String libraryClassPath) {
+    Library fakeLibrary = Mockito.mock(Library.class);
+    Mockito.when(fakeLibrary.getClassPath()).thenReturn(libraryClassPath);
+    return fakeLibrary;
+  }
+
+  private static ImportStatement createTestImportStatement(String packageName) {
+    ImportStatement retStatement = Mockito.mock(ImportStatement.class);
+    Mockito.when(retStatement.getPackageName()).thenReturn(packageName);
+    return retStatement;
+  }
+
+}