--- old/test/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java	2015-05-29 17:08:08.853541227 +0300
+++ new/test/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java	2015-05-29 17:08:08.681541233 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -27,6 +27,8 @@
   @summary The size returned by SecurityWarning.getSize() should not be zero
   @author anthony.petrov@sun.com: area=awt.toplevel
   @library ../../../../java/awt/regtesthelpers
+  @modules java.desktop/com.sun.awt
+           java.desktop/sun.awt
   @build Util CustomSecurityManager CopyClassFile
   @run main CopyClassFile CustomSecurityManager bootcp/
   @run main/othervm/secure=CustomSecurityManager -Xbootclasspath/a:bootcp GetSizeShouldNotReturnZero
--- old/test/com/sun/awt/Translucency/WindowOpacity.java	2015-05-29 17:08:09.261541213 +0300
+++ new/test/com/sun/awt/Translucency/WindowOpacity.java	2015-05-29 17:08:09.089541219 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -26,6 +26,7 @@
   @bug 6594131
   @summary Tests the AWTUtilities.get/setWindowOpacity() methods
   @author anthony.petrov@...: area=awt.toplevel
+  @modules java.desktop/com.sun.awt
   @run main WindowOpacity
 */
 
--- old/test/com/sun/java/swing/plaf/windows/Test6824600.java	2015-05-29 17:08:09.689541199 +0300
+++ new/test/com/sun/java/swing/plaf/windows/Test6824600.java	2015-05-29 17:08:09.509541205 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -25,6 +25,7 @@
    @bug 6824600
    @summary OOM occurs when setLookAndFeel() is executed in Windows L&F(XP style)
    @author Pavel Porvatov
+   @modules java.desktop/com.sun.java.swing.plaf.windows
    @run main Test6824600
 */
 
--- old/test/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.java	2015-05-29 17:08:10.105541185 +0300
+++ new/test/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.java	2015-05-29 17:08:09.937541190 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -45,6 +45,7 @@
  * @summary [macosx] Custom Cursor HiDPI support
  * @author Alexander Scherbatiy
  * @library ../../../../lib/testlibrary
+ * @modules java.desktop/sun.awt.image
  * @build jdk.testlibrary.OSInfo
  * @run applet/manual=yesno MultiResolutionCursorTest.html
  */
--- old/test/java/awt/Dialog/CloseDialog/CloseDialogTest.java	2015-05-29 17:08:10.501541172 +0300
+++ new/test/java/awt/Dialog/CloseDialog/CloseDialogTest.java	2015-05-29 17:08:10.333541177 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -32,6 +32,7 @@
  * @test
  * @bug 8043705
  * @summary Can't exit color chooser dialog when running as an applet
+ * @modules java.desktop/sun.awt
  * @run main CloseDialogTest
  */
 public class CloseDialogTest {
--- old/test/java/awt/EventDispatchThread/EDTShutdownTest/EDTShutdownTest.java	2015-05-29 17:08:10.901541158 +0300
+++ new/test/java/awt/EventDispatchThread/EDTShutdownTest/EDTShutdownTest.java	2015-05-29 17:08:10.733541164 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -26,6 +26,7 @@
   @bug 8031694
   @summary [macosx] TwentyThousandTest test intermittently hangs
   @author Oleg Pekhovskiy
+  @modules java.desktop/sun.awt
   @run main EDTShutdownTest
  */
 
--- old/test/java/awt/EventQueue/6980209/bug6980209.java	2015-05-29 17:08:11.305541145 +0300
+++ new/test/java/awt/EventQueue/6980209/bug6980209.java	2015-05-29 17:08:11.133541150 +0300
@@ -25,6 +25,8 @@
    @bug 6980209
    @summary Make tracking SecondaryLoop.enter/exit methods easier
    @author Semyon Sadetsky
+   @modules java.base/sun.util.logging
+            java.desktop
   */
 
 import sun.util.logging.PlatformLogger;
--- old/test/java/awt/EventQueue/MainAppContext/MainAppContext.java	2015-05-29 17:08:11.705541131 +0300
+++ new/test/java/awt/EventQueue/MainAppContext/MainAppContext.java	2015-05-29 17:08:11.533541137 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011,2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011,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
@@ -26,6 +26,7 @@
  * @bug 8004584
  * @summary Tests 8004584
  * @author anthony.petrov@oracle.com, petr.pchelko@oracle.com
+ * @modules java.desktop/sun.awt
  */
 
 import java.awt.*;
--- old/test/java/awt/EventQueue/PostEventOrderingTest/PostEventOrderingTest.java	2015-05-29 17:08:12.097541118 +0300
+++ new/test/java/awt/EventQueue/PostEventOrderingTest/PostEventOrderingTest.java	2015-05-29 17:08:11.933541124 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -26,6 +26,7 @@
  * @bug 4171596 6699589
  * @summary Checks that the posting of events between the PostEventQueue
  * @summary and the EventQueue maintains proper ordering.
+ * @modules java.desktop/sun.awt
  * @run main PostEventOrderingTest
  * @author fredx
  */
--- old/test/java/awt/EventQueue/PushPopDeadlock2/PushPopTest.java	2015-05-29 17:08:12.497541105 +0300
+++ new/test/java/awt/EventQueue/PushPopDeadlock2/PushPopTest.java	2015-05-29 17:08:12.321541111 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -25,6 +25,7 @@
   @test
   @bug 4913324
   @author Oleg Sukhodolsky: area=eventqueue
+  @modules java.desktop/sun.awt
   @run main/timeout=30 PushPopTest
 */
 
--- old/test/java/awt/Focus/8073453/AWTFocusTransitionTest.java	2015-05-29 17:08:12.901541091 +0300
+++ new/test/java/awt/Focus/8073453/AWTFocusTransitionTest.java	2015-05-29 17:08:12.737541097 +0300
@@ -25,6 +25,7 @@
  * @bug 8073453
  * @summary Focus doesn't move when pressing Shift + Tab keys
  * @author Dmitry Markov
+ * @modules java.desktop/sun.awt
  * @compile AWTFocusTransitionTest.java
  * @run main/othervm AWTFocusTransitionTest
  */
--- old/test/java/awt/Focus/8073453/SwingFocusTransitionTest.java	2015-05-29 17:08:13.325541077 +0300
+++ new/test/java/awt/Focus/8073453/SwingFocusTransitionTest.java	2015-05-29 17:08:13.169541082 +0300
@@ -25,6 +25,7 @@
  * @bug 8073453
  * @summary Focus doesn't move when pressing Shift + Tab keys
  * @author Dmitry Markov
+ * @modules java.desktop/sun.awt
  * @compile SwingFocusTransitionTest.java
  * @run main/othervm SwingFocusTransitionTest
  */
--- old/test/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java	2015-05-29 17:08:13.769541062 +0300
+++ new/test/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java	2015-05-29 17:08:13.601541068 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -27,6 +27,8 @@
   @summary   Tests that EmbeddedFrame can be focused.
   @author    anton.tarasov: area=awt-focus
   @library   ../../regtesthelpers
+  @modules java.desktop/java.awt.peer
+           java.desktop/sun.awt
   @build     Util UtilInternal
   @run       main FocusEmbeddedFrameTest
 */
--- old/test/java/awt/Graphics2D/Test8004859/Test8004859.java	2015-05-29 17:08:14.193541048 +0300
+++ new/test/java/awt/Graphics2D/Test8004859/Test8004859.java	2015-05-29 17:08:14.029541053 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -34,6 +34,8 @@
  * @bug 8004859
  * @summary getClipBounds/getClip should return equivalent bounds.
  * @author Sergey Bylokhov
+ * @modules java.desktop/sun.java2d
+ *          java.desktop/sun.java2d.pipe
  */
 public final class Test8004859 {
 
--- old/test/java/awt/Graphics2D/TransformSetGet/TransformSetGet.java	2015-05-29 17:08:14.621541034 +0300
+++ new/test/java/awt/Graphics2D/TransformSetGet/TransformSetGet.java	2015-05-29 17:08:14.461541039 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -33,6 +33,7 @@
  * @bug 8000629
  * @summary Set/get transform should work on constrained graphics.
  * @author Sergey Bylokhov
+ * @modules java.desktop/sun.java2d
  */
 public class TransformSetGet {
 
--- old/test/java/awt/Mixing/AWT_Mixing/JButtonInGlassPaneOverlapping.java	2015-05-29 17:08:15.049541019 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JButtonInGlassPaneOverlapping.java	2015-05-29 17:08:14.881541025 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -33,6 +33,8 @@
 @summary Simple Overlapping test for javax.swing.JButton
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JButtonInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java	2015-05-29 17:08:15.489541005 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java	2015-05-29 17:08:15.317541010 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -33,6 +33,8 @@
 @summary Simple Overlapping test for javax.swing.JButton
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JButtonOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JColorChooserOverlapping.java	2015-05-29 17:08:15.921540990 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JColorChooserOverlapping.java	2015-05-29 17:08:15.761540995 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -32,6 +32,8 @@
 @summary Simple Overlapping test for javax.swing.JColorChooser
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JColorChooserOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java	2015-05-29 17:08:16.365540975 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java	2015-05-29 17:08:16.201540981 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -43,6 +43,8 @@
 @summary Overlapping test for javax.swing.JScrollPane
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JComboBoxOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JEditorPaneInGlassPaneOverlapping.java	2015-05-29 17:08:16.797540961 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JEditorPaneInGlassPaneOverlapping.java	2015-05-29 17:08:16.633540966 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -34,6 +34,8 @@
 @summary Simple Overlapping test for javax.swing.JLabel
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JEditorPaneInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JEditorPaneOverlapping.java	2015-05-29 17:08:17.237540946 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JEditorPaneOverlapping.java	2015-05-29 17:08:17.073540951 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -32,6 +32,8 @@
 @summary Simple Overlapping test for javax.swing.JLabel
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JEditorPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JGlassPaneInternalFrameOverlapping.java	2015-05-29 17:08:17.665540932 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JGlassPaneInternalFrameOverlapping.java	2015-05-29 17:08:17.497540937 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -45,6 +45,8 @@
 @summary Overlapping test for javax.swing.JScrollPane
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JGlassPaneInternalFrameOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JGlassPaneMoveOverlapping.java	2015-05-29 17:08:18.089540917 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JGlassPaneMoveOverlapping.java	2015-05-29 17:08:17.929540923 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -46,6 +46,8 @@
 @summary Overlapping test for javax.swing.JScrollPane
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JGlassPaneMoveOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java	2015-05-29 17:08:18.525540903 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java	2015-05-29 17:08:18.361540908 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -42,6 +42,8 @@
 @summary Overlapping test for javax.swing.JScrollPane
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JInternalFrameMoveOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java	2015-05-29 17:08:18.961540888 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java	2015-05-29 17:08:18.793540894 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -41,6 +41,8 @@
 @summary Overlapping test for javax.swing.JScrollPane
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JInternalFrameOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JLabelInGlassPaneOverlapping.java	2015-05-29 17:08:19.393540874 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JLabelInGlassPaneOverlapping.java	2015-05-29 17:08:19.229540879 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -34,6 +34,8 @@
 @summary Simple Overlapping test for javax.swing.JLabel
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JLabelInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JLabelOverlapping.java	2015-05-29 17:08:19.837540859 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JLabelOverlapping.java	2015-05-29 17:08:19.665540865 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -33,6 +33,8 @@
 @summary Simple Overlapping test for javax.swing.JLabel
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JLabelOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JListInGlassPaneOverlapping.java	2015-05-29 17:08:20.285540844 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JListInGlassPaneOverlapping.java	2015-05-29 17:08:20.121540849 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -33,6 +33,8 @@
 @summary Simple Overlapping test for javax.swing.JList
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JListInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JListOverlapping.java	2015-05-29 17:08:20.761540828 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JListOverlapping.java	2015-05-29 17:08:20.597540833 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -32,6 +32,8 @@
 @summary Simple Overlapping test for javax.swing.JList
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JListOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java	2015-05-29 17:08:21.205540813 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java	2015-05-29 17:08:21.033540819 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -48,6 +48,8 @@
 @summary Overlapping test for javax.swing.JScrollPane
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JMenuBarOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JPanelInGlassPaneOverlapping.java	2015-05-29 17:08:21.697540797 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JPanelInGlassPaneOverlapping.java	2015-05-29 17:08:21.513540803 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -34,6 +34,8 @@
 @summary Simple Overlapping test for javax.swing.JPanel
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JPanelInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JPanelOverlapping.java	2015-05-29 17:08:22.161540781 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JPanelOverlapping.java	2015-05-29 17:08:21.973540787 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -33,6 +33,8 @@
 @summary Simple Overlapping test for javax.swing.JPanel
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JPanelOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java	2015-05-29 17:08:22.605540766 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java	2015-05-29 17:08:22.429540772 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -45,6 +45,8 @@
 @summary Overlapping test for javax.swing.JScrollPane
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JPopupMenuOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JProgressBarInGlassPaneOverlapping.java	2015-05-29 17:08:23.041540752 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JProgressBarInGlassPaneOverlapping.java	2015-05-29 17:08:22.869540757 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -34,6 +34,8 @@
 @summary Simple Overlapping test for javax.swing.JProgressBar
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JProgressBarInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JProgressBarOverlapping.java	2015-05-29 17:08:23.473540737 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JProgressBarOverlapping.java	2015-05-29 17:08:23.313540742 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -33,6 +33,8 @@
 @summary Simple Overlapping test for javax.swing.JProgressBar
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JProgressBarOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JScrollBarInGlassPaneOverlapping.java	2015-05-29 17:08:23.897540723 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JScrollBarInGlassPaneOverlapping.java	2015-05-29 17:08:23.737540728 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -37,6 +37,8 @@
 @summary Simple Overlapping test for javax.swing.JScrollBar
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JScrollBarInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JScrollBarOverlapping.java	2015-05-29 17:08:24.309540709 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JScrollBarOverlapping.java	2015-05-29 17:08:24.149540714 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -36,6 +36,8 @@
 @summary Simple Overlapping test for javax.swing.JScrollBar
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JScrollBarOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JScrollPaneOverlapping.java	2015-05-29 17:08:24.721540695 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JScrollPaneOverlapping.java	2015-05-29 17:08:24.561540701 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -43,6 +43,8 @@
 @summary Overlapping test for javax.swing.JScrollPane
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JScrollPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JSliderInGlassPaneOverlapping.java	2015-05-29 17:08:25.145540681 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JSliderInGlassPaneOverlapping.java	2015-05-29 17:08:24.985540686 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -34,6 +34,8 @@
 @summary Simple Overlapping test for javax.swing.JSlider
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JSliderInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JSliderOverlapping.java	2015-05-29 17:08:25.597540666 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JSliderOverlapping.java	2015-05-29 17:08:25.417540672 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -33,6 +33,8 @@
 @summary Simple Overlapping test for javax.swing.JSlider
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JSliderOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JSpinnerInGlassPaneOverlapping.java	2015-05-29 17:08:26.025540652 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JSpinnerInGlassPaneOverlapping.java	2015-05-29 17:08:25.857540657 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -36,6 +36,8 @@
 @summary Simple Overlapping test for javax.swing.JSpinner
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JSpinnerInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JSpinnerOverlapping.java	2015-05-29 17:08:26.465540637 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JSpinnerOverlapping.java	2015-05-29 17:08:26.297540643 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -35,6 +35,8 @@
 @summary Simple Overlapping test for javax.swing.JSpinner
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JSpinnerOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java	2015-05-29 17:08:26.893540623 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java	2015-05-29 17:08:26.733540628 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -49,6 +49,8 @@
 @summary Overlapping test for javax.swing.JSplitPane
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JSplitPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java	2015-05-29 17:08:27.313540609 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java	2015-05-29 17:08:27.157540614 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -36,6 +36,8 @@
 @summary Simple Overlapping test for JTable
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JTableInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JTableOverlapping.java	2015-05-29 17:08:27.773540593 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JTableOverlapping.java	2015-05-29 17:08:27.605540599 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -32,6 +32,8 @@
 @summary Simple Overlapping test for JTable
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JTableOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JTextAreaInGlassPaneOverlapping.java	2015-05-29 17:08:28.293540576 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JTextAreaInGlassPaneOverlapping.java	2015-05-29 17:08:28.117540582 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -34,6 +34,8 @@
 @summary Simple Overlapping test for javax.swing.JLabel
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JTextAreaInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JTextAreaOverlapping.java	2015-05-29 17:08:28.873540556 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JTextAreaOverlapping.java	2015-05-29 17:08:28.649540564 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -33,6 +33,8 @@
 @summary Simple Overlapping test for javax.swing.JLabel
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JTextAreaOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JTextFieldInGlassPaneOverlapping.java	2015-05-29 17:08:29.389540539 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JTextFieldInGlassPaneOverlapping.java	2015-05-29 17:08:29.217540545 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -34,6 +34,8 @@
 @summary Simple Overlapping test for javax.swing.JLabel
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/java.awt.peer
+         java.desktop/sun.awt
 @build Util
 @run main JTextFieldInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/OverlappingButtons.java	2015-05-29 17:08:29.853540523 +0300
+++ new/test/java/awt/Mixing/OverlappingButtons.java	2015-05-29 17:08:29.689540529 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -27,6 +27,7 @@
   @summary Tests whether overlapping buttons mix correctly
   @author anthony.petrov@...: area=awt.mixing
   @library ../regtesthelpers
+  @modules java.desktop/com.sun.awt
   @build Util
   @run main OverlappingButtons
 */
--- old/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java	2015-05-29 17:08:30.389540505 +0300
+++ new/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java	2015-05-29 17:08:30.205540512 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -44,6 +44,7 @@
  * @author Alexander Scherbatiy
  * @summary [macosx] java -splash does not honor 2x hi dpi notation for retina
  * support
+ * @modules java.desktop/sun.java2d
  * @run main MultiResolutionSplashTest GENERATE_IMAGES
  * @run main/othervm -splash:splash1.png MultiResolutionSplashTest TEST_SPLASH 0
  * @run main/othervm -splash:splash2 MultiResolutionSplashTest TEST_SPLASH 1
--- old/test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java	2015-05-29 17:08:30.861540490 +0300
+++ new/test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java	2015-05-29 17:08:30.685540496 +0300
@@ -30,6 +30,8 @@
  * @bug 7129742
  * @summary Focus in non-editable TextArea is not shown on Linux.
  * @author Sean Chou
+ * @modules java.desktop/java.awt.peer
+ *          java.desktop/sun.awt
  */
 
 import java.awt.FlowLayout;
--- old/test/java/awt/Window/Grab/GrabTest.java	2015-05-29 17:08:31.297540475 +0300
+++ new/test/java/awt/Window/Grab/GrabTest.java	2015-05-29 17:08:31.133540481 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -27,6 +27,7 @@
   @summary Tests that SunToolkit.grab API works
   @author anton.tarasov@oracle.com: area=awt.toolkit
   @library ../../regtesthelpers
+  @modules java.desktop/sun.awt
   @build Util
   @run main GrabTest
 */
--- old/test/java/awt/Window/WindowsLeak/WindowsLeak.java	2015-05-29 17:08:31.737540460 +0300
+++ new/test/java/awt/Window/WindowsLeak/WindowsLeak.java	2015-05-29 17:08:31.577540466 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -25,6 +25,7 @@
  * @test
  * @bug 8013563
  * @summary Tests that windows are removed from windows list
+ * @modules java.desktop/sun.awt
  * @run main/othervm -Xms32M -Xmx32M WindowsLeak
 */
 
--- old/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh	2015-05-29 17:08:32.245540443 +0300
+++ new/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh	2015-05-29 17:08:32.001540452 +0300
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 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
@@ -27,6 +27,8 @@
 #   @bug     6193279 6619458
 #   @summary REGRESSION: AppletViewer throws IOException when path is encoded URL
 #   @author  Dmitry Cherepanov: area=appletviewer
+#   @modules java.base/sun.net.www
+#            java.desktop
 #   @run compile IOExceptionIfEncodedURLTest.java
 #   @run main IOExceptionIfEncodedURLTest
 #   @run shell IOExceptionIfEncodedURLTest.sh
--- old/test/java/awt/datatransfer/Clipboard/BasicClipboardTest.java	2015-05-29 17:08:32.697540428 +0300
+++ new/test/java/awt/datatransfer/Clipboard/BasicClipboardTest.java	2015-05-29 17:08:32.525540434 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -29,6 +29,7 @@
  * @test
  * @summary To test the basic Clipboard functions
  * @author Kanishk Jethi (kanishk.jethi@sun.com) area=Clipboard
+ * @modules java.datatransfer
  * @run main BasicClipboardTest
  */
 
--- old/test/java/awt/datatransfer/ClipboardInterVMTest/ClipboardInterVMTest.java	2015-05-29 17:08:33.157540413 +0300
+++ new/test/java/awt/datatransfer/ClipboardInterVMTest/ClipboardInterVMTest.java	2015-05-29 17:08:32.989540418 +0300
@@ -27,6 +27,8 @@
   @summary Check whether clipboard see changes from external process after taking ownership
   @author Anton Nashatyrev: area=datatransfer
   @library /lib/testlibrary
+  @modules java.desktop
+           java.management
   @build jdk.testlibrary.Utils
   @run main ClipboardInterVMTest
 */
@@ -168,4 +170,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
--- old/test/java/awt/datatransfer/DataFlavor/DataFlavorCloneTest/DataFlavorCloneTest.java	2015-05-29 17:08:33.685540395 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/DataFlavorCloneTest/DataFlavorCloneTest.java	2015-05-29 17:08:33.477540402 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -26,6 +26,7 @@
   @bug 4181601
   @summary tests that DataFlavor.clone method doesn't throw exception
   @author xianfa: area=
+  @modules java.datatransfer
   @run main DataFlavorCloneTest
 */
 
--- old/test/java/awt/datatransfer/DataFlavor/DataFlavorEqualsNullTest.java	2015-05-29 17:08:34.125540380 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/DataFlavorEqualsNullTest.java	2015-05-29 17:08:33.949540386 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -26,6 +26,7 @@
   @bug 4175731
   @summary DataFlavor.equals(null) throws NullPointerException
   @author prs@sparc.spb.su: area=
+  @modules java.datatransfer
   @run main DataFlavorEqualsNullTest
 */
 
--- old/test/java/awt/datatransfer/DataFlavor/DataFlavorEqualsTest.java	2015-05-29 17:08:34.557540366 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/DataFlavorEqualsTest.java	2015-05-29 17:08:34.389540372 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -26,6 +26,7 @@
   @bug 4175341
   @summary DataFlavor.equals throws NullPointerException
   @author prs@sparc.spb.su: area=
+  @modules java.datatransfer
   @run main DataFlavorEqualsTest
 */
 
--- old/test/java/awt/datatransfer/DataFlavor/DataFlavorFileListTest.java	2015-05-29 17:08:34.993540351 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/DataFlavorFileListTest.java	2015-05-29 17:08:34.829540357 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -26,6 +26,7 @@
   @bug 4172848
   @summary DataFlavor.isFlavorJavaFileListType works wrong
   @author prs@sparc.spb.su: area=
+  @modules java.datatransfer
   @run main DataFlavorFileListTest
 */
 
--- old/test/java/awt/datatransfer/DataFlavor/DataFlavorSerializedTest.java	2015-05-29 17:08:35.421540337 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/DataFlavorSerializedTest.java	2015-05-29 17:08:35.261540342 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -26,6 +26,7 @@
   @bug 4174020
   @summary DataFlavor.isMimeTypeSerializedObject works wrong
   @author prs@sparc.spb.su: area=
+  @modules java.datatransfer
   @run main DataFlavorSerializedTest
 */
 
--- old/test/java/awt/datatransfer/DataFlavor/DefaultMatchTest.java	2015-05-29 17:08:35.845540323 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/DefaultMatchTest.java	2015-05-29 17:08:35.685540328 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -26,6 +26,7 @@
   @bug 4250750
   @summary tests that DataFlavor.match() does not throw NPE.
   @author prs@sparc.spb.su: area=
+  @modules java.datatransfer
   @run main DefaultMatchTest
 */
 
--- old/test/java/awt/datatransfer/DataFlavor/EqualsHashCodeSymmetryTest/EqualsHashCodeSymmetryTest.java	2015-05-29 17:08:36.269540309 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/EqualsHashCodeSymmetryTest/EqualsHashCodeSymmetryTest.java	2015-05-29 17:08:36.105540314 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -28,6 +28,7 @@
  * @bug 8038999
  * @summary DataFlavor.equals is not symmetric
  * @author Petr Pchelko <petr.pchelko@oracle.com>
+ * @modules java.datatransfer
  */
 public class EqualsHashCodeSymmetryTest {
 
--- old/test/java/awt/datatransfer/DataFlavor/ExternalizeTest.java	2015-05-29 17:08:36.705540294 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/ExternalizeTest.java	2015-05-29 17:08:36.541540299 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -26,6 +26,7 @@
   @bug 4274267
   @summary Tests that externalized DataFlavor is restored properly
   @author prs@sparc.spb.su: area=
+  @modules java.datatransfer
   @run main ExternalizeTest
 */
 
--- old/test/java/awt/datatransfer/DataFlavor/GetReaderForTextIAEForStringSelectionTest.java	2015-05-29 17:08:37.133540280 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/GetReaderForTextIAEForStringSelectionTest.java	2015-05-29 17:08:36.969540285 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -26,6 +26,7 @@
   @bug 4260874
   @summary Tests that DataFlavor.getReaderForText do not throw NPE when transferObject is null
   @author tdv@sparc.spb.su: area=
+  @modules java.datatransfer
   @run main GetReaderForTextIAEForStringSelectionTest
 */
 
--- old/test/java/awt/datatransfer/DataFlavor/GetReaderForTextNPETest.java	2015-05-29 17:08:37.573540265 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/GetReaderForTextNPETest.java	2015-05-29 17:08:37.413540270 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -26,6 +26,7 @@
   @bug 4260874
   @summary Tests that DataFlavor.getReaderForText do not throw NPE when transferObject is null
   @author tdv@sparc.spb.su: area=
+  @modules java.datatransfer
   @run main GetReaderForTextNPETest
 */
 
--- old/test/java/awt/datatransfer/DataFlavor/MimeTypeSerializationTest.java	2015-05-29 17:08:37.997540251 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/MimeTypeSerializationTest.java	2015-05-29 17:08:37.833540256 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -27,6 +27,7 @@
   @summary Tests that long (more than 64K) MimeType can be serialized
            and deserialized.
   @author gas@sparc.spb.su area=datatransfer
+  @modules java.datatransfer
   @run main MimeTypeSerializationTest
 */
 
--- old/test/java/awt/datatransfer/DataFlavor/NoClassParameterTest.java	2015-05-29 17:08:38.437540236 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/NoClassParameterTest.java	2015-05-29 17:08:38.269540242 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -26,6 +26,7 @@
   @bug 4212613
   @summary tests that DataFlavor(String) doesn't through Exception if no "class=" specified.
   @author prs@sparc.spb.su: area=
+  @modules java.datatransfer
   @run main NoClassParameterTest
 */
 
--- old/test/java/awt/datatransfer/DataFlavor/NormalizeMimeTypeParameter.java	2015-05-29 17:08:38.861540222 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/NormalizeMimeTypeParameter.java	2015-05-29 17:08:38.693540227 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -26,6 +26,7 @@
   @bug 4260860
   @summary tests that DataFlavor.normalizeMimeTypeParameter() returns parm value
   @author ssi@sparc.spb.su area=
+  @modules java.datatransfer
   @run main NormalizeMimeTypeParameter
 */
 
--- old/test/java/awt/datatransfer/DataFlavor/ReaderForUnicodeText.java	2015-05-29 17:08:39.301540207 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/ReaderForUnicodeText.java	2015-05-29 17:08:39.113540213 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -26,6 +26,7 @@
   @bug 4274234
   @summary Tests that DataFlavor.getReaderForText() doesn't throw UnsupportedEncodingException for unicode text
   @author prs@sparc.spb.su: area=
+  @modules java.datatransfer
   @run main ReaderForUnicodeText
 */
 
--- old/test/java/awt/datatransfer/DataFlavor/SelectBestFlavorNPETest.java	2015-05-29 17:08:39.721540193 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/SelectBestFlavorNPETest.java	2015-05-29 17:08:39.557540198 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -26,6 +26,7 @@
   @bug 4370469
   @summary tests that selectBestTextFlavor doesn't throw NPE
   @author prs@sparc.spb.su: area=
+  @modules java.datatransfer
   @run main SelectBestFlavorNPETest
 */
 
--- old/test/java/awt/datatransfer/DataFlavor/SelectBestTextFlavorBadArrayTest.java	2015-05-29 17:08:40.145540179 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/SelectBestTextFlavorBadArrayTest.java	2015-05-29 17:08:39.981540184 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -28,6 +28,7 @@
            is a null array or an empty array or an array which doesn't contain
            a text flavor in a supported encoding.
   @author das@sparc.spb.su area=datatransfer
+  @modules java.datatransfer
   @run main SelectBestTextFlavorBadArrayTest
 */
 
--- old/test/java/awt/datatransfer/DataFlavor/ToStringNullPointerTest.java	2015-05-29 17:08:40.589540164 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/ToStringNullPointerTest.java	2015-05-29 17:08:40.425540169 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -26,6 +26,7 @@
   @bug 4250768
   @summary tests that DataFlavor.toString() does not throw NPE
   @author prs@sparc.spb.su: area=
+  @modules java.datatransfer
   @run main ToStringNullPointerTest
 */
 
--- old/test/java/awt/datatransfer/DragImage/MultiResolutionDragImageTest.java	2015-05-29 17:08:41.049540148 +0300
+++ new/test/java/awt/datatransfer/DragImage/MultiResolutionDragImageTest.java	2015-05-29 17:08:40.881540154 +0300
@@ -36,6 +36,8 @@
  * @author Hendrik Schreiber
  * @summary [macosx] Drag image of TransferHandler does not honor
  * MultiResolutionImage
+ * @modules java.desktop/sun.awt.image
+ *          java.desktop/sun.java2d
  * @run main MultiResolutionDragImageTest TEST_DRAG
  */
 public class MultiResolutionDragImageTest {
@@ -169,4 +171,4 @@
         graphics.dispose();
         return image;
     }
-}
\ No newline at end of file
+}
--- old/test/java/awt/datatransfer/Headless/HeadlessClipboard.java	2015-05-29 17:08:41.481540134 +0300
+++ new/test/java/awt/datatransfer/Headless/HeadlessClipboard.java	2015-05-29 17:08:41.321540139 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -27,6 +27,7 @@
  * @test
  * @summary Check Clipboard constructor and getName() method do not throw
  *          exceptions in headless mode
+ * @modules java.datatransfer
  * @run main/othervm -Djava.awt.headless=true HeadlessClipboard
  */
 
--- old/test/java/awt/datatransfer/Headless/HeadlessDataFlavor.java	2015-05-29 17:08:41.917540119 +0300
+++ new/test/java/awt/datatransfer/Headless/HeadlessDataFlavor.java	2015-05-29 17:08:41.749540125 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -27,6 +27,7 @@
  * @test
  * @summary Check that DataFlavor constructors do not throw unexpected exceptions
  *          in headless mode
+ * @modules java.datatransfer
  * @run main/othervm -Djava.awt.headless=true HeadlessDataFlavor
  */
 
--- old/test/java/awt/datatransfer/Headless/HeadlessSystemFlavorMap.java	2015-05-29 17:08:42.337540105 +0300
+++ new/test/java/awt/datatransfer/Headless/HeadlessSystemFlavorMap.java	2015-05-29 17:08:42.177540111 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -28,6 +28,7 @@
  * @test
  * @summary Check that SystemFlavorMap constructor does not throw unexpected
  *          exceptions in headless mode
+ * @modules java.datatransfer
  * @run main/othervm -Djava.awt.headless=true HeadlessSystemFlavorMap
  */
 
--- old/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorForNativeTest.java	2015-05-29 17:08:43.553540065 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorForNativeTest.java	2015-05-29 17:08:43.365540071 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -37,6 +37,7 @@
  *          adding new mappings, one-way and two-way, and to update
  *          existing mappings.
  * @author Rick Reynaga (rick.reynaga@eng.sun.com) area=Clipboard
+ * @modules java.datatransfer
  * @run main AddFlavorForNativeTest
  */
 
--- old/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java	2015-05-29 17:08:43.969540051 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java	2015-05-29 17:08:43.805540056 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -38,6 +38,7 @@
  *          that all entries are present, and order is maintained.
  * @author Rick Reynaga (rick.reynaga@eng.sun.com) area=Clipboard
  * @author dmitriy.ermashov@oracle.com
+ * @modules java.datatransfer
  * @run main AddFlavorTest
  */
 
--- old/test/java/awt/datatransfer/SystemFlavorMap/AddNativeForFlavorTest.java	2015-05-29 17:08:44.397540036 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/AddNativeForFlavorTest.java	2015-05-29 17:08:44.237540042 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -37,6 +37,7 @@
  *          adding new mappings, one-way and two-way, and to update
  *          existing mappings.
  * @author Rick Reynaga (rick.reynaga@eng.sun.com) area=Clipboard
+ * @modules java.datatransfer
  * @run main AddNativeForFlavorTest
  */
 
--- old/test/java/awt/datatransfer/SystemFlavorMap/AddNativeTest.java	2015-05-29 17:08:44.849540021 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/AddNativeTest.java	2015-05-29 17:08:44.673540027 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -36,6 +36,7 @@
  *          DataFlavors.  The mappings will be verified by examining
  *          that all entries are present.
  * @author Rick Reynaga (rick.reynaga@eng.sun.com) area=Clipboard
+ * @modules java.datatransfer
  * @run main AddNativeTest
  */
 
--- old/test/java/awt/datatransfer/SystemFlavorMap/DuplicateMappingTest.java	2015-05-29 17:08:45.317540006 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/DuplicateMappingTest.java	2015-05-29 17:08:45.137540012 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -27,6 +27,7 @@
   @summary tests that addUnencodedNativeForFlavor()/addFlavorForUnencodedNative()
            do not allow to duplicate mappings
   @author das@sparc.spb.su area=datatransfer
+  @modules java.datatransfer
   @run main DuplicateMappingTest
 */
 
--- old/test/java/awt/datatransfer/SystemFlavorMap/DuplicatedNativesTest.java	2015-05-29 17:08:45.761539991 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/DuplicatedNativesTest.java	2015-05-29 17:08:45.561539997 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -32,6 +32,7 @@
  * @bug 8028230
  * @summary Checks that SystemFlavorMap.getNativesForFlavor returns a list without duplicates
  * @author Petr Pchelko
+ * @modules java.datatransfer
  * @run main DuplicatedNativesTest
  */
 public class DuplicatedNativesTest {
--- old/test/java/awt/datatransfer/SystemFlavorMap/GetFlavorsForNewNativeTest.java	2015-05-29 17:08:46.205539976 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/GetFlavorsForNewNativeTest.java	2015-05-29 17:08:46.033539982 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -38,6 +38,7 @@
  *          returned, and with unknown Encoded String native where
  *          two-way mapping should be established.
  * @author Rick Reynaga (rick.reynaga@eng.sun.com) area=Clipboard
+ * @modules java.datatransfer
  * @run main GetFlavorsForNewNativeTest
  */
 
--- old/test/java/awt/datatransfer/SystemFlavorMap/GetNativesForFlavorTest.java	2015-05-29 17:08:46.649539961 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/GetNativesForFlavorTest.java	2015-05-29 17:08:46.477539967 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -28,6 +28,7 @@
            only if there are no mappings for the DataFlavor and the mappings
            were not explicitly removed
   @author das@sparc.spb.su area=datatransfer
+  @modules java.datatransfer
   @run main GetNativesForFlavorTest
 */
 
--- old/test/java/awt/datatransfer/SystemFlavorMap/GetNativesForNewFlavorTest.java	2015-05-29 17:08:47.101539946 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/GetNativesForNewFlavorTest.java	2015-05-29 17:08:46.929539952 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -37,6 +37,7 @@
  *          passing an unknown DataFlavor where two-way mapping
  *          should be established.
  * @author Rick Reynaga (rick.reynaga@eng.sun.com) area=Clipboard
+ * @modules java.datatransfer
  * @run main GetNativesForNewFlavorTest
  */
 
--- old/test/java/awt/datatransfer/SystemFlavorMap/InvalidMapArgumentsTest.java	2015-05-29 17:08:47.545539931 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/InvalidMapArgumentsTest.java	2015-05-29 17:08:47.373539937 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -36,6 +36,7 @@
  *          - setNativesForFlavor(DataFlavor flav, String[] natives)
  *          - setFlavorsForNative(String nat, DataFlavor[] flavors)
  * @author Rick Reynaga (rick.reynaga@eng.sun.com) area=Clipboard
+ * @modules java.datatransfer
  * @run main InvalidMapArgumentsTest
  */
 
--- old/test/java/awt/datatransfer/SystemFlavorMap/ManyFlavorMapTest.java	2015-05-29 17:08:48.009539915 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/ManyFlavorMapTest.java	2015-05-29 17:08:47.817539922 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -37,6 +37,7 @@
  *          include all entries and that the correct order is
  *          maintained.
  * @author Rick Reynaga (rick.reynaga@eng.sun.com) area=Clipboard
+ * @modules java.datatransfer
  * @run main ManyFlavorMapTest
  */
 
--- old/test/java/awt/datatransfer/SystemFlavorMap/MappingGenerationTest.java	2015-05-29 17:08:48.493539899 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/MappingGenerationTest.java	2015-05-29 17:08:48.309539905 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -30,6 +30,7 @@
   @bug 4512530 8027148
   @summary tests that mappings for text flavors are generated properly
   @author das@sparc.spb.su area=datatransfer
+  @modules java.datatransfer
 */
 
 public class MappingGenerationTest {
--- old/test/java/awt/datatransfer/SystemFlavorMap/SetDataFlavorsTest.java	2015-05-29 17:08:48.953539884 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/SetDataFlavorsTest.java	2015-05-29 17:08:48.781539890 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -39,6 +39,7 @@
  *          DataFlavors.  The mappings will be verified by examining
  *          that all entries are present, and order is maintained.
  * @author Rick Reynaga (rick.reynaga@eng.sun.com) area=Clipboard
+ * @modules java.datatransfer
  * @run main SetDataFlavorsTest
  */
 
--- old/test/java/awt/datatransfer/SystemFlavorMap/SetFlavorsForNativeTest.java	2015-05-29 17:08:49.397539869 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/SetFlavorsForNativeTest.java	2015-05-29 17:08:49.229539875 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -37,6 +37,7 @@
  *          adding new mappings, one-way and two-way, and to update
  *          existing mappings.
  * @author Rick Reynaga (rick.reynaga@eng.sun.com) area=Clipboard
+ * @modules java.datatransfer
  * @run main SetFlavorsForNativeTest
  */
 
--- old/test/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavor.java	2015-05-29 17:08:49.913539852 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavor.java	2015-05-29 17:08:49.713539858 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -37,6 +37,7 @@
  *          adding new mappings, one-way and two-way, and to update
  *          existing mappings.
  * @author Rick Reynaga (rick.reynaga@eng.sun.com) area=Clipboard
+ * @modules java.datatransfer
  * @run main SetNativesForFlavorTest
  */
 
--- old/test/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavorTest.java	2015-05-29 17:08:50.361539837 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavorTest.java	2015-05-29 17:08:50.189539842 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -27,6 +27,7 @@
   @summary tests that getNativesForFlavor()/getFlavorsForNative() return the
            same list as was set with setNativesForFlavor()/setFlavorsForNative()
   @author das@sparc.spb.su area=datatransfer
+  @modules java.datatransfer
   @run main SetNativesForFlavorTest
 */
 
--- old/test/java/awt/datatransfer/SystemFlavorMap/SetNativesTest.java	2015-05-29 17:08:50.885539819 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/SetNativesTest.java	2015-05-29 17:08:50.709539825 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -39,6 +39,7 @@
  *          DataFlavors.  The mappings will be verified by examining
  *          that all entries are present, and order is maintained.
  * @author Rick Reynaga (rick.reynaga@eng.sun.com) area=Clipboard
+ * @modules java.datatransfer
  * @run main SetNativesTest
  */
 
--- old/test/java/awt/event/OtherEvents/UngrabID/UngrabID.java	2015-05-29 17:08:51.329539804 +0300
+++ new/test/java/awt/event/OtherEvents/UngrabID/UngrabID.java	2015-05-29 17:08:51.153539810 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -26,6 +26,7 @@
   @bug 6960516
   @summary check if the ungrab event has the ID < AWTEvent.RESERVED_ID_MAX
   @author Andrei Dmitriev : area=awt.event
+  @modules java.desktop/sun.awt
   @run main UngrabID
 */
 
--- old/test/java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java	2015-05-29 17:08:51.789539789 +0300
+++ new/test/java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java	2015-05-29 17:08:51.617539795 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -27,6 +27,8 @@
   @summary REGRESSION: Popup menus dont respond to selections when extend outside Applet
   @author oleg.sukhodolsky area=awt.grab
   @library ../../regtesthelpers
+  @modules java.desktop/java.awt.peer
+           java.desktop/sun.awt
   @build Util UtilInternal
   @run main EmbeddedFrameTest1
 */
--- old/test/java/awt/image/ConvolveOp/OpCompatibleImageTest.java	2015-05-29 17:08:52.213539775 +0300
+++ new/test/java/awt/image/ConvolveOp/OpCompatibleImageTest.java	2015-05-29 17:08:52.057539780 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -28,6 +28,7 @@
  *          of same type and this pair {src, dst} can be handled by the
  *          ConvolveOp filter.
  *
+ * @modules java.desktop/sun.awt
  * @run     main OpCompatibleImageTest
  */
 
--- old/test/java/awt/image/MultiResolutionImage/NSImageToMultiResolutionImageTest.java	2015-05-29 17:08:52.673539759 +0300
+++ new/test/java/awt/image/MultiResolutionImage/NSImageToMultiResolutionImageTest.java	2015-05-29 17:08:52.505539765 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -30,6 +30,8 @@
  * @bug 8033534 8035069
  * @summary [macosx] Get MultiResolution image from native system
  * @author Alexander Scherbatiy
+ * @modules java.desktop/sun.awt
+ *          java.desktop/sun.awt.image
  * @run main NSImageToMultiResolutionImageTest
  */
 
--- old/test/java/awt/image/MultiResolutionImageTest.java	2015-05-29 17:08:53.113539744 +0300
+++ new/test/java/awt/image/MultiResolutionImageTest.java	2015-05-29 17:08:52.949539750 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -47,6 +47,8 @@
  * @bug 8011059
  * @author Alexander Scherbatiy
  * @summary [macosx] Make JDK demos look perfect on retina displays
+ * @modules java.desktop/sun.awt
+ *          java.desktop/sun.awt.image
  * @run main MultiResolutionImageTest CUSTOM
  * @run main MultiResolutionImageTest TOOLKIT_PREPARE
  * @run main MultiResolutionImageTest TOOLKIT_LOAD
--- old/test/java/awt/image/mlib/MlibOpsTest.java	2015-05-29 17:08:53.573539729 +0300
+++ new/test/java/awt/image/mlib/MlibOpsTest.java	2015-05-29 17:08:53.397539735 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -26,6 +26,7 @@
  * @bug     6556332 8011992 8012112
  * @summary Test verifies that on-demnad loading of medialib library does
  *          not break imageing ops based on this library.
+ * @modules java.desktop/sun.awt.image
  * @run     main MlibOpsTest
  * @run     main/othervm/policy=mlib.security.policy MlibOpsTest
  */
--- old/test/java/awt/image/multiresolution/MultiResolutionToolkitImageTest.java	2015-05-29 17:08:54.025539714 +0300
+++ new/test/java/awt/image/multiresolution/MultiResolutionToolkitImageTest.java	2015-05-29 17:08:53.861539719 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -39,6 +39,8 @@
  * @bug 8040291
  * @author Alexander Scherbatiy
  * @summary [macosx] Http-Images are not fully loaded when using ImageIcon
+ * @modules java.desktop/sun.awt
+ *          java.desktop/sun.awt.image
  * @run main MultiResolutionToolkitImageTest
  */
 public class MultiResolutionToolkitImageTest {
--- old/test/java/awt/xembed/server/RunTestXEmbed.java	2015-05-29 17:08:54.477539699 +0300
+++ new/test/java/awt/xembed/server/RunTestXEmbed.java	2015-05-29 17:08:54.305539705 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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
@@ -26,6 +26,7 @@
  * @bug 4931668
  * @summary Tests XEmbed server/client functionality
  * @author Denis Mikhalkin: area=awt.xembed
+ * @modules java.desktop/sun.awt
  * @compile JavaClient.java TesterClient.java TestXEmbedServer.java
  * @run main/timeout=6000 RunTestXEmbed
  */
--- old/test/java/awt/xembed/server/TestXEmbedServerJava.java	2015-05-29 17:08:54.909539684 +0300
+++ new/test/java/awt/xembed/server/TestXEmbedServerJava.java	2015-05-29 17:08:54.745539690 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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
@@ -26,6 +26,7 @@
  * @bug 4931668
  * @summary Tests XEmbed server/client functionality
  * @author denis mikhalkin: area=awt.xembed
+ * @modules java.desktop/sun.awt
  * @compile JavaClient.java TesterClient.java TestXEmbedServer.java
  * @run main/manual TestXEmbedServerJava
  */
--- old/test/java/beans/Introspector/Test6277246.java	2015-05-29 17:08:55.433539667 +0300
+++ new/test/java/beans/Introspector/Test6277246.java	2015-05-29 17:08:55.185539675 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -25,6 +25,8 @@
  * @test
  * @bug 6277246
  * @summary Tests problem with java.beans use of reflection
+ * @modules java.base/sun.misc
+ *          java.desktop
  * @run main/othervm Test6277246
  * @author Jeff Nisewanger
  */
--- old/test/java/beans/Performance/Test4058433.java	2015-05-29 17:08:55.877539652 +0300
+++ new/test/java/beans/Performance/Test4058433.java	2015-05-29 17:08:55.713539657 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -50,6 +50,9 @@
  * @bug 4058433
  * @summary Generates BeanInfo for public classes in AWT, Accessibility, and Swing
  * @author Sergey Malenkov
+ * @modules java.base/sun.reflect.generics.reflectiveObjects
+ *          java.desktop/com.sun.beans
+ *          java.desktop/com.sun.beans.util
  * @run main/manual Test4058433
  */
 
--- old/test/java/beans/PropertyEditor/6380849/TestPropertyEditor.java	2015-05-29 17:08:56.313539637 +0300
+++ new/test/java/beans/PropertyEditor/6380849/TestPropertyEditor.java	2015-05-29 17:08:56.153539643 +0300
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -26,6 +26,7 @@
  * @bug 6380849
  * @summary Tests PropertyEditor finder
  * @author Sergey Malenkov
+ * @modules java.desktop/com.sun.beans.editors
  * @compile -XDignore.symbol.file TestPropertyEditor.java
  * @run main TestPropertyEditor
  */
--- old/test/java/beans/PropertyEditor/Test6397609.java	2015-05-29 17:08:56.765539622 +0300
+++ new/test/java/beans/PropertyEditor/Test6397609.java	2015-05-29 17:08:56.597539628 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -26,6 +26,9 @@
  * @bug 6397609
  * @summary Tests autocleaning
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 import java.beans.PropertyEditorManager;
--- old/test/java/beans/PropertyEditor/Test6963811.java	2015-05-29 17:08:57.229539607 +0300
+++ new/test/java/beans/PropertyEditor/Test6963811.java	2015-05-29 17:08:57.045539613 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -26,6 +26,7 @@
  * @bug 6963811
  * @summary Tests deadlock in PropertyEditorManager
  * @author Sergey Malenkov
+ * @modules java.desktop/com.sun.beans.editors
  * @compile -XDignore.symbol.file Test6963811.java
  * @run main Test6963811
  */
--- old/test/java/beans/PropertyEditor/TestBooleanClass.java	2015-05-29 17:08:57.681539591 +0300
+++ new/test/java/beans/PropertyEditor/TestBooleanClass.java	2015-05-29 17:08:57.509539597 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6258510 6498158
  * @summary Tests PropertyEditor for value of type Boolean with security manager
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestBooleanClass {
--- old/test/java/beans/PropertyEditor/TestBooleanClassJava.java	2015-05-29 17:08:58.133539576 +0300
+++ new/test/java/beans/PropertyEditor/TestBooleanClassJava.java	2015-05-29 17:08:57.957539582 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6498158
  * @summary Tests PropertyEditor for value of type Boolean
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestBooleanClassJava {
--- old/test/java/beans/PropertyEditor/TestBooleanClassNull.java	2015-05-29 17:08:58.597539561 +0300
+++ new/test/java/beans/PropertyEditor/TestBooleanClassNull.java	2015-05-29 17:08:58.429539566 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6498158 6498171
  * @summary Tests PropertyEditor for null value of type Boolean
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestBooleanClassNull {
--- old/test/java/beans/PropertyEditor/TestBooleanClassValue.java	2015-05-29 17:08:59.037539546 +0300
+++ new/test/java/beans/PropertyEditor/TestBooleanClassValue.java	2015-05-29 17:08:58.869539552 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -26,6 +26,9 @@
  * @bug 4222827 4506596 6498158
  * @summary Tests PropertyEditor for value of type Boolean
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestBooleanClassValue {
--- old/test/java/beans/PropertyEditor/TestBooleanType.java	2015-05-29 17:08:59.477539531 +0300
+++ new/test/java/beans/PropertyEditor/TestBooleanType.java	2015-05-29 17:08:59.297539537 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6258510
  * @summary Tests PropertyEditor for value of type boolean with security manager
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestBooleanType {
--- old/test/java/beans/PropertyEditor/TestBooleanTypeJava.java	2015-05-29 17:08:59.925539516 +0300
+++ new/test/java/beans/PropertyEditor/TestBooleanTypeJava.java	2015-05-29 17:08:59.753539522 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596
  * @summary Tests PropertyEditor for value of type boolean
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestBooleanTypeJava {
--- old/test/java/beans/PropertyEditor/TestBooleanTypeNull.java	2015-05-29 17:09:00.397539500 +0300
+++ new/test/java/beans/PropertyEditor/TestBooleanTypeNull.java	2015-05-29 17:09:00.221539506 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6498171
  * @summary Tests PropertyEditor for null value of type boolean
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestBooleanTypeNull {
--- old/test/java/beans/PropertyEditor/TestBooleanTypeValue.java	2015-05-29 17:09:00.845539485 +0300
+++ new/test/java/beans/PropertyEditor/TestBooleanTypeValue.java	2015-05-29 17:09:00.669539491 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -26,6 +26,9 @@
  * @bug 4222827 4506596
  * @summary Tests PropertyEditor for value of type boolean
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestBooleanTypeValue {
--- old/test/java/beans/PropertyEditor/TestByteClass.java	2015-05-29 17:09:01.293539470 +0300
+++ new/test/java/beans/PropertyEditor/TestByteClass.java	2015-05-29 17:09:01.121539476 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6258510
  * @summary Tests PropertyEditor for value of type Byte with security manager
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestByteClass {
--- old/test/java/beans/PropertyEditor/TestByteClassJava.java	2015-05-29 17:09:01.737539456 +0300
+++ new/test/java/beans/PropertyEditor/TestByteClassJava.java	2015-05-29 17:09:01.565539461 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596
  * @summary Tests PropertyEditor for value of type Byte
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestByteClassJava {
--- old/test/java/beans/PropertyEditor/TestByteClassNull.java	2015-05-29 17:09:02.165539441 +0300
+++ new/test/java/beans/PropertyEditor/TestByteClassNull.java	2015-05-29 17:09:02.001539447 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6498171
  * @summary Tests PropertyEditor for null value of type Byte
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestByteClassNull {
--- old/test/java/beans/PropertyEditor/TestByteClassValue.java	2015-05-29 17:09:02.617539426 +0300
+++ new/test/java/beans/PropertyEditor/TestByteClassValue.java	2015-05-29 17:09:02.445539432 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -26,6 +26,9 @@
  * @bug 4222827 4506596
  * @summary Tests PropertyEditor for value of type Byte
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestByteClassValue {
--- old/test/java/beans/PropertyEditor/TestByteType.java	2015-05-29 17:09:03.053539412 +0300
+++ new/test/java/beans/PropertyEditor/TestByteType.java	2015-05-29 17:09:02.889539417 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6258510
  * @summary Tests PropertyEditor for value of type byte with security manager
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestByteType {
--- old/test/java/beans/PropertyEditor/TestByteTypeJava.java	2015-05-29 17:09:03.521539396 +0300
+++ new/test/java/beans/PropertyEditor/TestByteTypeJava.java	2015-05-29 17:09:03.345539402 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596
  * @summary Tests PropertyEditor for value of type byte
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestByteTypeJava {
--- old/test/java/beans/PropertyEditor/TestByteTypeNull.java	2015-05-29 17:09:03.973539381 +0300
+++ new/test/java/beans/PropertyEditor/TestByteTypeNull.java	2015-05-29 17:09:03.801539386 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6498171
  * @summary Tests PropertyEditor for null value of type byte
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestByteTypeNull {
--- old/test/java/beans/PropertyEditor/TestByteTypeValue.java	2015-05-29 17:09:04.429539365 +0300
+++ new/test/java/beans/PropertyEditor/TestByteTypeValue.java	2015-05-29 17:09:04.257539371 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -26,6 +26,9 @@
  * @bug 4222827 4506596
  * @summary Tests PropertyEditor for value of type byte
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestByteTypeValue {
--- old/test/java/beans/PropertyEditor/TestColorClass.java	2015-05-29 17:09:04.885539350 +0300
+++ new/test/java/beans/PropertyEditor/TestColorClass.java	2015-05-29 17:09:04.713539356 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6258510
  * @summary Tests PropertyEditor for value of type Color with security manager
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 import java.awt.Color;
--- old/test/java/beans/PropertyEditor/TestColorClassJava.java	2015-05-29 17:09:05.357539334 +0300
+++ new/test/java/beans/PropertyEditor/TestColorClassJava.java	2015-05-29 17:09:05.181539340 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596
  * @summary Tests PropertyEditor for value of type Color
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 import java.awt.Color;
--- old/test/java/beans/PropertyEditor/TestColorClassNull.java	2015-05-29 17:09:05.917539316 +0300
+++ new/test/java/beans/PropertyEditor/TestColorClassNull.java	2015-05-29 17:09:05.653539324 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6498171
  * @summary Tests PropertyEditor for null value of type Color
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 import java.awt.Color;
--- old/test/java/beans/PropertyEditor/TestColorClassValue.java	2015-05-29 17:09:06.369539300 +0300
+++ new/test/java/beans/PropertyEditor/TestColorClassValue.java	2015-05-29 17:09:06.197539306 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -26,6 +26,9 @@
  * @bug 4222827 4506596
  * @summary Tests PropertyEditor for value of type Color
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 import java.awt.Color;
--- old/test/java/beans/PropertyEditor/TestDoubleClass.java	2015-05-29 17:09:06.817539285 +0300
+++ new/test/java/beans/PropertyEditor/TestDoubleClass.java	2015-05-29 17:09:06.653539291 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6258510
  * @summary Tests PropertyEditor for value of type Double with security manager
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestDoubleClass {
--- old/test/java/beans/PropertyEditor/TestDoubleClassJava.java	2015-05-29 17:09:07.269539270 +0300
+++ new/test/java/beans/PropertyEditor/TestDoubleClassJava.java	2015-05-29 17:09:07.101539276 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596
  * @summary Tests PropertyEditor for value of type Double
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestDoubleClassJava {
--- old/test/java/beans/PropertyEditor/TestDoubleClassNull.java	2015-05-29 17:09:07.709539256 +0300
+++ new/test/java/beans/PropertyEditor/TestDoubleClassNull.java	2015-05-29 17:09:07.541539261 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6498171
  * @summary Tests PropertyEditor for null value of type Double
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestDoubleClassNull {
--- old/test/java/beans/PropertyEditor/TestDoubleClassValue.java	2015-05-29 17:09:08.153539241 +0300
+++ new/test/java/beans/PropertyEditor/TestDoubleClassValue.java	2015-05-29 17:09:07.985539246 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -26,6 +26,9 @@
  * @bug 4222827 4506596
  * @summary Tests PropertyEditor for value of type Double
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestDoubleClassValue {
--- old/test/java/beans/PropertyEditor/TestDoubleType.java	2015-05-29 17:09:08.601539226 +0300
+++ new/test/java/beans/PropertyEditor/TestDoubleType.java	2015-05-29 17:09:08.429539231 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6258510
  * @summary Tests PropertyEditor for value of type double with security manager
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestDoubleType {
--- old/test/java/beans/PropertyEditor/TestDoubleTypeJava.java	2015-05-29 17:09:09.037539211 +0300
+++ new/test/java/beans/PropertyEditor/TestDoubleTypeJava.java	2015-05-29 17:09:08.873539217 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596
  * @summary Tests PropertyEditor for value of type double
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestDoubleTypeJava {
--- old/test/java/beans/PropertyEditor/TestDoubleTypeNull.java	2015-05-29 17:09:09.485539196 +0300
+++ new/test/java/beans/PropertyEditor/TestDoubleTypeNull.java	2015-05-29 17:09:09.321539202 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6498171
  * @summary Tests PropertyEditor for null value of type double
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestDoubleTypeNull {
--- old/test/java/beans/PropertyEditor/TestDoubleTypeValue.java	2015-05-29 17:09:09.941539181 +0300
+++ new/test/java/beans/PropertyEditor/TestDoubleTypeValue.java	2015-05-29 17:09:09.769539187 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -26,6 +26,9 @@
  * @bug 4222827 4506596
  * @summary Tests PropertyEditor for value of type double
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestDoubleTypeValue {
--- old/test/java/beans/PropertyEditor/TestEnumClass.java	2015-05-29 17:09:10.389539166 +0300
+++ new/test/java/beans/PropertyEditor/TestEnumClass.java	2015-05-29 17:09:10.221539171 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6219769 6258510
  * @summary Tests PropertyEditor for value of type Enum with security manager
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestEnumClass {
--- old/test/java/beans/PropertyEditor/TestEnumClassJava.java	2015-05-29 17:09:10.841539151 +0300
+++ new/test/java/beans/PropertyEditor/TestEnumClassJava.java	2015-05-29 17:09:10.673539156 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6219769
  * @summary Tests PropertyEditor for value of type Enum
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestEnumClassJava {
--- old/test/java/beans/PropertyEditor/TestEnumClassNull.java	2015-05-29 17:09:11.297539135 +0300
+++ new/test/java/beans/PropertyEditor/TestEnumClassNull.java	2015-05-29 17:09:11.125539141 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6219769 6498171
  * @summary Tests PropertyEditor for null value of type Enum
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestEnumClassNull {
--- old/test/java/beans/PropertyEditor/TestEnumClassValue.java	2015-05-29 17:09:11.749539120 +0300
+++ new/test/java/beans/PropertyEditor/TestEnumClassValue.java	2015-05-29 17:09:11.577539126 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4222827 4506596 6219769
  * @summary Tests PropertyEditor for value of type Enum
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestEnumClassValue {
--- old/test/java/beans/PropertyEditor/TestEnumSubclass.java	2015-05-29 17:09:12.213539105 +0300
+++ new/test/java/beans/PropertyEditor/TestEnumSubclass.java	2015-05-29 17:09:12.033539111 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -26,6 +26,9 @@
  * @bug 6736248
  * @summary Tests PropertyEditor for value of subtype Enum with security manager
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestEnumSubclass {
--- old/test/java/beans/PropertyEditor/TestEnumSubclassJava.java	2015-05-29 17:09:12.673539089 +0300
+++ new/test/java/beans/PropertyEditor/TestEnumSubclassJava.java	2015-05-29 17:09:12.497539095 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -26,6 +26,9 @@
  * @bug 6736248
  * @summary Tests PropertyEditor for value of subtype Enum
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestEnumSubclassJava {
--- old/test/java/beans/PropertyEditor/TestEnumSubclassNull.java	2015-05-29 17:09:13.133539074 +0300
+++ new/test/java/beans/PropertyEditor/TestEnumSubclassNull.java	2015-05-29 17:09:12.961539080 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -26,6 +26,9 @@
  * @bug 6736248
  * @summary Tests PropertyEditor for null value of subtype Enum
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestEnumSubclassNull {
--- old/test/java/beans/PropertyEditor/TestEnumSubclassValue.java	2015-05-29 17:09:13.597539058 +0300
+++ new/test/java/beans/PropertyEditor/TestEnumSubclassValue.java	2015-05-29 17:09:13.421539064 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -26,6 +26,9 @@
  * @bug 6736248
  * @summary Tests PropertyEditor for value of subtype Enum
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestEnumSubclassValue {
--- old/test/java/beans/PropertyEditor/TestFloatClass.java	2015-05-29 17:09:14.049539043 +0300
+++ new/test/java/beans/PropertyEditor/TestFloatClass.java	2015-05-29 17:09:13.873539049 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6258510
  * @summary Tests PropertyEditor for value of type Float with security manager
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestFloatClass {
--- old/test/java/beans/PropertyEditor/TestFloatClassJava.java	2015-05-29 17:09:14.505539028 +0300
+++ new/test/java/beans/PropertyEditor/TestFloatClassJava.java	2015-05-29 17:09:14.333539034 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596
  * @summary Tests PropertyEditor for value of type Float
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestFloatClassJava {
--- old/test/java/beans/PropertyEditor/TestFloatClassNull.java	2015-05-29 17:09:14.941539013 +0300
+++ new/test/java/beans/PropertyEditor/TestFloatClassNull.java	2015-05-29 17:09:14.769539019 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6498171
  * @summary Tests PropertyEditor for null value of type Float
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestFloatClassNull {
--- old/test/java/beans/PropertyEditor/TestFloatClassValue.java	2015-05-29 17:09:15.401538998 +0300
+++ new/test/java/beans/PropertyEditor/TestFloatClassValue.java	2015-05-29 17:09:15.233539004 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -26,6 +26,9 @@
  * @bug 4222827 4506596
  * @summary Tests PropertyEditor for value of type Float
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestFloatClassValue {
--- old/test/java/beans/PropertyEditor/TestFloatType.java	2015-05-29 17:09:15.853538983 +0300
+++ new/test/java/beans/PropertyEditor/TestFloatType.java	2015-05-29 17:09:15.681538989 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6258510
  * @summary Tests PropertyEditor for value of type float with security manager
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestFloatType {
--- old/test/java/beans/PropertyEditor/TestFloatTypeJava.java	2015-05-29 17:09:16.297538968 +0300
+++ new/test/java/beans/PropertyEditor/TestFloatTypeJava.java	2015-05-29 17:09:16.125538974 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596
  * @summary Tests PropertyEditor for value of type float
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestFloatTypeJava {
--- old/test/java/beans/PropertyEditor/TestFloatTypeNull.java	2015-05-29 17:09:16.753538953 +0300
+++ new/test/java/beans/PropertyEditor/TestFloatTypeNull.java	2015-05-29 17:09:16.577538959 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6498171
  * @summary Tests PropertyEditor for null value of type float
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestFloatTypeNull {
--- old/test/java/beans/PropertyEditor/TestFloatTypeValue.java	2015-05-29 17:09:17.221538937 +0300
+++ new/test/java/beans/PropertyEditor/TestFloatTypeValue.java	2015-05-29 17:09:17.041538943 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -26,6 +26,9 @@
  * @bug 4222827 4506596
  * @summary Tests PropertyEditor for value of type float
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestFloatTypeValue {
--- old/test/java/beans/PropertyEditor/TestFontClass.java	2015-05-29 17:09:17.761538919 +0300
+++ new/test/java/beans/PropertyEditor/TestFontClass.java	2015-05-29 17:09:17.585538925 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6258510 6538853
  * @summary Tests PropertyEditor for value of type Font with security manager
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 import java.awt.Font;
--- old/test/java/beans/PropertyEditor/TestFontClassJava.java	2015-05-29 17:09:18.225538903 +0300
+++ new/test/java/beans/PropertyEditor/TestFontClassJava.java	2015-05-29 17:09:18.057538909 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6538853
  * @summary Tests PropertyEditor for value of type Font
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 import java.awt.Font;
--- old/test/java/beans/PropertyEditor/TestFontClassNull.java	2015-05-29 17:09:18.677538888 +0300
+++ new/test/java/beans/PropertyEditor/TestFontClassNull.java	2015-05-29 17:09:18.513538894 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6498171 6538853
  * @summary Tests PropertyEditor for null value of type Font
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 import java.awt.Font;
--- old/test/java/beans/PropertyEditor/TestFontClassValue.java	2015-05-29 17:09:19.173538872 +0300
+++ new/test/java/beans/PropertyEditor/TestFontClassValue.java	2015-05-29 17:09:19.005538877 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -26,6 +26,9 @@
  * @bug 4222827 4506596 6538853
  * @summary Tests PropertyEditor for value of type Font
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 import java.awt.Font;
--- old/test/java/beans/PropertyEditor/TestIntegerClass.java	2015-05-29 17:09:19.637538856 +0300
+++ new/test/java/beans/PropertyEditor/TestIntegerClass.java	2015-05-29 17:09:19.465538862 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6258510 6498158
  * @summary Tests PropertyEditor for value of type Integer with security manager
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestIntegerClass {
--- old/test/java/beans/PropertyEditor/TestIntegerClassJava.java	2015-05-29 17:09:20.081538841 +0300
+++ new/test/java/beans/PropertyEditor/TestIntegerClassJava.java	2015-05-29 17:09:19.909538847 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6498158
  * @summary Tests PropertyEditor for value of type Integer
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestIntegerClassJava {
--- old/test/java/beans/PropertyEditor/TestIntegerClassNull.java	2015-05-29 17:09:20.541538826 +0300
+++ new/test/java/beans/PropertyEditor/TestIntegerClassNull.java	2015-05-29 17:09:20.369538832 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6498158 6498171
  * @summary Tests PropertyEditor for null value of type Integer
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestIntegerClassNull {
--- old/test/java/beans/PropertyEditor/TestIntegerClassValue.java	2015-05-29 17:09:21.013538810 +0300
+++ new/test/java/beans/PropertyEditor/TestIntegerClassValue.java	2015-05-29 17:09:20.833538816 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -26,6 +26,9 @@
  * @bug 4222827 4506596 6498158
  * @summary Tests PropertyEditor for value of type Integer
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestIntegerClassValue {
--- old/test/java/beans/PropertyEditor/TestIntegerType.java	2015-05-29 17:09:21.465538795 +0300
+++ new/test/java/beans/PropertyEditor/TestIntegerType.java	2015-05-29 17:09:21.289538801 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6258510
  * @summary Tests PropertyEditor for value of type int with security manager
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestIntegerType {
--- old/test/java/beans/PropertyEditor/TestIntegerTypeJava.java	2015-05-29 17:09:21.913538780 +0300
+++ new/test/java/beans/PropertyEditor/TestIntegerTypeJava.java	2015-05-29 17:09:21.741538786 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596
  * @summary Tests PropertyEditor for value of type int
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestIntegerTypeJava {
--- old/test/java/beans/PropertyEditor/TestIntegerTypeNull.java	2015-05-29 17:09:22.353538765 +0300
+++ new/test/java/beans/PropertyEditor/TestIntegerTypeNull.java	2015-05-29 17:09:22.181538771 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6498171
  * @summary Tests PropertyEditor for null value of type int
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestIntegerTypeNull {
--- old/test/java/beans/PropertyEditor/TestIntegerTypeValue.java	2015-05-29 17:09:22.817538750 +0300
+++ new/test/java/beans/PropertyEditor/TestIntegerTypeValue.java	2015-05-29 17:09:22.645538755 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -26,6 +26,9 @@
  * @bug 4222827 4506596
  * @summary Tests PropertyEditor for value of type int
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestIntegerTypeValue {
--- old/test/java/beans/PropertyEditor/TestLongClass.java	2015-05-29 17:09:23.277538734 +0300
+++ new/test/java/beans/PropertyEditor/TestLongClass.java	2015-05-29 17:09:23.109538740 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6258510
  * @summary Tests PropertyEditor for value of type Long with security manager
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestLongClass {
--- old/test/java/beans/PropertyEditor/TestLongClassJava.java	2015-05-29 17:09:23.737538719 +0300
+++ new/test/java/beans/PropertyEditor/TestLongClassJava.java	2015-05-29 17:09:23.557538725 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596
  * @summary Tests PropertyEditor for value of type Long
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestLongClassJava {
--- old/test/java/beans/PropertyEditor/TestLongClassNull.java	2015-05-29 17:09:24.197538703 +0300
+++ new/test/java/beans/PropertyEditor/TestLongClassNull.java	2015-05-29 17:09:24.025538709 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6498171
  * @summary Tests PropertyEditor for null value of type Long
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestLongClassNull {
--- old/test/java/beans/PropertyEditor/TestLongClassValue.java	2015-05-29 17:09:24.653538688 +0300
+++ new/test/java/beans/PropertyEditor/TestLongClassValue.java	2015-05-29 17:09:24.489538694 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -26,6 +26,9 @@
  * @bug 4222827 4506596
  * @summary Tests PropertyEditor for value of type Long
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestLongClassValue {
--- old/test/java/beans/PropertyEditor/TestLongType.java	2015-05-29 17:09:25.101538673 +0300
+++ new/test/java/beans/PropertyEditor/TestLongType.java	2015-05-29 17:09:24.929538679 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6258510
  * @summary Tests PropertyEditor for value of type long with security manager
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestLongType {
--- old/test/java/beans/PropertyEditor/TestLongTypeJava.java	2015-05-29 17:09:25.533538659 +0300
+++ new/test/java/beans/PropertyEditor/TestLongTypeJava.java	2015-05-29 17:09:25.369538664 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596
  * @summary Tests PropertyEditor for value of type long
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestLongTypeJava {
--- old/test/java/beans/PropertyEditor/TestLongTypeNull.java	2015-05-29 17:09:25.981538644 +0300
+++ new/test/java/beans/PropertyEditor/TestLongTypeNull.java	2015-05-29 17:09:25.813538649 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6498171
  * @summary Tests PropertyEditor for null value of type long
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestLongTypeNull {
--- old/test/java/beans/PropertyEditor/TestLongTypeValue.java	2015-05-29 17:09:26.413538629 +0300
+++ new/test/java/beans/PropertyEditor/TestLongTypeValue.java	2015-05-29 17:09:26.241538635 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -26,6 +26,9 @@
  * @bug 4222827 4506596
  * @summary Tests PropertyEditor for value of type long
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestLongTypeValue {
--- old/test/java/beans/PropertyEditor/TestShortClass.java	2015-05-29 17:09:26.889538613 +0300
+++ new/test/java/beans/PropertyEditor/TestShortClass.java	2015-05-29 17:09:26.705538619 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6258510
  * @summary Tests PropertyEditor for value of type Short with security manager
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestShortClass {
--- old/test/java/beans/PropertyEditor/TestShortClassJava.java	2015-05-29 17:09:27.325538599 +0300
+++ new/test/java/beans/PropertyEditor/TestShortClassJava.java	2015-05-29 17:09:27.161538604 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596
  * @summary Tests PropertyEditor for value of type Short
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestShortClassJava {
--- old/test/java/beans/PropertyEditor/TestShortClassNull.java	2015-05-29 17:09:27.789538583 +0300
+++ new/test/java/beans/PropertyEditor/TestShortClassNull.java	2015-05-29 17:09:27.617538589 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6498171
  * @summary Tests PropertyEditor for null value of type Short
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestShortClassNull {
--- old/test/java/beans/PropertyEditor/TestShortClassValue.java	2015-05-29 17:09:28.229538568 +0300
+++ new/test/java/beans/PropertyEditor/TestShortClassValue.java	2015-05-29 17:09:28.061538574 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -26,6 +26,9 @@
  * @bug 4222827 4506596
  * @summary Tests PropertyEditor for value of type Short
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestShortClassValue {
--- old/test/java/beans/PropertyEditor/TestShortType.java	2015-05-29 17:09:28.689538553 +0300
+++ new/test/java/beans/PropertyEditor/TestShortType.java	2015-05-29 17:09:28.517538559 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6258510
  * @summary Tests PropertyEditor for value of type short with security manager
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestShortType {
--- old/test/java/beans/PropertyEditor/TestShortTypeJava.java	2015-05-29 17:09:29.149538538 +0300
+++ new/test/java/beans/PropertyEditor/TestShortTypeJava.java	2015-05-29 17:09:28.981538543 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596
  * @summary Tests PropertyEditor for value of type short
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestShortTypeJava {
--- old/test/java/beans/PropertyEditor/TestShortTypeNull.java	2015-05-29 17:09:29.697538519 +0300
+++ new/test/java/beans/PropertyEditor/TestShortTypeNull.java	2015-05-29 17:09:29.525538525 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6498171
  * @summary Tests PropertyEditor for null value of type short
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestShortTypeNull {
--- old/test/java/beans/PropertyEditor/TestShortTypeValue.java	2015-05-29 17:09:30.153538504 +0300
+++ new/test/java/beans/PropertyEditor/TestShortTypeValue.java	2015-05-29 17:09:29.977538510 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -26,6 +26,9 @@
  * @bug 4222827 4506596
  * @summary Tests PropertyEditor for value of type short
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestShortTypeValue {
--- old/test/java/beans/PropertyEditor/TestStringClass.java	2015-05-29 17:09:30.609538489 +0300
+++ new/test/java/beans/PropertyEditor/TestStringClass.java	2015-05-29 17:09:30.437538494 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6258510 6457659
  * @summary Tests PropertyEditor for value of type String with security manager
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestStringClass {
--- old/test/java/beans/PropertyEditor/TestStringClassJava.java	2015-05-29 17:09:31.073538473 +0300
+++ new/test/java/beans/PropertyEditor/TestStringClassJava.java	2015-05-29 17:09:30.893538479 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6457659
  * @summary Tests PropertyEditor for value of type String
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestStringClassJava {
--- old/test/java/beans/PropertyEditor/TestStringClassNull.java	2015-05-29 17:09:31.521538458 +0300
+++ new/test/java/beans/PropertyEditor/TestStringClassNull.java	2015-05-29 17:09:31.349538464 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,9 @@
  * @bug 4506596 6457659 6498171
  * @summary Tests PropertyEditor for null value of type String
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestStringClassNull {
--- old/test/java/beans/PropertyEditor/TestStringClassValue.java	2015-05-29 17:09:31.993538442 +0300
+++ new/test/java/beans/PropertyEditor/TestStringClassValue.java	2015-05-29 17:09:31.825538448 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -28,6 +28,9 @@
  * @bug 6457659
  * @summary Tests PropertyEditor for value of type String
  * @author Sergey Malenkov
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  */
 
 public class TestStringClassValue {
--- old/test/java/beans/XMLDecoder/8028054/TestConstructorFinder.java	2015-05-29 17:09:32.465538427 +0300
+++ new/test/java/beans/XMLDecoder/8028054/TestConstructorFinder.java	2015-05-29 17:09:32.301538432 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -33,6 +33,7 @@
  * @bug 8028054
  * @summary Tests that cached constructors have synchronized access
  * @author Sergey Malenkov
+ * @modules java.desktop/com.sun.beans.finder
  * @compile -XDignore.symbol.file TestConstructorFinder.java
  * @run main TestConstructorFinder
  */
--- old/test/java/beans/XMLDecoder/8028054/TestMethodFinder.java	2015-05-29 17:09:32.913538411 +0300
+++ new/test/java/beans/XMLDecoder/8028054/TestMethodFinder.java	2015-05-29 17:09:32.745538417 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -33,6 +33,7 @@
  * @bug 8028054
  * @summary Tests that cached methods have synchronized access
  * @author Sergey Malenkov
+ * @modules java.desktop/com.sun.beans.finder
  * @compile -XDignore.symbol.file TestMethodFinder.java
  * @run main TestMethodFinder
  */
--- old/test/java/beans/XMLEncoder/java_sql_Date.java	2015-05-29 17:09:33.369538396 +0300
+++ new/test/java/beans/XMLEncoder/java_sql_Date.java	2015-05-29 17:09:33.201538402 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,8 @@
  * @bug 4733558 6471539
  * @summary Tests Date encoding
  * @author Sergey Malenkov
+ * @modules java.desktop
+ *          java.sql
  */
 
 import java.sql.Date;
--- old/test/java/beans/XMLEncoder/java_sql_Time.java	2015-05-29 17:09:33.821538381 +0300
+++ new/test/java/beans/XMLEncoder/java_sql_Time.java	2015-05-29 17:09:33.649538387 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,8 @@
  * @bug 4733558 6471539
  * @summary Tests Time encoding
  * @author Sergey Malenkov
+ * @modules java.desktop
+ *          java.sql
  */
 
 import java.sql.Time;
--- old/test/java/beans/XMLEncoder/java_sql_Timestamp.java	2015-05-29 17:09:34.273538366 +0300
+++ new/test/java/beans/XMLEncoder/java_sql_Timestamp.java	2015-05-29 17:09:34.101538372 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -26,6 +26,8 @@
  * @bug 4733558 6471539
  * @summary Tests Timestamp encoding
  * @author Sergey Malenkov
+ * @modules java.desktop
+ *          java.sql
  */
 
 import java.sql.Timestamp;
--- old/test/java/beans/XMLEncoder/sun_swing_PrintColorUIResource.java	2015-05-29 17:09:34.733538351 +0300
+++ new/test/java/beans/XMLEncoder/sun_swing_PrintColorUIResource.java	2015-05-29 17:09:34.561538356 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -26,6 +26,7 @@
  * @bug 6589532
  * @summary Tests PrintColorUIResource value encoding
  * @author Sergey Malenkov
+ * @modules java.desktop/sun.swing
  */
 
 import java.awt.Color;
--- old/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	2015-05-29 17:09:35.201538335 +0300
+++ new/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	2015-05-29 17:09:35.025538341 +0300
@@ -1,6 +1,6 @@
 #!/bin/ksh -p
 #
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 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
@@ -29,6 +29,7 @@
 #               the same VM and verifies that ImageIO shutdown hook
 #               StreamCloser does not cause a leak of classloaders.
 #
+#   @modules java.desktop/sun.awt
 #   @build      test.Main
 #   @build      testapp.Main
 #   @run shell  run_test.sh
--- old/test/javax/sound/midi/Gervill/AudioFloatConverter/GetFormat.java	2015-05-29 17:09:35.661538319 +0300
+++ new/test/javax/sound/midi/Gervill/AudioFloatConverter/GetFormat.java	2015-05-29 17:09:35.485538325 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test AudioFloatConverter getFormat method */
+   @summary Test AudioFloatConverter getFormat method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.sampled.*;
 import com.sun.media.sound.*;
--- old/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java	2015-05-29 17:09:36.101538305 +0300
+++ new/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java	2015-05-29 17:09:35.929538310 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test AudioFloatConverter toFloatArray method */
+   @summary Test AudioFloatConverter toFloatArray method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.sampled.*;
 
--- old/test/javax/sound/midi/Gervill/AudioFloatFormatConverter/SkipTest.java	2015-05-29 17:09:36.533538290 +0300
+++ new/test/javax/sound/midi/Gervill/AudioFloatFormatConverter/SkipTest.java	2015-05-29 17:09:36.357538296 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
- @summary Test skip method returned from AudioFloatFormatConverter.getAudioInputStream */
+ @summary Test skip method returned from AudioFloatFormatConverter.getAudioInputStream 
+ @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.ByteArrayInputStream;
 
--- old/test/javax/sound/midi/Gervill/AudioFloatInputStream/Available.java	2015-05-29 17:09:36.997538275 +0300
+++ new/test/javax/sound/midi/Gervill/AudioFloatInputStream/Available.java	2015-05-29 17:09:36.821538281 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test AudioFloatInputStream available method */
+   @summary Test AudioFloatInputStream available method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.*;
 
--- old/test/javax/sound/midi/Gervill/AudioFloatInputStream/Close.java	2015-05-29 17:09:37.469538259 +0300
+++ new/test/javax/sound/midi/Gervill/AudioFloatInputStream/Close.java	2015-05-29 17:09:37.289538265 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test AudioFloatInputStream close method */
+   @summary Test AudioFloatInputStream close method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.*;
 
--- old/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFormat.java	2015-05-29 17:09:37.937538243 +0300
+++ new/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFormat.java	2015-05-29 17:09:37.757538249 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test AudioFloatInputStream getFormat method */
+   @summary Test AudioFloatInputStream getFormat method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.*;
 
--- old/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFrameLength.java	2015-05-29 17:09:38.405538228 +0300
+++ new/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFrameLength.java	2015-05-29 17:09:38.229538233 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test AudioFloatInputStream getFrameLength method */
+   @summary Test AudioFloatInputStream getFrameLength method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.*;
 
--- old/test/javax/sound/midi/Gervill/AudioFloatInputStream/MarkSupported.java	2015-05-29 17:09:38.869538212 +0300
+++ new/test/javax/sound/midi/Gervill/AudioFloatInputStream/MarkSupported.java	2015-05-29 17:09:38.689538218 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test AudioFloatInputStream markSupported method */
+   @summary Test AudioFloatInputStream markSupported method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.*;
 
--- old/test/javax/sound/midi/Gervill/AudioFloatInputStream/Read.java	2015-05-29 17:09:39.341538196 +0300
+++ new/test/javax/sound/midi/Gervill/AudioFloatInputStream/Read.java	2015-05-29 17:09:39.165538202 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test AudioFloatInputStream read method */
+   @summary Test AudioFloatInputStream read method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.*;
 
--- old/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArray.java	2015-05-29 17:09:39.801538181 +0300
+++ new/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArray.java	2015-05-29 17:09:39.621538187 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test AudioFloatInputStream read(float[]) method */
+   @summary Test AudioFloatInputStream read(float[]) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.*;
 
--- old/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArrayIntInt.java	2015-05-29 17:09:40.269538165 +0300
+++ new/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArrayIntInt.java	2015-05-29 17:09:40.089538171 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test AudioFloatInputStream read(float[], int, int) method */
+   @summary Test AudioFloatInputStream read(float[], int, int) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.*;
 
--- old/test/javax/sound/midi/Gervill/ModelByteBuffer/GetRoot.java	2015-05-29 17:09:40.741538149 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/GetRoot.java	2015-05-29 17:09:40.549538156 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBuffer getRoot method */
+   @summary Test ModelByteBuffer getRoot method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelByteBuffer/Load.java	2015-05-29 17:09:41.205538134 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/Load.java	2015-05-29 17:09:41.025538140 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBuffer load method */
+   @summary Test ModelByteBuffer load method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelByteBuffer/LoadAll.java	2015-05-29 17:09:41.669538118 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/LoadAll.java	2015-05-29 17:09:41.489538124 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBuffer loadAll method */
+   @summary Test ModelByteBuffer loadAll method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArray.java	2015-05-29 17:09:42.213538100 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArray.java	2015-05-29 17:09:41.953538109 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBuffer(byte[]) constructor */
+   @summary Test ModelByteBuffer(byte[]) constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArrayIntInt.java	2015-05-29 17:09:42.681538084 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArrayIntInt.java	2015-05-29 17:09:42.501538090 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBuffer(byte[],int,int) constructor */
+   @summary Test ModelByteBuffer(byte[],int,int) constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFile.java	2015-05-29 17:09:43.129538069 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFile.java	2015-05-29 17:09:42.957538075 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBuffer(File) constructor */
+   @summary Test ModelByteBuffer(File) constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFileLongLong.java	2015-05-29 17:09:43.601538054 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFileLongLong.java	2015-05-29 17:09:43.417538060 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBuffer(File,long,long) constructor */
+   @summary Test ModelByteBuffer(File,long,long) constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Available.java	2015-05-29 17:09:44.061538038 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Available.java	2015-05-29 17:09:43.885538044 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBuffer.RandomFileInputStream available() method */
+   @summary Test ModelByteBuffer.RandomFileInputStream available() method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Close.java	2015-05-29 17:09:44.513538023 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Close.java	2015-05-29 17:09:44.337538029 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBuffer.RandomFileInputStream close method */
+   @summary Test ModelByteBuffer.RandomFileInputStream close method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkReset.java	2015-05-29 17:09:44.989538007 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkReset.java	2015-05-29 17:09:44.817538013 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBuffer.RandomFileInputStream mark and reset methods */
+   @summary Test ModelByteBuffer.RandomFileInputStream mark and reset methods 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkSupported.java	2015-05-29 17:09:45.449537992 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkSupported.java	2015-05-29 17:09:45.285537997 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBuffer.RandomFileInputStream markSupported() method */
+   @summary Test ModelByteBuffer.RandomFileInputStream markSupported() method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Read.java	2015-05-29 17:09:45.917537976 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Read.java	2015-05-29 17:09:45.741537982 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBuffer.RandomFileInputStream read() method */
+   @summary Test ModelByteBuffer.RandomFileInputStream read() method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByte.java	2015-05-29 17:09:46.389537960 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByte.java	2015-05-29 17:09:46.201537966 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBuffer.RandomFileInputStream read(byte[]) method */
+   @summary Test ModelByteBuffer.RandomFileInputStream read(byte[]) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java	2015-05-29 17:09:46.833537945 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java	2015-05-29 17:09:46.665537951 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBuffer.RandomFileInputStream read(byte[], int, int) method */
+   @summary Test ModelByteBuffer.RandomFileInputStream read(byte[], int, int) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Skip.java	2015-05-29 17:09:47.293537930 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Skip.java	2015-05-29 17:09:47.121537936 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBuffer.RandomFileInputStream skip(long) method */
+   @summary Test ModelByteBuffer.RandomFileInputStream skip(long) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLong.java	2015-05-29 17:09:47.737537915 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLong.java	2015-05-29 17:09:47.569537921 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBuffer subbuffer(long) method */
+   @summary Test ModelByteBuffer subbuffer(long) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLong.java	2015-05-29 17:09:48.185537900 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLong.java	2015-05-29 17:09:48.013537906 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBuffer subbuffer(long,long) method */
+   @summary Test ModelByteBuffer subbuffer(long,long) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLongBoolean.java	2015-05-29 17:09:48.641537885 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLongBoolean.java	2015-05-29 17:09:48.465537891 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBuffer subbuffer(long,long,boolean) method */
+   @summary Test ModelByteBuffer subbuffer(long,long,boolean) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelByteBuffer/Unload.java	2015-05-29 17:09:49.125537869 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/Unload.java	2015-05-29 17:09:48.949537874 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBuffer unload method */
+   @summary Test ModelByteBuffer unload method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelByteBuffer/WriteTo.java	2015-05-29 17:09:49.573537854 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/WriteTo.java	2015-05-29 17:09:49.397537859 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBuffer writeTo method */
+   @summary Test ModelByteBuffer writeTo method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
--- old/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetAttenuation.java	2015-05-29 17:09:50.033537838 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetAttenuation.java	2015-05-29 17:09:49.857537844 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBufferWavetable getAttenuation method */
+   @summary Test ModelByteBufferWavetable getAttenuation method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.ByteArrayOutputStream;
 
--- old/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetChannels.java	2015-05-29 17:09:50.497537823 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetChannels.java	2015-05-29 17:09:50.317537829 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBufferWavetable getChannels method */
+   @summary Test ModelByteBufferWavetable getChannels method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.ByteArrayOutputStream;
 
--- old/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopLength.java	2015-05-29 17:09:50.953537807 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopLength.java	2015-05-29 17:09:50.785537813 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBufferWavetable getLoopLength method */
+   @summary Test ModelByteBufferWavetable getLoopLength method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.ByteArrayOutputStream;
 
--- old/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopStart.java	2015-05-29 17:09:51.409537792 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopStart.java	2015-05-29 17:09:51.233537798 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBufferWavetable getLoopStart method */
+   @summary Test ModelByteBufferWavetable getLoopStart method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.ByteArrayOutputStream;
 
--- old/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetPitchCorrection.java	2015-05-29 17:09:51.857537777 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetPitchCorrection.java	2015-05-29 17:09:51.685537783 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBufferWavetable getPitchCorrect method */
+   @summary Test ModelByteBufferWavetable getPitchCorrect method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.ByteArrayOutputStream;
 
--- old/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java	2015-05-29 17:09:52.325537761 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java	2015-05-29 17:09:52.153537767 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBufferWavetable(ModelByteBuffer)  method */
+   @summary Test ModelByteBufferWavetable(ModelByteBuffer)  method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.ByteArrayOutputStream;
 
--- old/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormat.java	2015-05-29 17:09:52.801537745 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormat.java	2015-05-29 17:09:52.625537751 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBufferWavetable(ModelByteBuffer, AudioFormat)  method */
+   @summary Test ModelByteBufferWavetable(ModelByteBuffer, AudioFormat)  method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.ByteArrayOutputStream;
 
--- old/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormatFloat.java	2015-05-29 17:09:53.257537730 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormatFloat.java	2015-05-29 17:09:53.085537736 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBufferWavetable(ModelByteBuffer, AudioFormat)  method */
+   @summary Test ModelByteBufferWavetable(ModelByteBuffer, AudioFormat)  method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.ByteArrayOutputStream;
 
--- old/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferFloat.java	2015-05-29 17:09:53.813537712 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferFloat.java	2015-05-29 17:09:53.637537717 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBufferWavetable(ModelByteBuffer, AudioFormat, float)  method */
+   @summary Test ModelByteBufferWavetable(ModelByteBuffer, AudioFormat, float)  method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.ByteArrayOutputStream;
 
--- old/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Open.java	2015-05-29 17:09:54.253537697 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Open.java	2015-05-29 17:09:54.081537703 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBufferWavetable open method */
+   @summary Test ModelByteBufferWavetable open method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.ByteArrayOutputStream;
 
--- old/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/OpenStream.java	2015-05-29 17:09:54.705537682 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/OpenStream.java	2015-05-29 17:09:54.525537688 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -22,8 +22,10 @@
  */
 
 /* @test
- @summary Test AudioFloatInputStream.getFrameLength() returned from
- ModelByteBufferWavetable openStream method */
+   @summary Test AudioFloatInputStream.getFrameLength() returned from
+   ModelByteBufferWavetable openStream method 
+   @modules java.desktop/com.sun.media.sound 
+*/
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
--- old/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Set8BitExtensionBuffer.java	2015-05-29 17:09:55.149537667 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Set8BitExtensionBuffer.java	2015-05-29 17:09:54.985537672 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBufferWavetable set8BitExtensionBuffer method */
+   @summary Test ModelByteBufferWavetable set8BitExtensionBuffer method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.ByteArrayOutputStream;
 
--- old/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/SetLoopType.java	2015-05-29 17:09:55.609537651 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/SetLoopType.java	2015-05-29 17:09:55.433537657 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBufferWavetable SetLoopType method */
+   @summary Test ModelByteBufferWavetable SetLoopType method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.ByteArrayOutputStream;
 
--- old/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestination.java	2015-05-29 17:09:56.057537636 +0300
+++ new/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestination.java	2015-05-29 17:09:55.881537642 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelDestination constructor */
+   @summary Test ModelDestination constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestinationModelIdentifier.java	2015-05-29 17:09:56.521537621 +0300
+++ new/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestinationModelIdentifier.java	2015-05-29 17:09:56.337537627 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelDestination(ModelIdentifier) constructor */
+   @summary Test ModelDestination(ModelIdentifier) constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelDestination/SetIdentifier.java	2015-05-29 17:09:56.981537605 +0300
+++ new/test/javax/sound/midi/Gervill/ModelDestination/SetIdentifier.java	2015-05-29 17:09:56.793537612 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBufferWavetable setIdentifier(ModelIdentifier) method */
+   @summary Test ModelByteBufferWavetable setIdentifier(ModelIdentifier) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelDestination/SetTransform.java	2015-05-29 17:09:57.441537590 +0300
+++ new/test/javax/sound/midi/Gervill/ModelDestination/SetTransform.java	2015-05-29 17:09:57.269537596 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelByteBufferWavetable setTransform(ModelTransform) method */
+   @summary Test ModelByteBufferWavetable setTransform(ModelTransform) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelIdentifier/EqualsObject.java	2015-05-29 17:09:57.905537574 +0300
+++ new/test/javax/sound/midi/Gervill/ModelIdentifier/EqualsObject.java	2015-05-29 17:09:57.713537581 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelIdentifier equals method */
+   @summary Test ModelIdentifier equals method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierString.java	2015-05-29 17:09:58.353537559 +0300
+++ new/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierString.java	2015-05-29 17:09:58.181537565 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelIdentifier(String) constructor */
+   @summary Test ModelIdentifier(String) constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringInt.java	2015-05-29 17:09:58.793537545 +0300
+++ new/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringInt.java	2015-05-29 17:09:58.621537551 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelIdentifier(String, integer) constructor */
+   @summary Test ModelIdentifier(String, integer) constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringString.java	2015-05-29 17:09:59.253537529 +0300
+++ new/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringString.java	2015-05-29 17:09:59.077537535 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelIdentifier(String,String) constructor */
+   @summary Test ModelIdentifier(String,String) constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java	2015-05-29 17:09:59.725537514 +0300
+++ new/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java	2015-05-29 17:09:59.541537520 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelIdentifier(String,String,int) constructor */
+   @summary Test ModelIdentifier(String,String,int) constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelIdentifier/SetInstance.java	2015-05-29 17:10:00.161537499 +0300
+++ new/test/javax/sound/midi/Gervill/ModelIdentifier/SetInstance.java	2015-05-29 17:09:59.993537505 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelIdentifier setInstance method */
+   @summary Test ModelIdentifier setInstance method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelIdentifier/SetObject.java	2015-05-29 17:10:00.621537484 +0300
+++ new/test/javax/sound/midi/Gervill/ModelIdentifier/SetObject.java	2015-05-29 17:10:00.445537489 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelIdentifier setObject method */
+   @summary Test ModelIdentifier setObject method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelIdentifier/SetVariable.java	2015-05-29 17:10:01.077537468 +0300
+++ new/test/javax/sound/midi/Gervill/ModelIdentifier/SetVariable.java	2015-05-29 17:10:00.897537474 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelIdentifier setVariable method */
+   @summary Test ModelIdentifier setVariable method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelPerformer/GetOscillators.java	2015-05-29 17:10:01.529537453 +0300
+++ new/test/javax/sound/midi/Gervill/ModelPerformer/GetOscillators.java	2015-05-29 17:10:01.361537459 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelPerformer getOscillators method */
+   @summary Test ModelPerformer getOscillators method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelPerformer/SetConnectionBlocks.java	2015-05-29 17:10:01.993537438 +0300
+++ new/test/javax/sound/midi/Gervill/ModelPerformer/SetConnectionBlocks.java	2015-05-29 17:10:01.821537443 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelPerformer setConnectionBlocks method */
+   @summary Test ModelPerformer setConnectionBlocks method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelPerformer/SetDefaultConnectionsEnabled.java	2015-05-29 17:10:02.445537422 +0300
+++ new/test/javax/sound/midi/Gervill/ModelPerformer/SetDefaultConnectionsEnabled.java	2015-05-29 17:10:02.273537428 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelPerformer setDefaultConnectionsEnabled method */
+   @summary Test ModelPerformer setDefaultConnectionsEnabled method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelPerformer/SetExclusiveClass.java	2015-05-29 17:10:02.913537407 +0300
+++ new/test/javax/sound/midi/Gervill/ModelPerformer/SetExclusiveClass.java	2015-05-29 17:10:02.733537413 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelPerformer setExclusiveClass method */
+   @summary Test ModelPerformer setExclusiveClass method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyFrom.java	2015-05-29 17:10:03.369537391 +0300
+++ new/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyFrom.java	2015-05-29 17:10:03.189537398 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelPerformer setKeyFrom method */
+   @summary Test ModelPerformer setKeyFrom method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyTo.java	2015-05-29 17:10:03.837537376 +0300
+++ new/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyTo.java	2015-05-29 17:10:03.661537382 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelPerformer setKeyTo method */
+   @summary Test ModelPerformer setKeyTo method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelPerformer/SetName.java	2015-05-29 17:10:04.293537361 +0300
+++ new/test/javax/sound/midi/Gervill/ModelPerformer/SetName.java	2015-05-29 17:10:04.117537366 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelPerformer setName method */
+   @summary Test ModelPerformer setName method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelPerformer/SetSelfNonExclusive.java	2015-05-29 17:10:04.741537346 +0300
+++ new/test/javax/sound/midi/Gervill/ModelPerformer/SetSelfNonExclusive.java	2015-05-29 17:10:04.565537351 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelPerformer setSelfNonExclusive method */
+   @summary Test ModelPerformer setSelfNonExclusive method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelPerformer/SetVelFrom.java	2015-05-29 17:10:05.201537330 +0300
+++ new/test/javax/sound/midi/Gervill/ModelPerformer/SetVelFrom.java	2015-05-29 17:10:05.029537336 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelPerformer setVelFrom method */
+   @summary Test ModelPerformer setVelFrom method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelPerformer/SetVelTo.java	2015-05-29 17:10:05.741537312 +0300
+++ new/test/javax/sound/midi/Gervill/ModelPerformer/SetVelTo.java	2015-05-29 17:10:05.477537321 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelPerformer setVelTo method */
+   @summary Test ModelPerformer setVelTo method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelSource/NewModelSource.java	2015-05-29 17:10:06.205537297 +0300
+++ new/test/javax/sound/midi/Gervill/ModelSource/NewModelSource.java	2015-05-29 17:10:06.025537303 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelSource() constructor */
+   @summary Test ModelSource() constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifier.java	2015-05-29 17:10:06.645537282 +0300
+++ new/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifier.java	2015-05-29 17:10:06.477537287 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelSource(ModelIdentifier) constructor */
+   @summary Test ModelSource(ModelIdentifier) constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBoolean.java	2015-05-29 17:10:07.105537266 +0300
+++ new/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBoolean.java	2015-05-29 17:10:06.933537272 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelSource(ModelIdentifier,boolean) constructor */
+   @summary Test ModelSource(ModelIdentifier,boolean) constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBoolean.java	2015-05-29 17:10:07.569537251 +0300
+++ new/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBoolean.java	2015-05-29 17:10:07.393537257 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelSource(ModelIdentifier,boolean,boolean) constructor */
+   @summary Test ModelSource(ModelIdentifier,boolean,boolean) constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBooleanInt.java	2015-05-29 17:10:08.029537235 +0300
+++ new/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBooleanInt.java	2015-05-29 17:10:07.853537241 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelSource(ModelIdentifier,boolean,boolean,int) constructor */
+   @summary Test ModelSource(ModelIdentifier,boolean,boolean,int) constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierModelTransform.java	2015-05-29 17:10:08.497537220 +0300
+++ new/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierModelTransform.java	2015-05-29 17:10:08.321537226 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelSource(ModelIdentifier,ModelTransform) constructor */
+   @summary Test ModelSource(ModelIdentifier,ModelTransform) constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelSource/SetIdentifier.java	2015-05-29 17:10:08.961537204 +0300
+++ new/test/javax/sound/midi/Gervill/ModelSource/SetIdentifier.java	2015-05-29 17:10:08.781537210 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelSource setIdentifier method */
+   @summary Test ModelSource setIdentifier method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelSource/SetTransform.java	2015-05-29 17:10:09.417537189 +0300
+++ new/test/javax/sound/midi/Gervill/ModelSource/SetTransform.java	2015-05-29 17:10:09.237537195 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelSource setTransform method */
+   @summary Test ModelSource setTransform method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelStandardIndexedDirector/ModelStandardIndexedDirectorTest.java	2015-05-29 17:10:09.865537174 +0300
+++ new/test/javax/sound/midi/Gervill/ModelStandardIndexedDirector/ModelStandardIndexedDirectorTest.java	2015-05-29 17:10:09.689537180 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelStandardIndexedDirector class */
+   @summary Test ModelStandardIndexedDirector class 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.util.ArrayList;
 import java.util.List;
--- old/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransform.java	2015-05-29 17:10:10.333537158 +0300
+++ new/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransform.java	2015-05-29 17:10:10.153537164 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelStandardTransform constructor */
+   @summary Test ModelStandardTransform constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBoolean.java	2015-05-29 17:10:10.797537143 +0300
+++ new/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBoolean.java	2015-05-29 17:10:10.621537149 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelStandardTransform(boolean) constructor */
+   @summary Test ModelStandardTransform(boolean) constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBoolean.java	2015-05-29 17:10:11.273537127 +0300
+++ new/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBoolean.java	2015-05-29 17:10:11.085537133 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelStandardTransform(boolean,boolean) constructor */
+   @summary Test ModelStandardTransform(boolean,boolean) constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBooleanInt.java	2015-05-29 17:10:11.729537112 +0300
+++ new/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBooleanInt.java	2015-05-29 17:10:11.561537117 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelStandardTransform(boolean,boolean,int) constructor */
+   @summary Test ModelStandardTransform(boolean,boolean,int) constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelStandardTransform/SetDirection.java	2015-05-29 17:10:12.181537096 +0300
+++ new/test/javax/sound/midi/Gervill/ModelStandardTransform/SetDirection.java	2015-05-29 17:10:12.013537102 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test ModelStandardTransform setDirection method */
+   @summary Test ModelStandardTransform setDirection method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/RiffReaderWriter/Available.java	2015-05-29 17:10:12.625537082 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/Available.java	2015-05-29 17:10:12.461537087 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test RiffReader available method */
+   @summary Test RiffReader available method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileInputStream;
--- old/test/javax/sound/midi/Gervill/RiffReaderWriter/Close.java	2015-05-29 17:10:13.073537066 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/Close.java	2015-05-29 17:10:12.901537072 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test RiffReader close method */
+   @summary Test RiffReader close method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileInputStream;
--- old/test/javax/sound/midi/Gervill/RiffReaderWriter/GetFilePointer.java	2015-05-29 17:10:13.529537051 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/GetFilePointer.java	2015-05-29 17:10:13.353537057 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test RiffReader getFilePointer method */
+   @summary Test RiffReader getFilePointer method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileInputStream;
--- old/test/javax/sound/midi/Gervill/RiffReaderWriter/GetSize.java	2015-05-29 17:10:13.993537036 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/GetSize.java	2015-05-29 17:10:13.821537041 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test RiffReader getSize method */
+   @summary Test RiffReader getSize method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileInputStream;
--- old/test/javax/sound/midi/Gervill/RiffReaderWriter/HasNextChunk.java	2015-05-29 17:10:14.445537021 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/HasNextChunk.java	2015-05-29 17:10:14.273537026 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test RiffReader hasNextChunk method */
+   @summary Test RiffReader hasNextChunk method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileInputStream;
--- old/test/javax/sound/midi/Gervill/RiffReaderWriter/Read.java	2015-05-29 17:10:14.909537005 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/Read.java	2015-05-29 17:10:14.741537011 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test RiffReader read method */
+   @summary Test RiffReader read method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileInputStream;
--- old/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByte.java	2015-05-29 17:10:15.361536990 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByte.java	2015-05-29 17:10:15.181536996 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test RiffReader read(byte) method */
+   @summary Test RiffReader read(byte) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileInputStream;
--- old/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByteArrayIntInt.java	2015-05-29 17:10:15.801536975 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByteArrayIntInt.java	2015-05-29 17:10:15.633536981 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test RiffReader read(byte[], int, int) method */
+   @summary Test RiffReader read(byte[], int, int) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileInputStream;
--- old/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadInt.java	2015-05-29 17:10:16.249536960 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadInt.java	2015-05-29 17:10:16.073536966 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test RiffReader readInt method */
+   @summary Test RiffReader readInt method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileInputStream;
--- old/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadLong.java	2015-05-29 17:10:16.713536945 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadLong.java	2015-05-29 17:10:16.529536951 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test RiffReader readLong method */
+   @summary Test RiffReader readLong method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileInputStream;
--- old/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadShort.java	2015-05-29 17:10:17.269536926 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadShort.java	2015-05-29 17:10:17.005536935 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test RiffReader readShort method */
+   @summary Test RiffReader readShort method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileInputStream;
--- old/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadString.java	2015-05-29 17:10:17.705536911 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadString.java	2015-05-29 17:10:17.537536917 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test RiffReader readString method */
+   @summary Test RiffReader readString method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileInputStream;
--- old/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedByte.java	2015-05-29 17:10:18.145536897 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedByte.java	2015-05-29 17:10:17.973536902 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test RiffReader readUnsignedByte method */
+   @summary Test RiffReader readUnsignedByte method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileInputStream;
--- old/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedInt.java	2015-05-29 17:10:18.605536881 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedInt.java	2015-05-29 17:10:18.429536887 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test RiffReader readUnsignedInt method */
+   @summary Test RiffReader readUnsignedInt method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileInputStream;
--- old/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedShort.java	2015-05-29 17:10:19.045536866 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedShort.java	2015-05-29 17:10:18.877536872 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test RiffReader readUnsignedShort method */
+   @summary Test RiffReader readUnsignedShort method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileInputStream;
--- old/test/javax/sound/midi/Gervill/RiffReaderWriter/Skip.java	2015-05-29 17:10:19.505536851 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/Skip.java	2015-05-29 17:10:19.325536857 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test RiffReader skip method */
+   @summary Test RiffReader skip method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileInputStream;
--- old/test/javax/sound/midi/Gervill/RiffReaderWriter/WriteOutputStream.java	2015-05-29 17:10:19.941536836 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/WriteOutputStream.java	2015-05-29 17:10:19.777536842 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test RiffWriter(OutputStream) constructor */
+   @summary Test RiffWriter(OutputStream) constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
--- old/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankFile.java	2015-05-29 17:10:20.385536822 +0300
+++ new/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankFile.java	2015-05-29 17:10:20.213536827 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
- @summary Test SF2SoundbankReader getSoundbank(File) method */
+ @summary Test SF2SoundbankReader getSoundbank(File) method 
+ @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 
--- old/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream.java	2015-05-29 17:10:20.825536807 +0300
+++ new/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream.java	2015-05-29 17:10:20.657536813 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
- @summary Test SF2SoundbankReader getSoundbank(InputStream) method */
+ @summary Test SF2SoundbankReader getSoundbank(InputStream) method 
+ @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.BufferedInputStream;
 import java.io.File;
--- old/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream2.java	2015-05-29 17:10:21.277536792 +0300
+++ new/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream2.java	2015-05-29 17:10:21.101536798 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -23,7 +23,9 @@
 
 /* @test
  @summary Test SF2SoundbankReader getSoundbank(InputStream) method using
-     very bad InputStream which can only read 1 byte at time */
+     very bad InputStream which can only read 1 byte at time 
+ @modules java.desktop/com.sun.media.sound 
+*/
 
 import java.io.BufferedInputStream;
 import java.io.File;
--- old/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankUrl.java	2015-05-29 17:10:21.729536777 +0300
+++ new/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankUrl.java	2015-05-29 17:10:21.549536783 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
- @summary Test SF2SoundbankReader getSoundbank(File) method */
+ @summary Test SF2SoundbankReader getSoundbank(File) method 
+ @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.net.URL;
--- old/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrument.java	2015-05-29 17:10:22.177536762 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrument.java	2015-05-29 17:10:22.005536767 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SimpleInstrument add(ModelInstrument) method */
+   @summary Test SimpleInstrument add(ModelInstrument) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.sampled.*;
 
--- old/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntInt.java	2015-05-29 17:10:22.629536746 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntInt.java	2015-05-29 17:10:22.457536752 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SimpleInstrument add(ModelInstrument,int,int) method */
+   @summary Test SimpleInstrument add(ModelInstrument,int,int) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.sampled.*;
 
--- old/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntInt.java	2015-05-29 17:10:23.081536731 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntInt.java	2015-05-29 17:10:22.905536737 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SimpleInstrument add(ModelInstrument,int,int,int,int) method */
+   @summary Test SimpleInstrument add(ModelInstrument,int,int,int,int) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.sampled.*;
 
--- old/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntIntInt.java	2015-05-29 17:10:23.517536717 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntIntInt.java	2015-05-29 17:10:23.345536722 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SimpleInstrument add(ModelInstrument,int,int,int,int,int) method */
+   @summary Test SimpleInstrument add(ModelInstrument,int,int,int,int,int) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.sampled.*;
 
--- old/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformer.java	2015-05-29 17:10:23.973536701 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformer.java	2015-05-29 17:10:23.793536707 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SimpleInstrument add(ModelPerformer) method */
+   @summary Test SimpleInstrument add(ModelPerformer) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.sampled.*;
 
--- old/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArray.java	2015-05-29 17:10:24.421536686 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArray.java	2015-05-29 17:10:24.249536692 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SimpleInstrument add(ModelPerformer[]) method */
+   @summary Test SimpleInstrument add(ModelPerformer[]) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.sampled.*;
 
--- old/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntInt.java	2015-05-29 17:10:24.873536671 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntInt.java	2015-05-29 17:10:24.701536677 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SimpleInstrument add(ModelPerformer[],int,int) method */
+   @summary Test SimpleInstrument add(ModelPerformer[],int,int) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.sampled.*;
 
--- old/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntInt.java	2015-05-29 17:10:25.325536656 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntInt.java	2015-05-29 17:10:25.153536662 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SimpleInstrument add(ModelPerformer[],int,int,int,int) method */
+   @summary Test SimpleInstrument add(ModelPerformer[],int,int,int,int) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.sampled.*;
 
--- old/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntIntInt.java	2015-05-29 17:10:25.797536640 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntIntInt.java	2015-05-29 17:10:25.621536646 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SimpleInstrument add(ModelPerformer[],int,int,int,int,int) method */
+   @summary Test SimpleInstrument add(ModelPerformer[],int,int,int,int,int) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.sampled.*;
 
--- old/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntInt.java	2015-05-29 17:10:26.249536625 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntInt.java	2015-05-29 17:10:26.073536631 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SimpleInstrument add(ModelPerformer,int,int) method */
+   @summary Test SimpleInstrument add(ModelPerformer,int,int) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.sampled.*;
 
--- old/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntInt.java	2015-05-29 17:10:26.705536610 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntInt.java	2015-05-29 17:10:26.521536616 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SimpleInstrument add(ModelPerformer,int,int,int,int) method */
+   @summary Test SimpleInstrument add(ModelPerformer,int,int,int,int) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.sampled.*;
 
--- old/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntIntInt.java	2015-05-29 17:10:27.153536595 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntIntInt.java	2015-05-29 17:10:26.973536601 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SimpleInstrument add(ModelPerformer,int,int,int,int,int) method */
+   @summary Test SimpleInstrument add(ModelPerformer,int,int,int,int,int) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.sampled.*;
 
--- old/test/javax/sound/midi/Gervill/SimpleInstrument/Clear.java	2015-05-29 17:10:27.601536580 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/Clear.java	2015-05-29 17:10:27.425536586 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SimpleInstrument clear method */
+   @summary Test SimpleInstrument clear method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.sampled.*;
 
--- old/test/javax/sound/midi/Gervill/SimpleInstrument/SetName.java	2015-05-29 17:10:28.129536562 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/SetName.java	2015-05-29 17:10:27.881536571 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SimpleInstrument setName(String) method */
+   @summary Test SimpleInstrument setName(String) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.sampled.*;
 
--- old/test/javax/sound/midi/Gervill/SimpleInstrument/SetPatch.java	2015-05-29 17:10:28.577536547 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/SetPatch.java	2015-05-29 17:10:28.401536553 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SimpleInstrument setPatch(Patch) method */
+   @summary Test SimpleInstrument setPatch(Patch) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.Patch;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SimpleSoundbank/AddInstrument.java	2015-05-29 17:10:29.029536532 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleSoundbank/AddInstrument.java	2015-05-29 17:10:28.857536538 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SimpleSoundbank addInstrument method */
+   @summary Test SimpleSoundbank addInstrument method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.Patch;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SimpleSoundbank/AddResource.java	2015-05-29 17:10:29.489536517 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleSoundbank/AddResource.java	2015-05-29 17:10:29.313536523 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SimpleSoundbank addResource method */
+   @summary Test SimpleSoundbank addResource method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.SoundbankResource;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SimpleSoundbank/GetInstrument.java	2015-05-29 17:10:29.933536502 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleSoundbank/GetInstrument.java	2015-05-29 17:10:29.765536507 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SimpleSoundbank getInstrument method */
+   @summary Test SimpleSoundbank getInstrument method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.Patch;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SimpleSoundbank/RemoveInstrument.java	2015-05-29 17:10:30.377536487 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleSoundbank/RemoveInstrument.java	2015-05-29 17:10:30.205536493 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SimpleSoundbank removeInstrument method */
+   @summary Test SimpleSoundbank removeInstrument method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.Patch;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SimpleSoundbank/SetDescription.java	2015-05-29 17:10:30.825536472 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleSoundbank/SetDescription.java	2015-05-29 17:10:30.645536478 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SimpleSoundbank setDescription method */
+   @summary Test SimpleSoundbank setDescription method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.sampled.*;
 
--- old/test/javax/sound/midi/Gervill/SimpleSoundbank/SetName.java	2015-05-29 17:10:31.289536456 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleSoundbank/SetName.java	2015-05-29 17:10:31.109536462 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SimpleSoundbank setName method */
+   @summary Test SimpleSoundbank setName method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.sampled.*;
 
--- old/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVendor.java	2015-05-29 17:10:31.733536442 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVendor.java	2015-05-29 17:10:31.565536447 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SimpleSoundbank setVendor method */
+   @summary Test SimpleSoundbank setVendor method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.sampled.*;
 
--- old/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVersion.java	2015-05-29 17:10:32.185536426 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVersion.java	2015-05-29 17:10:32.013536432 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SimpleSoundbank setVersion method */
+   @summary Test SimpleSoundbank setVersion method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.sampled.*;
 
--- old/test/javax/sound/midi/Gervill/SoftAudioBuffer/Array.java	2015-05-29 17:10:32.641536411 +0300
+++ new/test/javax/sound/midi/Gervill/SoftAudioBuffer/Array.java	2015-05-29 17:10:32.465536417 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftAudioBuffer array method */
+   @summary Test SoftAudioBuffer array method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.Patch;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftAudioBuffer/Clear.java	2015-05-29 17:10:33.093536396 +0300
+++ new/test/javax/sound/midi/Gervill/SoftAudioBuffer/Clear.java	2015-05-29 17:10:32.917536402 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftAudioBuffer clear method */
+   @summary Test SoftAudioBuffer clear method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.Patch;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftAudioBuffer/Get.java	2015-05-29 17:10:33.561536380 +0300
+++ new/test/javax/sound/midi/Gervill/SoftAudioBuffer/Get.java	2015-05-29 17:10:33.381536386 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftAudioBuffer get method */
+   @summary Test SoftAudioBuffer get method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.Patch;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftAudioBuffer/NewSoftAudioBuffer.java	2015-05-29 17:10:34.033536365 +0300
+++ new/test/javax/sound/midi/Gervill/SoftAudioBuffer/NewSoftAudioBuffer.java	2015-05-29 17:10:33.853536371 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftAudioBuffer constructor */
+   @summary Test SoftAudioBuffer constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.Patch;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetFormat.java	2015-05-29 17:10:34.485536349 +0300
+++ new/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetFormat.java	2015-05-29 17:10:34.317536355 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftAudioSynthesizer getFormat method */
+   @summary Test SoftAudioSynthesizer getFormat method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiUnavailableException;
 import javax.sound.midi.Patch;
--- old/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetPropertyInfo.java	2015-05-29 17:10:34.929536335 +0300
+++ new/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetPropertyInfo.java	2015-05-29 17:10:34.757536340 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftAudioSynthesizer getPropertyInfo method */
+   @summary Test SoftAudioSynthesizer getPropertyInfo method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.Patch;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/Open.java	2015-05-29 17:10:35.385536319 +0300
+++ new/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/Open.java	2015-05-29 17:10:35.213536325 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftAudioSynthesizer open method */
+   @summary Test SoftAudioSynthesizer open method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.Patch;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/OpenStream.java	2015-05-29 17:10:35.833536304 +0300
+++ new/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/OpenStream.java	2015-05-29 17:10:35.661536310 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftAudioSynthesizer openStream method */
+   @summary Test SoftAudioSynthesizer openStream method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.Patch;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftChannel/AllNotesOff.java	2015-05-29 17:10:36.277536289 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/AllNotesOff.java	2015-05-29 17:10:36.109536295 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftChannel allNotesOff method */
+   @summary Test SoftChannel allNotesOff method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftChannel/AllSoundOff.java	2015-05-29 17:10:36.733536274 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/AllSoundOff.java	2015-05-29 17:10:36.545536280 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftChannel allSoundOff method */
+   @summary Test SoftChannel allSoundOff method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftChannel/ChannelPressure.java	2015-05-29 17:10:37.181536259 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/ChannelPressure.java	2015-05-29 17:10:37.013536265 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftChannel channelPressure method */
+   @summary Test SoftChannel channelPressure method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftChannel/Controller.java	2015-05-29 17:10:37.621536244 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/Controller.java	2015-05-29 17:10:37.449536250 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftChannel controller method */
+   @summary Test SoftChannel controller method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftChannel/LocalControl.java	2015-05-29 17:10:38.077536229 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/LocalControl.java	2015-05-29 17:10:37.909536235 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftChannel localControl method */
+   @summary Test SoftChannel localControl method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftChannel/Mono.java	2015-05-29 17:10:38.545536213 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/Mono.java	2015-05-29 17:10:38.365536219 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftChannel mono method */
+   @summary Test SoftChannel mono method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftChannel/Mute.java	2015-05-29 17:10:39.005536198 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/Mute.java	2015-05-29 17:10:38.813536204 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftChannel mute method */
+   @summary Test SoftChannel mute method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftChannel/NoteOff.java	2015-05-29 17:10:39.557536180 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/NoteOff.java	2015-05-29 17:10:39.301536188 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftChannel noteOff method */
+   @summary Test SoftChannel noteOff method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftChannel/NoteOff2.java	2015-05-29 17:10:40.025536164 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/NoteOff2.java	2015-05-29 17:10:39.845536170 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftChannel noteOff method */
+   @summary Test SoftChannel noteOff method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftChannel/NoteOn.java	2015-05-29 17:10:40.485536148 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/NoteOn.java	2015-05-29 17:10:40.305536154 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftChannel noteOn method */
+   @summary Test SoftChannel noteOn method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest.java	2015-05-29 17:10:40.937536133 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest.java	2015-05-29 17:10:40.757536139 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftChannel noteOn/noteOff overflow test */
+   @summary Test SoftChannel noteOn/noteOff overflow test 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiChannel;
 import javax.sound.midi.VoiceStatus;
--- old/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java	2015-05-29 17:10:41.385536118 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java	2015-05-29 17:10:41.201536124 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftChannel overflow test 2 */
+   @summary Test SoftChannel overflow test 2 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.util.HashMap;
 import java.util.Map;
--- old/test/javax/sound/midi/Gervill/SoftChannel/Omni.java	2015-05-29 17:10:41.833536103 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/Omni.java	2015-05-29 17:10:41.657536109 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftChannel omni method */
+   @summary Test SoftChannel omni method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftFilter/TestProcessAudio.java	2015-05-29 17:10:42.293536088 +0300
+++ new/test/javax/sound/midi/Gervill/SoftFilter/TestProcessAudio.java	2015-05-29 17:10:42.113536094 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftFilter processAudio method */
+   @summary Test SoftFilter processAudio method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java	2015-05-29 17:10:42.721536074 +0300
+++ new/test/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java	2015-05-29 17:10:42.553536079 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftLanczosResampler interpolate method */
+   @summary Test SoftLanczosResampler interpolate method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix.java	2015-05-29 17:10:43.177536058 +0300
+++ new/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix.java	2015-05-29 17:10:42.997536064 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftLimiter processAudio method */
+   @summary Test SoftLimiter processAudio method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiUnavailableException;
 import javax.sound.midi.Patch;
--- old/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono.java	2015-05-29 17:10:43.625536043 +0300
+++ new/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono.java	2015-05-29 17:10:43.457536049 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftLimiter processAudio method */
+   @summary Test SoftLimiter processAudio method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiUnavailableException;
 import javax.sound.midi.Patch;
--- old/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java	2015-05-29 17:10:44.081536028 +0300
+++ new/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java	2015-05-29 17:10:43.901536034 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftLimiter processAudio method */
+   @summary Test SoftLimiter processAudio method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 
 import javax.sound.midi.MidiUnavailableException;
--- old/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_overdrive.java	2015-05-29 17:10:44.533536013 +0300
+++ new/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_overdrive.java	2015-05-29 17:10:44.365536018 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftLimiter processAudio method */
+   @summary Test SoftLimiter processAudio method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiUnavailableException;
 import javax.sound.midi.Patch;
--- old/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal.java	2015-05-29 17:10:44.977535998 +0300
+++ new/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal.java	2015-05-29 17:10:44.809536004 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftLimiter processAudio method */
+   @summary Test SoftLimiter processAudio method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiUnavailableException;
 import javax.sound.midi.Patch;
--- old/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal_mono.java	2015-05-29 17:10:45.429535983 +0300
+++ new/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal_mono.java	2015-05-29 17:10:45.257535989 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftLimiter processAudio method */
+   @summary Test SoftLimiter processAudio method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiUnavailableException;
 import javax.sound.midi.Patch;
--- old/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive.java	2015-05-29 17:10:45.893535967 +0300
+++ new/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive.java	2015-05-29 17:10:45.721535973 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftLimiter processAudio method */
+   @summary Test SoftLimiter processAudio method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiUnavailableException;
 import javax.sound.midi.Patch;
--- old/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive_mono.java	2015-05-29 17:10:46.329535953 +0300
+++ new/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive_mono.java	2015-05-29 17:10:46.161535958 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftLimiter processAudio method */
+   @summary Test SoftLimiter processAudio method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiUnavailableException;
 import javax.sound.midi.Patch;
--- old/test/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java	2015-05-29 17:10:46.769535938 +0300
+++ new/test/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java	2015-05-29 17:10:46.601535944 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftLinearResampler interpolate method */
+   @summary Test SoftLinearResampler interpolate method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java	2015-05-29 17:10:47.225535923 +0300
+++ new/test/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java	2015-05-29 17:10:47.049535929 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftLinearResampler2 interpolate method */
+   @summary Test SoftLinearResampler2 interpolate method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/SoftLowFrequencyOscillator/TestProcessControlLogic.java	2015-05-29 17:10:47.661535908 +0300
+++ new/test/javax/sound/midi/Gervill/SoftLowFrequencyOscillator/TestProcessControlLogic.java	2015-05-29 17:10:47.497535914 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
- @summary Test SoftLowFrequencyOscillator processControlLogic method */
+ @summary Test SoftLowFrequencyOscillator processControlLogic method 
+ @modules java.desktop/com.sun.media.sound
+*/
 
 import com.sun.media.sound.AudioSynthesizerPropertyInfo;
 import com.sun.media.sound.SoftLowFrequencyOscillator;
--- old/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java	2015-05-29 17:10:48.113535893 +0300
+++ new/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java	2015-05-29 17:10:47.945535899 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftPointResampler interpolate method */
+   @summary Test SoftPointResampler interpolate method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/SoftProvider/GetDevice.java	2015-05-29 17:10:48.557535878 +0300
+++ new/test/javax/sound/midi/Gervill/SoftProvider/GetDevice.java	2015-05-29 17:10:48.385535884 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftProvider getDevice method */
+   @summary Test SoftProvider getDevice method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiDevice;
 import javax.sound.midi.MidiUnavailableException;
--- old/test/javax/sound/midi/Gervill/SoftReceiver/Close.java	2015-05-29 17:10:49.001535863 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Close.java	2015-05-29 17:10:48.833535869 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftReceiver close method */
+   @summary Test SoftReceiver close method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java	2015-05-29 17:10:49.469535848 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java	2015-05-29 17:10:49.289535854 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
- @summary Test SoftReceiver getMidiDevice method */
+ @summary Test SoftReceiver getMidiDevice method 
+ @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.Receiver;
 
--- old/test/javax/sound/midi/Gervill/SoftReceiver/Send_ActiveSense.java	2015-05-29 17:10:49.941535832 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_ActiveSense.java	2015-05-29 17:10:49.765535838 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftReceiver send method */
+   @summary Test SoftReceiver send method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllNotesOff.java	2015-05-29 17:10:50.409535816 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllNotesOff.java	2015-05-29 17:10:50.209535823 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftReceiver send method */
+   @summary Test SoftReceiver send method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllSoundOff.java	2015-05-29 17:10:50.937535798 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllSoundOff.java	2015-05-29 17:10:50.757535804 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftReceiver send method */
+   @summary Test SoftReceiver send method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftReceiver/Send_ChannelPressure.java	2015-05-29 17:10:51.381535784 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_ChannelPressure.java	2015-05-29 17:10:51.205535789 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftReceiver send method */
+   @summary Test SoftReceiver send method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftReceiver/Send_Controller.java	2015-05-29 17:10:51.821535769 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_Controller.java	2015-05-29 17:10:51.653535774 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftReceiver send method */
+   @summary Test SoftReceiver send method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftReceiver/Send_Mono.java	2015-05-29 17:10:52.273535754 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_Mono.java	2015-05-29 17:10:52.097535760 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftReceiver send method */
+   @summary Test SoftReceiver send method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOff.java	2015-05-29 17:10:52.713535739 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOff.java	2015-05-29 17:10:52.545535745 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftReceiver send method */
+   @summary Test SoftReceiver send method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn.java	2015-05-29 17:10:53.161535724 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn.java	2015-05-29 17:10:52.985535730 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftReceiver send method */
+   @summary Test SoftReceiver send method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_AllChannels.java	2015-05-29 17:10:53.609535709 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_AllChannels.java	2015-05-29 17:10:53.437535715 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftReceiver send method */
+   @summary Test SoftReceiver send method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Delayed.java	2015-05-29 17:10:54.061535694 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Delayed.java	2015-05-29 17:10:53.885535700 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftReceiver send method */
+   @summary Test SoftReceiver send method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Multiple.java	2015-05-29 17:10:54.505535679 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Multiple.java	2015-05-29 17:10:54.329535685 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftReceiver send method */
+   @summary Test SoftReceiver send method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftReceiver/Send_Omni.java	2015-05-29 17:10:54.953535664 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_Omni.java	2015-05-29 17:10:54.777535670 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftReceiver send method */
+   @summary Test SoftReceiver send method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftReceiver/Send_PitchBend.java	2015-05-29 17:10:55.413535648 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_PitchBend.java	2015-05-29 17:10:55.241535654 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftReceiver send method */
+   @summary Test SoftReceiver send method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftReceiver/Send_PolyPressure.java	2015-05-29 17:10:55.869535633 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_PolyPressure.java	2015-05-29 17:10:55.697535639 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftReceiver send method */
+   @summary Test SoftReceiver send method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftReceiver/Send_ProgramChange.java	2015-05-29 17:10:56.309535618 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_ProgramChange.java	2015-05-29 17:10:56.141535624 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftReceiver send method */
+   @summary Test SoftReceiver send method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftReceiver/Send_ResetAllControllers.java	2015-05-29 17:10:56.761535603 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_ResetAllControllers.java	2015-05-29 17:10:56.581535609 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftReceiver send method */
+   @summary Test SoftReceiver send method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftSincResampler/Interpolate.java	2015-05-29 17:10:57.213535588 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSincResampler/Interpolate.java	2015-05-29 17:10:57.041535594 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftSincResampler interpolate method */
+   @summary Test SoftSincResampler interpolate method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/Close.java	2015-05-29 17:10:57.665535573 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/Close.java	2015-05-29 17:10:57.489535579 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftSynthesizer close method */
+   @summary Test SoftSynthesizer close method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiDevice;
 import javax.sound.midi.MidiUnavailableException;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments.java	2015-05-29 17:10:58.105535558 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments.java	2015-05-29 17:10:57.941535564 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftSynthesizer getAvailableInstruments method */
+   @summary Test SoftSynthesizer getAvailableInstruments method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiDevice;
 import javax.sound.midi.MidiUnavailableException;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments2.java	2015-05-29 17:10:58.549535543 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments2.java	2015-05-29 17:10:58.373535549 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
- @summary Test SoftSynthesizer getAvailableInstruments method */
+ @summary Test SoftSynthesizer getAvailableInstruments method 
+ @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiDevice;
 import javax.sound.midi.MidiUnavailableException;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/GetChannels.java	2015-05-29 17:10:59.001535528 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetChannels.java	2015-05-29 17:10:58.833535534 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftSynthesizer getChannels method */
+   @summary Test SoftSynthesizer getChannels method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiChannel;
 import javax.sound.midi.MidiDevice;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDefaultSoundbank.java	2015-05-29 17:10:59.453535513 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDefaultSoundbank.java	2015-05-29 17:10:59.281535519 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftSynthesizer getDefaultSoundbank method */
+   @summary Test SoftSynthesizer getDefaultSoundbank method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiDevice;
 import javax.sound.midi.MidiUnavailableException;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDeviceInfo.java	2015-05-29 17:10:59.901535498 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDeviceInfo.java	2015-05-29 17:10:59.729535504 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftSynthesizer getDeviceInfo method */
+   @summary Test SoftSynthesizer getDeviceInfo method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiDevice;
 import javax.sound.midi.MidiUnavailableException;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLatency.java	2015-05-29 17:11:00.353535483 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLatency.java	2015-05-29 17:11:00.173535489 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftSynthesizer getLatency method */
+   @summary Test SoftSynthesizer getLatency method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiDevice;
 import javax.sound.midi.MidiUnavailableException;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments.java	2015-05-29 17:11:00.817535468 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments.java	2015-05-29 17:11:00.649535473 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftSynthesizer getLoadedInstruments method */
+   @summary Test SoftSynthesizer getLoadedInstruments method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiDevice;
 import javax.sound.midi.MidiUnavailableException;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments2.java	2015-05-29 17:11:01.281535452 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments2.java	2015-05-29 17:11:01.105535458 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
- @summary Test SoftSynthesizer getLoadedInstruments method */
+ @summary Test SoftSynthesizer getLoadedInstruments method 
+ @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiDevice;
 import javax.sound.midi.MidiUnavailableException;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxPolyphony.java	2015-05-29 17:11:01.757535436 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxPolyphony.java	2015-05-29 17:11:01.569535442 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftSynthesizer getMaxPolyphony method */
+   @summary Test SoftSynthesizer getMaxPolyphony method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiDevice;
 import javax.sound.midi.MidiUnavailableException;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxReceivers.java	2015-05-29 17:11:02.217535421 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxReceivers.java	2015-05-29 17:11:02.045535426 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftSynthesizer getMaxReceivers method */
+   @summary Test SoftSynthesizer getMaxReceivers method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiDevice;
 import javax.sound.midi.MidiUnavailableException;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxTransmitters.java	2015-05-29 17:11:02.669535405 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxTransmitters.java	2015-05-29 17:11:02.497535411 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftSynthesizer getMaxTransmitters method */
+   @summary Test SoftSynthesizer getMaxTransmitters method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiDevice;
 import javax.sound.midi.MidiUnavailableException;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMicrosecondPosition.java	2015-05-29 17:11:03.121535390 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMicrosecondPosition.java	2015-05-29 17:11:02.937535396 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftSynthesizer getMicrosecondPosition method */
+   @summary Test SoftSynthesizer getMicrosecondPosition method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.IOException;
 
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/GetPropertyInfo.java	2015-05-29 17:11:03.653535373 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetPropertyInfo.java	2015-05-29 17:11:03.401535381 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
- @summary Test SoftSynthesizer getPropertyInfo method */
+ @summary Test SoftSynthesizer getPropertyInfo method 
+ @modules java.desktop/com.sun.media.sound
+*/
 
 import java.util.HashMap;
 import java.util.Map;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver.java	2015-05-29 17:11:04.101535358 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver.java	2015-05-29 17:11:03.925535363 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftSynthesizer getReceiver method */
+   @summary Test SoftSynthesizer getReceiver method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiDevice;
 import javax.sound.midi.MidiUnavailableException;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver2.java	2015-05-29 17:11:04.557535342 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver2.java	2015-05-29 17:11:04.385535348 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftSynthesizer getReceiver method */
+   @summary Test SoftSynthesizer getReceiver method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.Receiver;
 import javax.sound.midi.ShortMessage;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceivers.java	2015-05-29 17:11:05.105535324 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceivers.java	2015-05-29 17:11:04.941535329 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftSynthesizer getReceivers method */
+   @summary Test SoftSynthesizer getReceivers method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiDevice;
 import javax.sound.midi.MidiUnavailableException;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitter.java	2015-05-29 17:11:05.553535309 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitter.java	2015-05-29 17:11:05.381535315 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftSynthesizer getTransmitter method */
+   @summary Test SoftSynthesizer getTransmitter method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiDevice;
 import javax.sound.midi.MidiUnavailableException;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitters.java	2015-05-29 17:11:06.013535293 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitters.java	2015-05-29 17:11:05.841535299 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftSynthesizer getTransmitters method */
+   @summary Test SoftSynthesizer getTransmitters method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiDevice;
 import javax.sound.midi.MidiUnavailableException;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/GetVoiceStatus.java	2015-05-29 17:11:06.469535278 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetVoiceStatus.java	2015-05-29 17:11:06.289535284 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftSynthesizer getVoiceStatus method */
+   @summary Test SoftSynthesizer getVoiceStatus method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiDevice;
 import javax.sound.midi.MidiUnavailableException;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/ImplicitOpenClose.java	2015-05-29 17:11:06.917535263 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/ImplicitOpenClose.java	2015-05-29 17:11:06.745535269 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftSynthesizer implicit open/close using getReceiver. */
+   @summary Test SoftSynthesizer implicit open/close using getReceiver. 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.lang.reflect.Field;
 
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/IsOpen.java	2015-05-29 17:11:07.365535248 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/IsOpen.java	2015-05-29 17:11:07.193535254 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftSynthesizer isOpen method */
+   @summary Test SoftSynthesizer isOpen method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiDevice;
 import javax.sound.midi.MidiUnavailableException;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/IsSoundbankSupported.java	2015-05-29 17:11:07.809535233 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/IsSoundbankSupported.java	2015-05-29 17:11:07.641535239 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftSynthesizer isSoundbankSupported method */
+   @summary Test SoftSynthesizer isSoundbankSupported method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.Instrument;
 import javax.sound.midi.MidiDevice;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadAllInstruments.java	2015-05-29 17:11:08.273535218 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadAllInstruments.java	2015-05-29 17:11:08.093535224 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftSynthesizer loadAllInstruments method */
+   @summary Test SoftSynthesizer loadAllInstruments method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiDevice;
 import javax.sound.midi.MidiUnavailableException;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstrument.java	2015-05-29 17:11:08.741535202 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstrument.java	2015-05-29 17:11:08.561535208 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftSynthesizer loadAllInstrument method */
+   @summary Test SoftSynthesizer loadAllInstrument method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiDevice;
 import javax.sound.midi.MidiUnavailableException;
--- old/test/javax/sound/midi/Gervill/SoftTuning/GetName.java	2015-05-29 17:11:09.189535187 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/GetName.java	2015-05-29 17:11:09.017535193 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftTuning getName method */
+   @summary Test SoftTuning getName method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiUnavailableException;
 import javax.sound.midi.Patch;
--- old/test/javax/sound/midi/Gervill/SoftTuning/GetTuning.java	2015-05-29 17:11:09.633535172 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/GetTuning.java	2015-05-29 17:11:09.461535178 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftTuning getTuning method */
+   @summary Test SoftTuning getTuning method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiUnavailableException;
 import javax.sound.midi.Patch;
--- old/test/javax/sound/midi/Gervill/SoftTuning/GetTuningInt.java	2015-05-29 17:11:10.085535157 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/GetTuningInt.java	2015-05-29 17:11:09.909535163 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftTuning getTuning(int) method */
+   @summary Test SoftTuning getTuning(int) method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiUnavailableException;
 import javax.sound.midi.Patch;
--- old/test/javax/sound/midi/Gervill/SoftTuning/Load1.java	2015-05-29 17:11:10.525535142 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/Load1.java	2015-05-29 17:11:10.353535148 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftTuning load method */
+   @summary Test SoftTuning load method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.UnsupportedEncodingException;
 
--- old/test/javax/sound/midi/Gervill/SoftTuning/Load2.java	2015-05-29 17:11:10.977535127 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/Load2.java	2015-05-29 17:11:10.801535133 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftTuning load method */
+   @summary Test SoftTuning load method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiUnavailableException;
 import javax.sound.midi.Patch;
--- old/test/javax/sound/midi/Gervill/SoftTuning/Load4.java	2015-05-29 17:11:11.433535112 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/Load4.java	2015-05-29 17:11:11.265535118 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftTuning load method */
+   @summary Test SoftTuning load method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.UnsupportedEncodingException;
 
--- old/test/javax/sound/midi/Gervill/SoftTuning/Load5.java	2015-05-29 17:11:11.885535097 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/Load5.java	2015-05-29 17:11:11.709535103 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftTuning load method */
+   @summary Test SoftTuning load method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.UnsupportedEncodingException;
 
--- old/test/javax/sound/midi/Gervill/SoftTuning/Load6.java	2015-05-29 17:11:12.329535082 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/Load6.java	2015-05-29 17:11:12.157535088 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftTuning load method */
+   @summary Test SoftTuning load method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.UnsupportedEncodingException;
 
--- old/test/javax/sound/midi/Gervill/SoftTuning/Load7.java	2015-05-29 17:11:12.781535067 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/Load7.java	2015-05-29 17:11:12.609535073 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftTuning load method */
+   @summary Test SoftTuning load method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiUnavailableException;
 import javax.sound.midi.Patch;
--- old/test/javax/sound/midi/Gervill/SoftTuning/Load8.java	2015-05-29 17:11:13.217535052 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/Load8.java	2015-05-29 17:11:13.049535058 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftTuning load method */
+   @summary Test SoftTuning load method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiUnavailableException;
 import javax.sound.midi.Patch;
--- old/test/javax/sound/midi/Gervill/SoftTuning/Load9.java	2015-05-29 17:11:13.669535037 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/Load9.java	2015-05-29 17:11:13.501535043 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftTuning load method */
+   @summary Test SoftTuning load method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiUnavailableException;
 import javax.sound.midi.Patch;
--- old/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuning.java	2015-05-29 17:11:14.129535022 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuning.java	2015-05-29 17:11:13.957535027 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftTuning constructor */
+   @summary Test SoftTuning constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiUnavailableException;
 import javax.sound.midi.Patch;
--- old/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningByteArray.java	2015-05-29 17:11:14.597535006 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningByteArray.java	2015-05-29 17:11:14.421535012 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftTuning constructor */
+   @summary Test SoftTuning constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiUnavailableException;
 import javax.sound.midi.Patch;
--- old/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatch.java	2015-05-29 17:11:15.129534988 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatch.java	2015-05-29 17:11:14.885534996 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftTuning constructor */
+   @summary Test SoftTuning constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiUnavailableException;
 import javax.sound.midi.Patch;
--- old/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatchByteArray.java	2015-05-29 17:11:15.605534972 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatchByteArray.java	2015-05-29 17:11:15.429534978 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
-   @summary Test SoftTuning constructor */
+   @summary Test SoftTuning constructor 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.MidiUnavailableException;
 import javax.sound.midi.Patch;
--- old/test/javax/sound/midi/Gervill/SoftTuning/RealTimeTuning.java	2015-05-29 17:11:16.065534957 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/RealTimeTuning.java	2015-05-29 17:11:15.889534963 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -22,7 +22,9 @@
  */
 
 /* @test
- @summary Test RealTime-tunings using SoftReciver.send method */
+ @summary Test RealTime-tunings using SoftReciver.send method 
+ @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.IOException;
 
--- old/test/javax/swing/DataTransfer/6456844/bug6456844.java	2015-05-29 17:11:16.521534942 +0300
+++ new/test/javax/swing/DataTransfer/6456844/bug6456844.java	2015-05-29 17:11:16.345534947 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -25,6 +25,7 @@
    @bug 6456844
    @summary Tests that JTextComponent doesn't create drop locations with null bias.
    @author Shannon Hickey
+   @modules java.desktop/sun.swing
 */
 
 import sun.swing.SwingAccessor;
--- old/test/javax/swing/JButton/4796987/bug4796987.java	2015-05-29 17:11:16.977534926 +0300
+++ new/test/javax/swing/JButton/4796987/bug4796987.java	2015-05-29 17:11:16.801534932 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -28,6 +28,7 @@
  * @author Alexander Scherbatiy
  * @library ../../regtesthelpers
  * @library ../../../../lib/testlibrary
+ * @modules java.desktop/com.sun.java.swing.plaf.windows
  * @build jdk.testlibrary.OSInfo
  * @build Util
  * @run main bug4796987
--- old/test/javax/swing/JCheckBox/4449413/bug4449413.java	2015-05-29 17:11:17.421534911 +0300
+++ new/test/javax/swing/JCheckBox/4449413/bug4449413.java	2015-05-29 17:11:17.241534917 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -26,6 +26,7 @@
  * @summary Tests that checkbox and radiobuttons' check marks are visible when background is black
  * @author Ilya Boyandin
  * @library ../../../../lib/testlibrary
+ * @modules java.desktop/sun.awt
  * @build jdk.testlibrary.OSInfo
  * @run applet/manual=yesno bug4449413.html
  */
--- old/test/javax/swing/JColorChooser/Test6524757.java	2015-05-29 17:11:17.885534896 +0300
+++ new/test/javax/swing/JColorChooser/Test6524757.java	2015-05-29 17:11:17.709534902 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -26,6 +26,7 @@
  * @bug 6524757
  * @summary Tests different locales
  * @author Sergey Malenkov
+ * @modules java.desktop/sun.swing
  */
 
 import java.awt.Component;
--- old/test/javax/swing/JComboBox/4199622/bug4199622.java	2015-05-29 17:11:18.329534881 +0300
+++ new/test/javax/swing/JComboBox/4199622/bug4199622.java	2015-05-29 17:11:18.157534887 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -26,6 +26,7 @@
    @summary RFE: JComboBox shouldn't send ActionEvents for keyboard navigation
    @author Vladislav Karnaukhov
    @library ../../../../lib/testlibrary
+   @modules java.desktop/com.sun.java.swing.plaf.windows
    @build jdk.testlibrary.OSInfo
    @run main bug4199622
 */
--- old/test/javax/swing/JComboBox/8015300/Test8015300.java	2015-05-29 17:11:18.785534866 +0300
+++ new/test/javax/swing/JComboBox/8015300/Test8015300.java	2015-05-29 17:11:18.605534872 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -42,6 +42,7 @@
  * @summary Tests that editable combobox select all text
  * @author Sergey Malenkov
  * @library ../../../../lib/testlibrary/
+ * @modules java.desktop/com.sun.java.swing.plaf.windows
  * @build ExtendedRobot
  * @run main Test8015300
  */
--- old/test/javax/swing/JComponent/6683775/bug6683775.java	2015-05-29 17:11:19.233534851 +0300
+++ new/test/javax/swing/JComponent/6683775/bug6683775.java	2015-05-29 17:11:19.053534857 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -25,6 +25,8 @@
    @bug 6683775 6794764
    @summary Painting artifacts is seen when panel is made setOpaque(false) for a translucent window
    @author Alexander Potochkin
+   @modules java.desktop/com.sun.awt
+            java.desktop/sun.awt
    @run main bug6683775
 */
 
--- old/test/javax/swing/JFileChooser/4524490/bug4524490.java	2015-05-29 17:11:19.725534834 +0300
+++ new/test/javax/swing/JFileChooser/4524490/bug4524490.java	2015-05-29 17:11:19.533534841 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -28,6 +28,8 @@
  * @author Konstantin Eremin
  * @library ../../regtesthelpers
  * @library ../../../../lib/testlibrary
+ * @modules java.desktop/sun.awt
+ *          jdk.httpserver
  * @build Util jdk.testlibrary.OSInfo
  * @run main bug4524490
  */
--- old/test/javax/swing/JFileChooser/4847375/bug4847375.java	2015-05-29 17:11:20.173534819 +0300
+++ new/test/javax/swing/JFileChooser/4847375/bug4847375.java	2015-05-29 17:11:19.993534825 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -26,6 +26,8 @@
  * @bug 4847375
  * @summary JFileChooser Create New Folder button is disabled incorrectly
  * @author Pavel Porvatov
+ * @modules java.desktop/sun.awt
+ *          java.desktop/sun.awt.shell
  */
 
 import sun.awt.OSInfo;
--- old/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java	2015-05-29 17:11:20.637534804 +0300
+++ new/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java	2015-05-29 17:11:20.465534809 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -27,6 +27,7 @@
  * @summary Tests memory leak for 20000 files
  * @author Sergey Malenkov
  * @library ../../regtesthelpers
+ * @modules java.desktop/sun.java2d
  * @build Util
  * @run main/othervm/timeout=1000 -mx128m TwentyThousandTest
  */
--- old/test/javax/swing/JFileChooser/6550546/bug6550546.java	2015-05-29 17:11:21.101534788 +0300
+++ new/test/javax/swing/JFileChooser/6550546/bug6550546.java	2015-05-29 17:11:20.933534794 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -25,6 +25,8 @@
    @bug 6550546
    @summary Win LAF: JFileChooser -> Look in Drop down should not display any shortcuts created on desktop
    @author Pavel Porvatov
+   @modules java.desktop/sun.awt
+            java.desktop/sun.awt.shell
    @run main bug6550546
 */
 
--- old/test/javax/swing/JFileChooser/6713352/bug6713352.java	2015-05-29 17:11:21.569534772 +0300
+++ new/test/javax/swing/JFileChooser/6713352/bug6713352.java	2015-05-29 17:11:21.397534778 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -25,6 +25,7 @@
    @bug 6713352
    @summary Deadlock in JFileChooser with synchronized custom FileSystemView
    @author Pavel Porvatov
+   @modules java.desktop/sun.awt.shell
    @run main bug6713352
 */
 
--- old/test/javax/swing/JFileChooser/6741890/bug6741890.java	2015-05-29 17:11:22.025534757 +0300
+++ new/test/javax/swing/JFileChooser/6741890/bug6741890.java	2015-05-29 17:11:21.853534763 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -25,6 +25,8 @@
    @bug 6741890
    @summary Deadlock in Win32ShellFolderManager2
    @author Pavel Porvatov
+   @modules java.desktop/sun.awt
+            java.desktop/sun.awt.shell
    @run main bug6741890
 */
 
--- old/test/javax/swing/JFileChooser/6798062/bug6798062.java	2015-05-29 17:11:22.477534742 +0300
+++ new/test/javax/swing/JFileChooser/6798062/bug6798062.java	2015-05-29 17:11:22.305534748 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -25,6 +25,8 @@
    @bug 6798062
    @summary Memory Leak on using getFiles of FileSystemView
    @author Pavel Porvatov
+   @modules java.desktop/sun.awt
+            java.desktop/sun.awt.shell
    @run applet/manual=done bug6798062.html
 */
 
--- old/test/javax/swing/JFileChooser/6817933/Test6817933.java	2015-05-29 17:11:22.933534727 +0300
+++ new/test/javax/swing/JFileChooser/6817933/Test6817933.java	2015-05-29 17:11:22.761534733 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -26,6 +26,8 @@
  * @bug 6817933
  * @summary Tests that HTMLEditorKit does not affect JFileChooser
  * @author Sergey Malenkov
+ * @modules java.desktop/sun.awt
+ *          java.desktop/sun.swing
  */
 
 import java.awt.Color;
--- old/test/javax/swing/JFileChooser/6840086/bug6840086.java	2015-05-29 17:11:23.409534711 +0300
+++ new/test/javax/swing/JFileChooser/6840086/bug6840086.java	2015-05-29 17:11:23.217534717 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -26,6 +26,7 @@
    @summary JFileChooser lacks icons on top right when running on Windows 7
    @author Pavel Porvatov
    @library ../../../../lib/testlibrary
+   @modules java.desktop/sun.awt.shell
    @build jdk.testlibrary.OSInfo
    @run main bug6840086
 */
--- old/test/javax/swing/JFileChooser/6945316/bug6945316.java	2015-05-29 17:11:23.893534695 +0300
+++ new/test/javax/swing/JFileChooser/6945316/bug6945316.java	2015-05-29 17:11:23.713534701 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -25,6 +25,8 @@
    @bug 6945316
    @summary The Win32ShellFolderManager2.isFileSystemRoot can throw NPE
    @author Pavel Porvatov
+   @modules java.desktop/sun.awt
+            java.desktop/sun.awt.shell
    @run main bug6945316
 */
 
--- old/test/javax/swing/JFileChooser/8046391/bug8046391.java	2015-05-29 17:11:24.353534679 +0300
+++ new/test/javax/swing/JFileChooser/8046391/bug8046391.java	2015-05-29 17:11:24.181534685 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -27,6 +27,7 @@
  * @summary JFileChooser hangs if displayed in Windows L&F
  * @author Alexey Ivanov
  * @library ../../../../lib/testlibrary
+ * @modules java.desktop/com.sun.java.swing.plaf.windows
  * @build jdk.testlibrary.OSInfo
  * @run main/othervm/timeout=10 bug8046391
 */
--- old/test/javax/swing/JFileChooser/8080628/bug8080628.java	2015-05-29 17:11:24.809534664 +0300
+++ new/test/javax/swing/JFileChooser/8080628/bug8080628.java	2015-05-29 17:11:24.637534670 +0300
@@ -33,6 +33,7 @@
  * @bug 8080628
  * @summary No mnemonics on Open and Save buttons in JFileChooser.
  * @author Alexey Ivanov
+ * @modules java.desktop/sun.swing
  * @run main bug8080628
  */
 public class bug8080628 {
--- old/test/javax/swing/JInternalFrame/6725409/bug6725409.java	2015-05-29 17:11:25.257534649 +0300
+++ new/test/javax/swing/JInternalFrame/6725409/bug6725409.java	2015-05-29 17:11:25.089534655 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -27,6 +27,7 @@
  *          can be localized during run-time
  * @author Mikhail Lapshin
  * @library ../../../../lib/testlibrary/
+ * @modules java.desktop/com.sun.java.swing.plaf.windows
  * @build ExtendedRobot
  * @run main bug6725409
  */
--- old/test/javax/swing/JLabel/7004134/bug7004134.java	2015-05-29 17:11:25.717534634 +0300
+++ new/test/javax/swing/JLabel/7004134/bug7004134.java	2015-05-29 17:11:25.545534639 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -25,6 +25,7 @@
    @bug 7004134
    @summary JLabel containing a ToolTipText does no longer show ToolTip after browser refresh
    @author Pavel Porvatov
+   @modules java.desktop/sun.awt
 */
 
 import sun.awt.SunToolkit;
--- old/test/javax/swing/JPopupMenu/6495920/bug6495920.java	2015-05-29 17:11:26.177534618 +0300
+++ new/test/javax/swing/JPopupMenu/6495920/bug6495920.java	2015-05-29 17:11:26.005534624 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -28,6 +28,7 @@
             interaction with GNOME is not crippled
  * @author Sergey Malenkov
  * @library ../..
+ * @modules java.desktop/sun.awt
  */
 
 import sun.awt.AppContext;
--- old/test/javax/swing/JPopupMenu/7156657/bug7156657.java	2015-05-29 17:11:26.633534603 +0300
+++ new/test/javax/swing/JPopupMenu/7156657/bug7156657.java	2015-05-29 17:11:26.457534609 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -34,6 +34,8 @@
    @summary Version 7 doesn't support translucent popup menus against a translucent window
    @library ../../regtesthelpers
    @author Pavel Porvatov
+   @modules java.desktop/com.sun.awt
+            java.desktop/sun.awt
 */
 public class bug7156657 {
     private static JFrame lowerFrame;
--- old/test/javax/swing/JRadioButton/8075609/bug8075609.java	2015-05-29 17:11:27.173534585 +0300
+++ new/test/javax/swing/JRadioButton/8075609/bug8075609.java	2015-05-29 17:11:27.001534591 +0300
@@ -24,6 +24,7 @@
  /*
  * @test
  * @library ../../regtesthelpers
+ * @modules java.desktop/sun.awt
  * @build Util
  * @bug 8075609
  * @summary  IllegalArgumentException when transferring focus from JRadioButton using tab
--- old/test/javax/swing/JSlider/6524424/bug6524424.java	2015-05-29 17:11:27.641534569 +0300
+++ new/test/javax/swing/JSlider/6524424/bug6524424.java	2015-05-29 17:11:27.465534575 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -25,6 +25,7 @@
  * @bug 6524424
  * @summary JSlider Clicking In Tracks Behavior Inconsistent For Different Tick Spacings
  * @author Pavel Porvatov
+ * @modules java.desktop/com.sun.java.swing.plaf.windows
  * @run applet/manual=done bug6524424.html
  */
 
--- old/test/javax/swing/JTable/6788484/bug6788484.java	2015-05-29 17:11:28.109534553 +0300
+++ new/test/javax/swing/JTable/6788484/bug6788484.java	2015-05-29 17:11:27.929534559 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -24,6 +24,7 @@
 /* @test
    @bug 6788484
    @summary NPE in DefaultTableCellHeaderRenderer.getColumnSortOrder() with null table
+   @modules java.desktop/sun.swing.table
    @compile -XDignore.symbol.file=true bug6788484.java
    @author Alexander Potochkin
    @run main bug6788484
--- old/test/javax/swing/JTable/6937798/bug6937798.java	2015-05-29 17:11:28.565534538 +0300
+++ new/test/javax/swing/JTable/6937798/bug6937798.java	2015-05-29 17:11:28.389534544 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -25,6 +25,7 @@
    @bug 6937798
    @summary Nimbus: Issues with JTable grid
    @author Alexander Potochkin
+   @modules java.desktop/com.sun.java.swing.plaf.nimbus
    @run main bug6937798
 */
 
--- old/test/javax/swing/JTree/8004298/bug8004298.java	2015-05-29 17:11:29.013534523 +0300
+++ new/test/javax/swing/JTree/8004298/bug8004298.java	2015-05-29 17:11:28.845534529 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -27,6 +27,7 @@
  * @summary NPE in WindowsTreeUI.ensureRowsAreVisible
  * @author Alexander Scherbatiy
  * @library ../../regtesthelpers
+ * @modules java.desktop/com.sun.java.swing.plaf.windows
  * @build Util
  * @run main bug8004298
  */
--- old/test/javax/swing/RepaintManager/DisplayListenerLeak/DisplayListenerLeak.java	2015-05-29 17:11:29.477534508 +0300
+++ new/test/javax/swing/RepaintManager/DisplayListenerLeak/DisplayListenerLeak.java	2015-05-29 17:11:29.301534514 +0300
@@ -34,6 +34,7 @@
 /**
  * @test
  * @bug 8041654
+ * @modules java.desktop/sun.java2d
  * @run main/othervm -Xmx80m DisplayListenerLeak
  */
 public final class DisplayListenerLeak {
@@ -79,4 +80,4 @@
             throw new RuntimeException();
         }
     }
-}
\ No newline at end of file
+}
--- old/test/javax/swing/Security/6657138/bug6657138.java	2015-05-29 17:11:29.941534492 +0300
+++ new/test/javax/swing/Security/6657138/bug6657138.java	2015-05-29 17:11:29.765534498 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -26,6 +26,7 @@
  * @bug 6657138
  * @summary Verifies that buttons and labels don't share their ui's across appContexts
  * @author Alexander Potochkin
+ * @modules java.desktop/sun.awt
  */
 
 import sun.awt.SunToolkit;
--- old/test/javax/swing/Security/6938813/bug6938813.java	2015-05-29 17:11:30.397534477 +0300
+++ new/test/javax/swing/Security/6938813/bug6938813.java	2015-05-29 17:11:30.217534483 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -26,6 +26,7 @@
  * @bug 6938813
  * @summary Swing mutable statics
  * @author Pavel Porvatov
+ * @modules java.desktop/sun.awt
  */
 
 import sun.awt.AppContext;
--- old/test/javax/swing/SwingUtilities/8032219/DrawRect.java	2015-05-29 17:11:30.849534462 +0300
+++ new/test/javax/swing/SwingUtilities/8032219/DrawRect.java	2015-05-29 17:11:30.677534467 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -36,6 +36,7 @@
  * @test
  * @bug 8032219
  * @author Sergey Bylokhov
+ * @modules java.desktop/sun.swing
  */
 public final class DrawRect {
 
@@ -121,4 +122,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
--- old/test/javax/swing/ToolTipManager/Test6657026.java	2015-05-29 17:11:31.313534446 +0300
+++ new/test/javax/swing/ToolTipManager/Test6657026.java	2015-05-29 17:11:31.141534452 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -26,6 +26,7 @@
  * @bug 6657026
  * @summary Tests shared ToolTipManager in different application contexts
  * @author Sergey Malenkov
+ * @modules java.desktop/sun.awt
  */
 
 import sun.awt.SunToolkit;
--- old/test/javax/swing/UIDefaults/6795356/TableTest.java	2015-05-29 17:11:31.777534431 +0300
+++ new/test/javax/swing/UIDefaults/6795356/TableTest.java	2015-05-29 17:11:31.601534437 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -26,6 +26,7 @@
  * @bug 6795356
  * @summary Checks that SwingLazyValue class correclty works
  * @author Alexander Potochkin
+ * @modules java.desktop/sun.applet
  * @run main/othervm TableTest
  */
 
--- old/test/javax/swing/UIManager/Test6657026.java	2015-05-29 17:11:32.241534415 +0300
+++ new/test/javax/swing/UIManager/Test6657026.java	2015-05-29 17:11:32.065534421 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -26,6 +26,7 @@
  * @bug 6657026
  * @summary Tests shared UIManager in different application contexts
  * @author Sergey Malenkov
+ * @modules java.desktop/sun.awt
  */
 
 import sun.awt.SunToolkit;
--- old/test/javax/swing/border/Test4856008.java	2015-05-29 17:11:32.717534399 +0300
+++ new/test/javax/swing/border/Test4856008.java	2015-05-29 17:11:32.537534405 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -26,6 +26,9 @@
  * @bug 4856008 7025987
  * @summary Tests border insets
  * @author Sergey Malenkov
+ * @modules java.desktop/com.sun.java.swing.plaf.motif
+ *          java.desktop/com.sun.java.swing.plaf.windows
+ *          java.desktop/sun.swing.plaf.synth
  */
 
 import com.sun.java.swing.plaf.motif.MotifBorders;
--- old/test/javax/swing/border/Test6978482.java	2015-05-29 17:11:33.173534384 +0300
+++ new/test/javax/swing/border/Test6978482.java	2015-05-29 17:11:32.997534390 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -26,6 +26,9 @@
  * @bug 6978482 7025987
  * @summary Tests unchecked casts
  * @author Sergey Malenkov
+ * @modules java.desktop/com.sun.java.swing.plaf.motif
+ *          java.desktop/com.sun.java.swing.plaf.windows
+ *          java.desktop/sun.swing.plaf.synth
  */
 
 import com.sun.java.swing.plaf.motif.MotifBorders;
--- old/test/javax/swing/plaf/basic/BasicSplitPaneUI/Test6657026.java	2015-05-29 17:11:33.629534369 +0300
+++ new/test/javax/swing/plaf/basic/BasicSplitPaneUI/Test6657026.java	2015-05-29 17:11:33.457534374 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -26,6 +26,7 @@
  * @bug 6657026
  * @summary Tests shared BasicSplitPaneUI in different application contexts
  * @author Sergey Malenkov
+ * @modules java.desktop/sun.awt
  */
 
 import sun.awt.SunToolkit;
--- old/test/javax/swing/plaf/metal/MetalBumps/Test6657026.java	2015-05-29 17:11:34.097534353 +0300
+++ new/test/javax/swing/plaf/metal/MetalBumps/Test6657026.java	2015-05-29 17:11:33.921534359 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -26,6 +26,7 @@
  * @bug 6657026
  * @summary Tests shared MetalBumps in different application contexts
  * @author Sergey Malenkov
+ * @modules java.desktop/sun.awt
  */
 
 import sun.awt.SunToolkit;
--- old/test/javax/swing/plaf/metal/MetalInternalFrameUI/Test6657026.java	2015-05-29 17:11:34.577534337 +0300
+++ new/test/javax/swing/plaf/metal/MetalInternalFrameUI/Test6657026.java	2015-05-29 17:11:34.389534343 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -26,6 +26,7 @@
  * @bug 6657026
  * @summary Tests shared MetalInternalFrameUI in different application contexts
  * @author Sergey Malenkov
+ * @modules java.desktop/sun.awt
  */
 
 import sun.awt.SunToolkit;
--- old/test/javax/swing/plaf/metal/MetalSliderUI/Test6657026.java	2015-05-29 17:11:35.037534321 +0300
+++ new/test/javax/swing/plaf/metal/MetalSliderUI/Test6657026.java	2015-05-29 17:11:34.865534327 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -26,6 +26,7 @@
  * @bug 6657026 7077259
  * @summary Tests shared MetalSliderUI in different application contexts
  * @author Sergey Malenkov
+ * @modules java.desktop/sun.awt
  * @run main/othervm -Dswing.defaultlaf=javax.swing.plaf.metal.MetalLookAndFeel Test6657026
  */
 
--- old/test/javax/swing/plaf/nimbus/Test6741426.java	2015-05-29 17:11:35.505534306 +0300
+++ new/test/javax/swing/plaf/nimbus/Test6741426.java	2015-05-29 17:11:35.325534312 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -25,6 +25,7 @@
    @bug 6741426
    @summary Tests reusing Nimbus borders across different components (JComboBox border set on a JTextField)
    @author Peter Zhelezniakov
+   @modules java.desktop/com.sun.java.swing.plaf.nimbus
    @run main Test6741426
 */
 
--- old/test/javax/swing/plaf/synth/7143614/bug7143614.java	2015-05-29 17:11:35.981534290 +0300
+++ new/test/javax/swing/plaf/synth/7143614/bug7143614.java	2015-05-29 17:11:35.805534296 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -26,6 +26,7 @@
  * @bug 7143614
  * @summary Issues with Synth Look&Feel
  * @author Pavel Porvatov
+ * @modules java.desktop/sun.awt
  */
 
 import sun.awt.SunToolkit;
--- old/test/javax/swing/plaf/synth/Test6660049.java	2015-05-29 17:11:36.453534274 +0300
+++ new/test/javax/swing/plaf/synth/Test6660049.java	2015-05-29 17:11:36.269534280 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -26,6 +26,7 @@
  * @bug 6660049 6849518
  * @summary Tests the Region initialization
  * @author Sergey Malenkov
+ * @modules java.desktop/sun.awt
  */
 
 import sun.awt.SunToolkit;
--- old/test/javax/swing/system/6799345/TestShutdown.java	2015-05-29 17:11:36.989534256 +0300
+++ new/test/javax/swing/system/6799345/TestShutdown.java	2015-05-29 17:11:36.813534262 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -26,6 +26,7 @@
    @summary Tests that no exceptions are thrown from TimerQueue and
 SwingWorker on AppContext shutdown
    @author art
+   @modules java.desktop/sun.awt
    @run main TestShutdown
 */
 
--- old/test/javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java	2015-05-29 17:11:37.457534240 +0300
+++ new/test/javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java	2015-05-29 17:11:37.277534246 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -26,6 +26,7 @@
  * @bug 6636983
  * @summary test that composed text at the line starts is handled correctly
  * @author Sergey Groznyh
+ * @modules java.desktop/sun.swing
  * @run main bug6636983
  */
 
--- old/test/javax/swing/text/LayoutQueue/Test6588003.java	2015-05-29 17:11:37.913534225 +0300
+++ new/test/javax/swing/text/LayoutQueue/Test6588003.java	2015-05-29 17:11:37.737534231 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -25,6 +25,7 @@
    @bug 6588003
    @summary LayoutQueue should not share its DefaultQueue across AppContexts
    @author Peter Zhelezniakov
+   @modules java.desktop/sun.awt
    @run main Test6588003
 */
 
--- old/test/javax/swing/text/html/parser/Parser/6990651/bug6990651.java	2015-05-29 17:11:38.377534210 +0300
+++ new/test/javax/swing/text/html/parser/Parser/6990651/bug6990651.java	2015-05-29 17:11:38.205534215 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -25,6 +25,7 @@
    @bug 6990651
    @summary Regression: NPE when refreshing applet since 6u22-b01
    @author Pavel Porvatov
+   @modules java.desktop/sun.awt
 */
 import sun.awt.SunToolkit;
 
--- old/test/javax/swing/text/html/parser/Test8017492.java	2015-05-29 17:11:38.845534194 +0300
+++ new/test/javax/swing/text/html/parser/Test8017492.java	2015-05-29 17:11:38.669534200 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -32,6 +32,7 @@
 /*
  * @test
  * @bug 8017492
+ * @modules java.desktop/sun.awt
  * @run main/othervm Test8017492
  * @summary Tests for OutOfMemoryError/NegativeArraySizeException
  * @author Sergey Malenkov
--- old/test/sun/awt/AppContext/8012933/Test8012933.java	2015-05-29 17:11:39.309534178 +0300
+++ new/test/sun/awt/AppContext/8012933/Test8012933.java	2015-05-29 17:11:39.137534184 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -27,6 +27,7 @@
  * @summary Tests (although somewhat indirectly) that createNewAppContext()
  * immediately followed by dispose() works correctly
  * @author Leonid Romanov
+ * @modules java.desktop/sun.awt
  */
 
 import sun.awt.SunToolkit;
--- old/test/sun/awt/AppContext/MultiThread/MultiThreadTest.java	2015-05-29 17:11:39.765534163 +0300
+++ new/test/sun/awt/AppContext/MultiThread/MultiThreadTest.java	2015-05-29 17:11:39.589534169 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -26,6 +26,7 @@
  * @bug 8019623
  * @summary Tests that AppContext.getAppContext() works correctly in multi-threads scenario.
  * @author Leonid Romanov
+ * @modules java.desktop/sun.awt
  */
 
 import sun.awt.AppContext;
--- old/test/sun/awt/datatransfer/DataFlavorComparatorTest.java	2015-05-29 17:11:40.225534148 +0300
+++ new/test/sun/awt/datatransfer/DataFlavorComparatorTest.java	2015-05-29 17:11:40.053534153 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -25,6 +25,7 @@
    @bug 7173464
    @summary Clipboard.getAvailableDataFlavors: Comparison method violates contract
    @author Petr Pchelko
+   @modules java.datatransfer/sun.datatransfer
    @run main DataFlavorComparatorTest
 */
 
--- old/test/sun/awt/datatransfer/DataFlavorComparatorTest1.java	2015-05-29 17:11:40.693534132 +0300
+++ new/test/sun/awt/datatransfer/DataFlavorComparatorTest1.java	2015-05-29 17:11:40.501534138 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -26,6 +26,7 @@
    @summary "Comparison method violates its general contract" when using Clipboard
             Ensure that DataFlavorComparator conforms to Comparator contract
    @author Anton Nashatyrev
+   @modules java.datatransfer/sun.datatransfer
    @run main DataFlavorComparatorTest1
 */
 import sun.datatransfer.DataFlavorUtil;
--- old/test/sun/awt/datatransfer/SuplementaryCharactersTransferTest.java	2015-05-29 17:11:41.165534116 +0300
+++ new/test/sun/awt/datatransfer/SuplementaryCharactersTransferTest.java	2015-05-29 17:11:40.985534122 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -25,6 +25,8 @@
    @bug 6877495
    @summary JTextField and JTextArea does not support supplementary characters
    @author Alexander Scherbatiy
+   @modules java.datatransfer/sun.datatransfer
+            java.desktop/sun.awt.datatransfer
    @run main SuplementaryCharactersTransferTest
 */
 
--- old/test/sun/java2d/SunGraphics2D/EmptyClipRenderingTest.java	2015-05-29 17:11:41.625534101 +0300
+++ new/test/sun/java2d/SunGraphics2D/EmptyClipRenderingTest.java	2015-05-29 17:11:41.449534107 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -50,6 +50,7 @@
  * @bug 6335200 6419610
  * @summary Tests that we don't render anything if specific empty clip is set
  * @author Dmitri.Trembovetski@Sun.COM: area=Graphics
+ * @modules java.desktop/sun.awt
  * @run main EmptyClipRenderingTest
  * @run main/othervm -Dsun.java2d.noddraw=true EmptyClipRenderingTest
  * @run main/othervm -Dsun.java2d.pmoffscreen=true EmptyClipRenderingTest
--- old/test/sun/java2d/pipe/RegionOps.java	2015-05-29 17:11:42.065534086 +0300
+++ new/test/sun/java2d/pipe/RegionOps.java	2015-05-29 17:11:41.893534092 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -26,6 +26,7 @@
  * @bug 6504874
  * @summary This test verifies the operation (and performance) of the
  *          various CAG operations on the internal Region class.
+ * @modules java.desktop/sun.java2d.pipe
  * @run main RegionOps
  */
 
--- old/test/sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java	2015-05-29 17:11:42.525534071 +0300
+++ new/test/sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java	2015-05-29 17:11:42.353534076 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -25,6 +25,9 @@
  * @bug 6635805 6653780 6667607
  * @summary Tests that the resource sharing layer API is not broken
  * @author Dmitri.Trembovetski@sun.com: area=Graphics
+ * @modules java.desktop/sun.java2d
+ *          java.desktop/sun.java2d.pipe
+ *          java.desktop/sun.java2d.pipe.hw
  * @compile -XDignore.symbol.file=true RSLAPITest.java
  * @run main/othervm RSLAPITest
  * @run main/othervm -Dsun.java2d.noddraw=true RSLAPITest
--- old/test/sun/java2d/pipe/hw/RSLContextInvalidationTest/RSLContextInvalidationTest.java	2015-05-29 17:11:42.969534056 +0300
+++ new/test/sun/java2d/pipe/hw/RSLContextInvalidationTest/RSLContextInvalidationTest.java	2015-05-29 17:11:42.801534061 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -26,6 +26,9 @@
  * @bug 6764257
  * @summary Tests that the color is reset properly after save/restore context
  * @author Dmitri.Trembovetski@sun.com: area=Graphics
+ * @modules java.desktop/sun.java2d
+ *          java.desktop/sun.java2d.pipe
+ *          java.desktop/sun.java2d.pipe.hw
  * @compile -XDignore.symbol.file=true RSLContextInvalidationTest.java
  * @run main/othervm RSLContextInvalidationTest
  * @run main/othervm -Dsun.java2d.noddraw=true RSLContextInvalidationTest
--- old/test/sun/java2d/pipe/hw/VSyncedBufferStrategyTest/VSyncedBufferStrategyTest.java	2015-05-29 17:11:43.429534040 +0300
+++ new/test/sun/java2d/pipe/hw/VSyncedBufferStrategyTest/VSyncedBufferStrategyTest.java	2015-05-29 17:11:43.249534046 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -25,6 +25,7 @@
  * @bug 6678218 6681745 6691737
  * @summary Tests that v-synced BufferStrategies works (if vsync is supported)
  * @author Dmitri.Trembovetski@sun.com: area=Graphics
+ * @modules java.desktop/sun.java2d.pipe.hw
  * @compile -XDignore.symbol.file=true VSyncedBufferStrategyTest.java
  * @run main/manual/othervm VSyncedBufferStrategyTest
  * @run main/manual/othervm -Dsun.java2d.opengl=True VSyncedBufferStrategyTest
--- /dev/null	2015-05-28 11:12:49.589148859 +0300
+++ new/test/com/sun/awt/TEST.properties	2015-05-29 17:11:43.729534030 +0300
@@ -0,0 +1 @@
+modules=java.desktop
--- /dev/null	2015-05-28 11:12:49.589148859 +0300
+++ new/test/com/sun/java/swing/TEST.properties	2015-05-29 17:11:44.161534016 +0300
@@ -0,0 +1 @@
+modules=java.desktop
--- /dev/null	2015-05-28 11:12:49.589148859 +0300
+++ new/test/java/awt/TEST.properties	2015-05-29 17:11:44.577534002 +0300
@@ -0,0 +1 @@
+modules=java.desktop
--- /dev/null	2015-05-28 11:12:49.589148859 +0300
+++ new/test/java/beans/TEST.properties	2015-05-29 17:11:45.021533987 +0300
@@ -0,0 +1 @@
+modules=java.desktop
--- /dev/null	2015-05-28 11:12:49.589148859 +0300
+++ new/test/javax/accessibility/TEST.properties	2015-05-29 17:11:45.453533973 +0300
@@ -0,0 +1 @@
+modules=java.desktop
--- /dev/null	2015-05-28 11:12:49.589148859 +0300
+++ new/test/javax/imageio/TEST.properties	2015-05-29 17:11:45.885533958 +0300
@@ -0,0 +1,2 @@
+modules=java.desktop
+
--- /dev/null	2015-05-28 11:12:49.589148859 +0300
+++ new/test/javax/print/TEST.properties	2015-05-29 17:11:46.321533944 +0300
@@ -0,0 +1 @@
+modules=java.desktop
--- /dev/null	2015-05-28 11:12:49.589148859 +0300
+++ new/test/javax/sound/TEST.properties	2015-05-29 17:11:46.757533929 +0300
@@ -0,0 +1 @@
+modules=java.desktop
--- /dev/null	2015-05-28 11:12:49.589148859 +0300
+++ new/test/javax/swing/TEST.properties	2015-05-29 17:11:47.261533912 +0300
@@ -0,0 +1 @@
+modules=java.desktop
--- /dev/null	2015-05-28 11:12:49.589148859 +0300
+++ new/test/sun/awt/TEST.properties	2015-05-29 17:11:47.685533898 +0300
@@ -0,0 +1 @@
+modules=java.desktop
--- /dev/null	2015-05-28 11:12:49.589148859 +0300
+++ new/test/sun/java2d/TEST.properties	2015-05-29 17:11:48.109533884 +0300
@@ -0,0 +1,2 @@
+modules=java.desktop
+
--- /dev/null	2015-05-28 11:12:49.589148859 +0300
+++ new/test/sun/pisces/TEST.properties	2015-05-29 17:11:48.541533869 +0300
@@ -0,0 +1,2 @@
+modules=java.desktop
+