--- old/test/tools/javadoc/NoStar.java	Fri Jan 22 12:29:19 2016
+++ /dev/null	Fri Jan 22 12:29:19 2016
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2002, 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.
- *
- * 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.
- */
-
-/*
- * @test
- * @bug 4587562
- * @summary tool: Indentation messed up for javadoc comments omitting preceding *
- * @author gafter
- * @modules jdk.javadoc
- * @run main NoStar
- */
-
-import com.sun.javadoc.*;
-import java.util.*;
-
-/** First sentence.
-0
- 1
-  2
-   3
-    4
-     5
-*/
-public class NoStar extends Doclet
-{
-    public static void main(String[] args) {
-        if (com.sun.tools.javadoc.Main.
-            execute("javadoc", "NoStar", NoStar.class.getClassLoader(),
-                    new String[] {System.getProperty("test.src", ".") + java.io.File.separatorChar + "NoStar.java"}) != 0)
-            throw new Error();
-    }
-
-    public static boolean start(com.sun.javadoc.RootDoc root) {
-        ClassDoc[] classes = root.classes();
-        if (classes.length != 1)
-            throw new Error("1 " + Arrays.asList(classes));
-        ClassDoc self = classes[0];
-        String c = self.commentText();
-        System.out.println("\"" + c + "\"");
-        return c.equals("First sentence.\n0\n 1\n  2\n   3\n    4\n     5");
-    }
-}
--- /dev/null	Fri Jan 22 12:29:19 2016
+++ new/test/jdk/javadoc/tool/NoStar.java	Fri Jan 22 12:29:19 2016
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2002, 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.
+ *
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4587562
+ * @summary tool: Indentation messed up for javadoc comments omitting preceding *
+ * @author gafter
+ * @modules jdk.javadoc
+ * @run main NoStar
+ */
+
+import java.util.*;
+
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.TypeElement;
+
+import com.sun.source.doctree.DocCommentTree;
+import com.sun.source.util.DocTrees;
+import jdk.javadoc.doclet.Doclet;
+import jdk.javadoc.doclet.Reporter;
+import jdk.javadoc.doclet.DocletEnvironment;
+
+/** First sentence.
+0
+ 1
+  2
+   3
+    4
+     5
+*/
+public class NoStar implements Doclet
+{
+    public static void main(String[] args) {
+        String[] argarray = {
+            "-docletpath", System.getProperty("test.classes", "."),
+            "-doclet", "NoStar",
+            System.getProperty("test.src", ".") + java.io.File.separatorChar + "NoStar.java"
+        };
+        if (jdk.javadoc.internal.tool.Main.execute(argarray) != 0)
+            throw new Error();
+    }
+
+    public boolean run(DocletEnvironment root) {
+        Set<TypeElement> classes = root.getIncludedClasses();
+        if (classes.size() != 1)
+            throw new Error("1 " + Arrays.asList(classes));
+        TypeElement self = classes.iterator().next();
+        DocTrees trees = root.getDocTrees();
+        DocCommentTree docCommentTree = trees.getDocCommentTree(self);
+        String c = docCommentTree.getFullBody().toString();
+        System.out.println("\"" + c + "\"");
+        return c.equals("First sentence.\n0\n 1\n  2\n   3\n    4\n     5");
+    }
+
+    @Override
+    public String getName() {
+        return "Test";
+    }
+
+    @Override
+    public Set<Option> getSupportedOptions() {
+        return Collections.emptySet();
+    }
+
+    @Override
+    public SourceVersion getSupportedSourceVersion() {
+        return SourceVersion.latest();
+    }
+
+    @Override
+    public void init(Locale locale, Reporter reporter) {
+        return;
+    }
+}