src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Main.java

*** 24,50 ****
   */
  
  package jdk.tools.jlink.internal;
  
  import java.io.*;
  
  public class Main {
      public static void main(String... args) throws Exception {
          JlinkTask t = new JlinkTask();
          int rc = t.run(args);
          System.exit(rc);
      }
  
- 
      /**
       * Entry point that does <i>not</i> call System.exit.
       *
-      * @param args command line arguments
       * @param out output stream
       * @return an exit code. 0 means success, non-zero means an error occurred.
       */
!     public static int run(String[] args, PrintWriter out) {
          JlinkTask t = new JlinkTask();
!         t.setLog(out);
          return t.run(args);
      }
  }
--- 24,61 ----
   */
  
  package jdk.tools.jlink.internal;
  
  import java.io.*;
+ import java.util.spi.ToolProvider;
  
  public class Main {
      public static void main(String... args) throws Exception {
          JlinkTask t = new JlinkTask();
          int rc = t.run(args);
          System.exit(rc);
      }
  
      /**
       * Entry point that does <i>not</i> call System.exit.
       *
       * @param out output stream
+      * @param err error output stream
+      * @param args command line arguments
       * @return an exit code. 0 means success, non-zero means an error occurred.
       */
!     public static int run(PrintWriter out, PrintWriter err, String... args) {
          JlinkTask t = new JlinkTask();
!         t.setLog(out, err);
          return t.run(args);
      }
+ 
+     public static class JlinkToolProvider implements ToolProvider {
+         public String name() {
+             return "jlink";
+         }
+ 
+         public int run(PrintWriter out, PrintWriter err, String... args) {
+             return Main.run(out, err, args);
+         }
+     }
  }