# HG changeset patch
# User sla
# Date 1432896538 -7200
# Node ID c01ac1fc4305ab56b64b5153c7682cbc7b347c38
# Parent  c847a158d3ec025e7a0a448124543173e1addb6a# Parent  613fbce96e323f85056049c9ef31346d1fd67dff
Merge

diff -r c847a158d3ec -r c01ac1fc4305 jdk/test/com/sun/jdi/AllLineLocations.java
--- a/jdk/test/com/sun/jdi/AllLineLocations.java	Thu May 28 15:03:57 2015 -0700
+++ b/jdk/test/com/sun/jdi/AllLineLocations.java	Fri May 29 12:48:58 2015 +0200
@@ -27,7 +27,6 @@
  *  @summary Test ReferenceType.allLineLocations
  *  @author Gordon Hirsch
  *
- *  @library scaffold
  *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g RefTypes.java
diff -r c847a158d3ec -r c01ac1fc4305 jdk/test/com/sun/jdi/ClassesByName.java
--- a/jdk/test/com/sun/jdi/ClassesByName.java	Thu May 28 15:03:57 2015 -0700
+++ b/jdk/test/com/sun/jdi/ClassesByName.java	Fri May 29 12:48:58 2015 +0200
@@ -26,7 +26,6 @@
  *  @bug 4287992
  *  @author Robert Field
  *
- *  @library scaffold
  *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g HelloWorld.java
diff -r c847a158d3ec -r c01ac1fc4305 jdk/test/com/sun/jdi/ExceptionEvents.java
--- a/jdk/test/com/sun/jdi/ExceptionEvents.java	Thu May 28 15:03:57 2015 -0700
+++ b/jdk/test/com/sun/jdi/ExceptionEvents.java	Fri May 29 12:48:58 2015 +0200
@@ -28,7 +28,6 @@
  *
  *  @author Robert Field
  *
- *  @library scaffold
  *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection
  *  @run compile -g ExceptionEvents.java
diff -r c847a158d3ec -r c01ac1fc4305 jdk/test/com/sun/jdi/FilterMatch.java
--- a/jdk/test/com/sun/jdi/FilterMatch.java	Thu May 28 15:03:57 2015 -0700
+++ b/jdk/test/com/sun/jdi/FilterMatch.java	Fri May 29 12:48:58 2015 +0200
@@ -28,7 +28,6 @@
  *
  *  @author Robert Field/Jim Holmlund
  *
- *  @library scaffold
  *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g HelloWorld.java
diff -r c847a158d3ec -r c01ac1fc4305 jdk/test/com/sun/jdi/FilterNoMatch.java
--- a/jdk/test/com/sun/jdi/FilterNoMatch.java	Thu May 28 15:03:57 2015 -0700
+++ b/jdk/test/com/sun/jdi/FilterNoMatch.java	Fri May 29 12:48:58 2015 +0200
@@ -28,7 +28,6 @@
  *
  *  @author Robert Field/Jim Holmlund
  *
- *  @library scaffold
  *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g HelloWorld.java
diff -r c847a158d3ec -r c01ac1fc4305 jdk/test/com/sun/jdi/LaunchCommandLine.java
--- a/jdk/test/com/sun/jdi/LaunchCommandLine.java	Thu May 28 15:03:57 2015 -0700
+++ b/jdk/test/com/sun/jdi/LaunchCommandLine.java	Fri May 29 12:48:58 2015 +0200
@@ -27,7 +27,6 @@
  *  @summary Test launcher command line construction
  *  @author Gordon Hirsch
  *
- *  @library scaffold
  *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g HelloWorld.java
diff -r c847a158d3ec -r c01ac1fc4305 jdk/test/com/sun/jdi/ModificationWatchpoints.java
--- a/jdk/test/com/sun/jdi/ModificationWatchpoints.java	Thu May 28 15:03:57 2015 -0700
+++ b/jdk/test/com/sun/jdi/ModificationWatchpoints.java	Fri May 29 12:48:58 2015 +0200
@@ -29,7 +29,6 @@
  *  @author Daniel Prusa (or someone in the FFJ group)
  *  @author Robert Field (modified to JDIScaffold)
  *
- *  @library scaffold
  *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g ModificationWatchpoints.java
diff -r c847a158d3ec -r c01ac1fc4305 jdk/test/com/sun/jdi/NativeInstanceFilter.java
--- a/jdk/test/com/sun/jdi/NativeInstanceFilter.java	Thu May 28 15:03:57 2015 -0700
+++ b/jdk/test/com/sun/jdi/NativeInstanceFilter.java	Fri May 29 12:48:58 2015 +0200
@@ -28,7 +28,6 @@
  *
  *  @author Keith McGuigan
  *
- *  @library scaffold
  *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @compile -XDignore.symbol.file NativeInstanceFilterTarg.java
diff -r c847a158d3ec -r c01ac1fc4305 jdk/test/com/sun/jdi/UnpreparedByName.java
--- a/jdk/test/com/sun/jdi/UnpreparedByName.java	Thu May 28 15:03:57 2015 -0700
+++ b/jdk/test/com/sun/jdi/UnpreparedByName.java	Fri May 29 12:48:58 2015 +0200
@@ -28,7 +28,6 @@
  *  won't be returned by classesByName.
  *  @author Robert Field
  *
- *  @library scaffold
  *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g InnerTarg.java
diff -r c847a158d3ec -r c01ac1fc4305 jdk/test/com/sun/jdi/UnpreparedClasses.java
--- a/jdk/test/com/sun/jdi/UnpreparedClasses.java	Thu May 28 15:03:57 2015 -0700
+++ b/jdk/test/com/sun/jdi/UnpreparedClasses.java	Fri May 29 12:48:58 2015 +0200
@@ -28,7 +28,6 @@
  *  loaded class list are prepared classes.
  *  @author Robert Field
  *
- *  @library scaffold
  *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g InnerTarg.java
diff -r c847a158d3ec -r c01ac1fc4305 jdk/test/com/sun/jdi/Vars.java
--- a/jdk/test/com/sun/jdi/Vars.java	Thu May 28 15:03:57 2015 -0700
+++ b/jdk/test/com/sun/jdi/Vars.java	Fri May 29 12:48:58 2015 +0200
@@ -27,7 +27,6 @@
  *
  *  @author Robert Field
  *
- *  @library scaffold
  *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g Vars.java