--- old/test/com/apple/eawt/DefaultMenuBar/DefaultMenuBarTest.java	2015-06-19 15:14:12.537664755 +0300
+++ new/test/com/apple/eawt/DefaultMenuBar/DefaultMenuBarTest.java	2015-06-19 15:14:12.361664758 +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 8007267
  * @summary [macosx] com.apple.eawt.Application.setDefaultMenuBar is not working
  * @author leonid.romanov@oracle.com
+ * @modules java.desktop/sun.awt
  * @run main DefaultMenuBarTest
  */
 
--- old/test/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java	2015-06-19 15:14:12.973664747 +0300
+++ new/test/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java	2015-06-19 15:14:12.809664750 +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-06-19 15:14:13.385664740 +0300
+++ new/test/com/sun/awt/Translucency/WindowOpacity.java	2015-06-19 15:14:13.221664742 +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-06-19 15:14:13.793664732 +0300
+++ new/test/com/sun/java/swing/plaf/windows/Test6824600.java	2015-06-19 15:14:13.633664735 +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/Choice/ItemStateChangeTest/ItemStateChangeTest.java	2015-06-19 15:14:14.213664725 +0300
+++ new/test/java/awt/Choice/ItemStateChangeTest/ItemStateChangeTest.java	2015-06-19 15:14:14.037664728 +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,7 @@
   @author Oleg Pekhovskiy: area=awt-choice
   @library ../../regtesthelpers
   @library ../../../../lib/testlibrary
+  @modules java.desktop/sun.awt
   @build Util
   @build jdk.testlibrary.OSInfo
   @run main ItemStateChangeTest
--- old/test/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.java	2015-06-19 15:14:14.645664717 +0300
+++ new/test/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.java	2015-06-19 15:14:14.469664720 +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/Desktop/8064934/bug8064934.java	2015-06-19 15:14:15.069664710 +0300
+++ new/test/java/awt/Desktop/8064934/bug8064934.java	2015-06-19 15:14:14.893664713 +0300
@@ -26,6 +26,7 @@
  * @summary Incorrect Exception message from java.awt.Desktop.open()
  * @author Dmitry Markov
  * @library ../../../../lib/testlibrary
+ * @modules java.desktop/sun.awt
  * @build jdk.testlibrary.OSInfo
  * @run main bug8064934
  */
--- old/test/java/awt/Dialog/CloseDialog/CloseDialogTest.java	2015-06-19 15:14:15.481664703 +0300
+++ new/test/java/awt/Dialog/CloseDialog/CloseDialogTest.java	2015-06-19 15:14:15.321664705 +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-06-19 15:14:15.929664695 +0300
+++ new/test/java/awt/EventDispatchThread/EDTShutdownTest/EDTShutdownTest.java	2015-06-19 15:14:15.741664698 +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/EventDispatchThread/LoopRobustness/LoopRobustness.html	2015-06-19 15:14:16.349664687 +0300
+++ new/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html	2015-06-19 15:14:16.181664690 +0300
@@ -1,5 +1,5 @@
 <!--
- Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
  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 @@
         loop does not crash AWT.
         @author Andrei Dmitriev: area=awt.event
         @library ../../regtesthelpers
+        @modules java.desktop/sun.awt
         @build Util
         @run main LoopRobustness
   -->
--- old/test/java/awt/EventQueue/MainAppContext/MainAppContext.java	2015-06-19 15:14:16.813664679 +0300
+++ new/test/java/awt/EventQueue/MainAppContext/MainAppContext.java	2015-06-19 15:14:16.621664683 +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-06-19 15:14:17.233664672 +0300
+++ new/test/java/awt/EventQueue/PostEventOrderingTest/PostEventOrderingTest.java	2015-06-19 15:14:17.073664675 +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-06-19 15:14:17.661664664 +0300
+++ new/test/java/awt/EventQueue/PushPopDeadlock2/PushPopTest.java	2015-06-19 15:14:17.493664667 +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/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.html	2015-06-19 15:14:18.097664657 +0300
+++ new/test/java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.html	2015-06-19 15:14:17.917664660 +0300
@@ -27,6 +27,7 @@
   @bug        6271849
   @summary    Tests that component in modal excluded Window which parent is blocked responses to mouse clicks.
   @author     anton.tarasov@sun.com: area=awt.focus
+  @modules java.desktop/sun.awt
   @run        applet ModalExcludedWindowClickTest.html
   -->
 <head>
--- old/test/java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.html	2015-06-19 15:14:18.513664649 +0300
+++ new/test/java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.html	2015-06-19 15:14:18.337664652 +0300
@@ -27,6 +27,7 @@
   @bug        6272324
   @summary    Modal excluded Window which decorated parent is blocked should be non-focusable.
   @author     anton.tarasov@sun.com: area=awt.focus
+  @modules java.desktop/sun.awt
   @run        applet NonFocusableBlockedOwnerTest.html
   -->
 <head>
--- old/test/java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.html	2015-06-19 15:14:18.917664642 +0300
+++ new/test/java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.html	2015-06-19 15:14:18.757664645 +0300
@@ -27,6 +27,7 @@
   @bug        6253913
   @summary    Tests that a Window shown before its owner is focusable.
   @author     anton.tarasov@sun.com: area=awt-focus
+  @modules java.desktop/sun.awt
   @run        applet WindowUpdateFocusabilityTest.html
   -->
 <head>
--- old/test/java/awt/Graphics2D/Test8004859/Test8004859.java	2015-06-19 15:14:19.353664634 +0300
+++ new/test/java/awt/Graphics2D/Test8004859/Test8004859.java	2015-06-19 15:14:19.169664638 +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-06-19 15:14:19.773664627 +0300
+++ new/test/java/awt/Graphics2D/TransformSetGet/TransformSetGet.java	2015-06-19 15:14:19.609664630 +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/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html	2015-06-19 15:14:20.181664620 +0300
+++ new/test/java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html	2015-06-19 15:14:20.021664623 +0300
@@ -1,5 +1,5 @@
 <!--
- Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  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 @@
   @summary Tests that type-ahead for dialog works and doesn't block program
   @author  area=awt.focus
   @library    ../../regtesthelpers
+  @modules java.desktop/sun.awt
   @build      Util        
   @run applet TestDialogTypeAhead.html
   -->
--- old/test/java/awt/Menu/OpensWithNoGrab/OpensWithNoGrab.java	2015-06-19 15:14:20.589664613 +0300
+++ new/test/java/awt/Menu/OpensWithNoGrab/OpensWithNoGrab.java	2015-06-19 15:14:20.429664615 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, 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
@@ -28,6 +28,7 @@
   @author andrei.dmitriev: area=awt.menu
   @library ../../regtesthelpers
   @library ../../../../lib/testlibrary
+  @modules java.desktop/sun.awt
   @build jdk.testlibrary.OSInfo
   @build Util
   @run main OpensWithNoGrab
--- old/test/java/awt/Mixing/AWT_Mixing/JButtonInGlassPaneOverlapping.java	2015-06-19 15:14:20.989664606 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JButtonInGlassPaneOverlapping.java	2015-06-19 15:14:20.825664608 +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,7 @@
 @summary Simple Overlapping test for javax.swing.JButton
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JButtonInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java	2015-06-19 15:14:21.529664596 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java	2015-06-19 15:14:21.353664599 +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,7 @@
 @summary Simple Overlapping test for javax.swing.JButton
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JButtonOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JColorChooserOverlapping.java	2015-06-19 15:14:21.937664589 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JColorChooserOverlapping.java	2015-06-19 15:14:21.781664592 +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 @@
 @summary Simple Overlapping test for javax.swing.JColorChooser
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JColorChooserOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java	2015-06-19 15:14:22.357664581 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java	2015-06-19 15:14:22.181664585 +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,7 @@
 @summary Overlapping test for javax.swing.JScrollPane
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JComboBoxOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JEditorPaneInGlassPaneOverlapping.java	2015-06-19 15:14:22.789664574 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JEditorPaneInGlassPaneOverlapping.java	2015-06-19 15:14:22.617664577 +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,7 @@
 @summary Simple Overlapping test for javax.swing.JLabel
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JEditorPaneInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JEditorPaneOverlapping.java	2015-06-19 15:14:23.197664567 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JEditorPaneOverlapping.java	2015-06-19 15:14:23.041664569 +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 @@
 @summary Simple Overlapping test for javax.swing.JLabel
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JEditorPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JGlassPaneInternalFrameOverlapping.java	2015-06-19 15:14:23.589664560 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JGlassPaneInternalFrameOverlapping.java	2015-06-19 15:14:23.429664563 +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,7 @@
 @summary Overlapping test for javax.swing.JScrollPane
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JGlassPaneInternalFrameOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JGlassPaneMoveOverlapping.java	2015-06-19 15:14:24.005664552 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JGlassPaneMoveOverlapping.java	2015-06-19 15:14:23.845664555 +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,7 @@
 @summary Overlapping test for javax.swing.JScrollPane
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JGlassPaneMoveOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java	2015-06-19 15:14:24.429664545 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java	2015-06-19 15:14:24.265664548 +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,7 @@
 @summary Overlapping test for javax.swing.JScrollPane
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JInternalFrameMoveOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java	2015-06-19 15:14:24.869664537 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java	2015-06-19 15:14:24.701664540 +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,7 @@
 @summary Overlapping test for javax.swing.JScrollPane
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JInternalFrameOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JLabelInGlassPaneOverlapping.java	2015-06-19 15:14:25.285664530 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JLabelInGlassPaneOverlapping.java	2015-06-19 15:14:25.117664533 +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,7 @@
 @summary Simple Overlapping test for javax.swing.JLabel
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JLabelInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JLabelOverlapping.java	2015-06-19 15:14:25.709664522 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JLabelOverlapping.java	2015-06-19 15:14:25.545664525 +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,7 @@
 @summary Simple Overlapping test for javax.swing.JLabel
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JLabelOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JListInGlassPaneOverlapping.java	2015-06-19 15:14:26.149664515 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JListInGlassPaneOverlapping.java	2015-06-19 15:14:25.969664518 +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,7 @@
 @summary Simple Overlapping test for javax.swing.JList
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JListInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JListOverlapping.java	2015-06-19 15:14:26.565664507 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JListOverlapping.java	2015-06-19 15:14:26.393664510 +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 @@
 @summary Simple Overlapping test for javax.swing.JList
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JListOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java	2015-06-19 15:14:27.009664499 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java	2015-06-19 15:14:26.841664502 +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,7 @@
 @summary Overlapping test for javax.swing.JScrollPane
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JMenuBarOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JPanelInGlassPaneOverlapping.java	2015-06-19 15:14:27.425664492 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JPanelInGlassPaneOverlapping.java	2015-06-19 15:14:27.257664495 +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,7 @@
 @summary Simple Overlapping test for javax.swing.JPanel
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JPanelInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JPanelOverlapping.java	2015-06-19 15:14:27.873664484 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JPanelOverlapping.java	2015-06-19 15:14:27.693664487 +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,7 @@
 @summary Simple Overlapping test for javax.swing.JPanel
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JPanelOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java	2015-06-19 15:14:28.289664477 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java	2015-06-19 15:14:28.125664480 +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,7 @@
 @summary Overlapping test for javax.swing.JScrollPane
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JPopupMenuOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JProgressBarInGlassPaneOverlapping.java	2015-06-19 15:14:28.697664470 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JProgressBarInGlassPaneOverlapping.java	2015-06-19 15:14:28.533664473 +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,7 @@
 @summary Simple Overlapping test for javax.swing.JProgressBar
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JProgressBarInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JProgressBarOverlapping.java	2015-06-19 15:14:29.137664462 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JProgressBarOverlapping.java	2015-06-19 15:14:28.953664465 +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,7 @@
 @summary Simple Overlapping test for javax.swing.JProgressBar
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JProgressBarOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JScrollBarInGlassPaneOverlapping.java	2015-06-19 15:14:29.577664454 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JScrollBarInGlassPaneOverlapping.java	2015-06-19 15:14:29.405664457 +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,7 @@
 @summary Simple Overlapping test for javax.swing.JScrollBar
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JScrollBarInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JScrollBarOverlapping.java	2015-06-19 15:14:29.977664447 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JScrollBarOverlapping.java	2015-06-19 15:14:29.817664450 +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 @@
 @summary Simple Overlapping test for javax.swing.JScrollBar
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JScrollBarOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JScrollPaneOverlapping.java	2015-06-19 15:14:30.409664440 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JScrollPaneOverlapping.java	2015-06-19 15:14:30.237664443 +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,7 @@
 @summary Overlapping test for javax.swing.JScrollPane
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JScrollPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JSliderInGlassPaneOverlapping.java	2015-06-19 15:14:30.841664432 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JSliderInGlassPaneOverlapping.java	2015-06-19 15:14:30.681664435 +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,7 @@
 @summary Simple Overlapping test for javax.swing.JSlider
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JSliderInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JSliderOverlapping.java	2015-06-19 15:14:31.277664424 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JSliderOverlapping.java	2015-06-19 15:14:31.113664427 +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,7 @@
 @summary Simple Overlapping test for javax.swing.JSlider
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JSliderOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JSpinnerInGlassPaneOverlapping.java	2015-06-19 15:14:31.737664416 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JSpinnerInGlassPaneOverlapping.java	2015-06-19 15:14:31.557664419 +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 @@
 @summary Simple Overlapping test for javax.swing.JSpinner
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JSpinnerInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JSpinnerOverlapping.java	2015-06-19 15:14:32.185664408 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JSpinnerOverlapping.java	2015-06-19 15:14:32.017664411 +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,7 @@
 @summary Simple Overlapping test for javax.swing.JSpinner
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JSpinnerOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java	2015-06-19 15:14:32.621664401 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java	2015-06-19 15:14:32.441664404 +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,7 @@
 @summary Overlapping test for javax.swing.JSplitPane
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JSplitPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java	2015-06-19 15:14:33.037664393 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java	2015-06-19 15:14:32.869664396 +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 @@
 @summary Simple Overlapping test for JTable
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JTableInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JTableOverlapping.java	2015-06-19 15:14:33.477664386 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JTableOverlapping.java	2015-06-19 15:14:33.309664388 +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 @@
 @summary Simple Overlapping test for JTable
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JTableOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JTextAreaInGlassPaneOverlapping.java	2015-06-19 15:14:33.909664378 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JTextAreaInGlassPaneOverlapping.java	2015-06-19 15:14:33.745664381 +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,7 @@
 @summary Simple Overlapping test for javax.swing.JLabel
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JTextAreaInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JTextAreaOverlapping.java	2015-06-19 15:14:34.353664370 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JTextAreaOverlapping.java	2015-06-19 15:14:34.177664373 +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,7 @@
 @summary Simple Overlapping test for javax.swing.JLabel
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JTextAreaOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JTextFieldInGlassPaneOverlapping.java	2015-06-19 15:14:34.769664363 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JTextFieldInGlassPaneOverlapping.java	2015-06-19 15:14:34.605664366 +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,7 @@
 @summary Simple Overlapping test for javax.swing.JLabel
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JTextFieldInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JTextFieldOverlapping.java	2015-06-19 15:14:35.217664355 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JTextFieldOverlapping.java	2015-06-19 15:14:35.049664358 +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,7 @@
 @summary Simple Overlapping test for javax.swing.JLabel
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JTextFieldOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JToggleButtonInGlassPaneOverlapping.java	2015-06-19 15:14:35.653664347 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JToggleButtonInGlassPaneOverlapping.java	2015-06-19 15:14:35.473664350 +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,7 @@
 @summary Simple Overlapping test for javax.swing.JToggleButton
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JToggleButtonInGlassPaneOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/JToggleButtonOverlapping.java	2015-06-19 15:14:36.085664340 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/JToggleButtonOverlapping.java	2015-06-19 15:14:35.913664343 +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 @@
 @summary Simple Overlapping test for javax.swing.JToggleButton
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main JToggleButtonOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/MixingFrameResizing.java	2015-06-19 15:14:36.493664332 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/MixingFrameResizing.java	2015-06-19 15:14:36.313664336 +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,7 @@
 @summary Issues when resizing the JFrame with HW components
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main MixingFrameResizing
  */
--- old/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java	2015-06-19 15:14:36.965664324 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java	2015-06-19 15:14:36.777664327 +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 @@
 @bug 6776743
 @summary Opaque overlapping test for each AWT component
 @library ../../regtesthelpers
+@modules java.desktop/com.sun.awt
+         java.desktop/sun.awt
 @build Util
 @run main OpaqueOverlapping
  */
--- old/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java	2015-06-19 15:14:37.409664316 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java	2015-06-19 15:14:37.221664320 +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 @@
 @bug 6994264
 @summary Opaque overlapping test for Choice AWT component
 @library ../../regtesthelpers
+@modules java.desktop/com.sun.awt
+         java.desktop/sun.awt
 @build Util
 @run main OpaqueOverlappingChoice
  */
--- old/test/java/awt/Mixing/AWT_Mixing/ViewportOverlapping.java	2015-06-19 15:14:37.841664309 +0300
+++ new/test/java/awt/Mixing/AWT_Mixing/ViewportOverlapping.java	2015-06-19 15:14:37.673664312 +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
@@ -51,6 +51,7 @@
 @summary Viewport overlapping test for each AWT component
 @author sergey.grinev@oracle.com: area=awt.mixing
 @library ../../regtesthelpers
+@modules java.desktop/sun.awt
 @build Util
 @run main ViewportOverlapping
  */
--- old/test/java/awt/Mixing/OpaqueTest.java	2015-06-19 15:14:38.301664300 +0300
+++ new/test/java/awt/Mixing/OpaqueTest.java	2015-06-19 15:14:38.125664304 +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 opaque and non-opaque components mix correctly
   @author anthony.petrov@...: area=awt.mixing
   @library ../regtesthelpers
+  @modules java.desktop/com.sun.awt
   @build Util
   @run main OpaqueTest
 */
--- old/test/java/awt/SplashScreen/FullscreenAfterSplash/FullScreenAfterSplash.java	2015-06-19 15:14:38.761664292 +0300
+++ new/test/java/awt/SplashScreen/FullscreenAfterSplash/FullScreenAfterSplash.java	2015-06-19 15:14:38.565664296 +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
@@ -38,6 +38,7 @@
  * @summary Native Mac OS X full screen does not work after showing the splash
  * @library ../
  * @library ../../../../lib/testlibrary
+ * @modules java.desktop/sun.awt
  * @build jdk.testlibrary.OSInfo
  * @build GenerateTestImage
  * @run main GenerateTestImage
--- old/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java	2015-06-19 15:14:39.209664284 +0300
+++ new/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java	2015-06-19 15:14:39.029664288 +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/Toolkit/RealSync/RealSyncOnEDT.java	2015-06-19 15:14:39.633664277 +0300
+++ new/test/java/awt/Toolkit/RealSync/RealSyncOnEDT.java	2015-06-19 15:14:39.469664280 +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 6541903
   @summary Tests if the realSync() throws the IllegalThreadException while invoked on the EDT
   @author anthony.petrov: area=awt.toolkit
+  @modules java.desktop/sun.awt
   @run main/timeout=10 RealSyncOnEDT
 */
 
--- old/test/java/awt/Toolkit/RealSync/Test.java	2015-06-19 15:14:40.117664268 +0300
+++ new/test/java/awt/Toolkit/RealSync/Test.java	2015-06-19 15:14:39.897664272 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 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
@@ -26,6 +26,7 @@
   @bug 6252005
   @summary Tests that realSync feature works
   @author denis.mikhalkin: area=awt.toolkit
+  @modules java.desktop/sun.awt
   @run main/timeout=6000 Test
 */
 
--- old/test/java/awt/Window/AlwaysOnTop/AutoTestOnTop.java	2015-06-19 15:14:40.537664261 +0300
+++ new/test/java/awt/Window/AlwaysOnTop/AutoTestOnTop.java	2015-06-19 15:14:40.373664264 +0300
@@ -26,6 +26,7 @@
   @bug 4632143
   @summary Unit test for the RFE window/frame/dialog always on top
   @author dom@sparc.spb.su: area=awt.toplevel
+  @modules java.desktop/sun.awt
   @run main AutoTestOnTop
 */
 
--- old/test/java/awt/Window/Grab/GrabTest.java	2015-06-19 15:14:40.969664253 +0300
+++ new/test/java/awt/Window/Grab/GrabTest.java	2015-06-19 15:14:40.801664256 +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-06-19 15:14:41.401664246 +0300
+++ new/test/java/awt/Window/WindowsLeak/WindowsLeak.java	2015-06-19 15:14:41.237664249 +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-06-19 15:14:41.861664238 +0300
+++ new/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh	2015-06-19 15:14:41.677664241 +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-06-19 15:14:42.261664231 +0300
+++ new/test/java/awt/datatransfer/Clipboard/BasicClipboardTest.java	2015-06-19 15:14:42.097664234 +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/DataFlavor/DataFlavorCloneTest/DataFlavorCloneTest.java	2015-06-19 15:14:42.669664224 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/DataFlavorCloneTest/DataFlavorCloneTest.java	2015-06-19 15:14:42.509664226 +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-06-19 15:14:43.077664216 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/DataFlavorEqualsNullTest.java	2015-06-19 15:14:42.917664219 +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-06-19 15:14:43.493664209 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/DataFlavorEqualsTest.java	2015-06-19 15:14:43.333664212 +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-06-19 15:14:43.905664202 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/DataFlavorFileListTest.java	2015-06-19 15:14:43.745664205 +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-06-19 15:14:44.313664195 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/DataFlavorSerializedTest.java	2015-06-19 15:14:44.153664197 +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-06-19 15:14:44.725664187 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/DefaultMatchTest.java	2015-06-19 15:14:44.557664190 +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-06-19 15:14:45.137664180 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/EqualsHashCodeSymmetryTest/EqualsHashCodeSymmetryTest.java	2015-06-19 15:14:44.973664183 +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-06-19 15:14:45.541664173 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/ExternalizeTest.java	2015-06-19 15:14:45.385664176 +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-06-19 15:14:45.961664166 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/GetReaderForTextIAEForStringSelectionTest.java	2015-06-19 15:14:45.801664168 +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-06-19 15:14:46.369664158 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/GetReaderForTextNPETest.java	2015-06-19 15:14:46.209664161 +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-06-19 15:14:46.785664151 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/MimeTypeSerializationTest.java	2015-06-19 15:14:46.613664154 +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-06-19 15:14:47.201664144 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/NoClassParameterTest.java	2015-06-19 15:14:47.029664147 +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-06-19 15:14:47.613664136 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/NormalizeMimeTypeParameter.java	2015-06-19 15:14:47.453664139 +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-06-19 15:14:48.017664129 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/ReaderForUnicodeText.java	2015-06-19 15:14:47.853664132 +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-06-19 15:14:48.841664115 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/SelectBestFlavorNPETest.java	2015-06-19 15:14:48.689664117 +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-06-19 15:14:50.285664089 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/SelectBestTextFlavorBadArrayTest.java	2015-06-19 15:14:50.121664092 +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-06-19 15:14:50.693664082 +0300
+++ new/test/java/awt/datatransfer/DataFlavor/ToStringNullPointerTest.java	2015-06-19 15:14:50.533664085 +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/Headless/HeadlessClipboard.java	2015-06-19 15:14:51.093664075 +0300
+++ new/test/java/awt/datatransfer/Headless/HeadlessClipboard.java	2015-06-19 15:14:50.933664078 +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-06-19 15:14:51.497664068 +0300
+++ new/test/java/awt/datatransfer/Headless/HeadlessDataFlavor.java	2015-06-19 15:14:51.337664071 +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-06-19 15:14:51.897664061 +0300
+++ new/test/java/awt/datatransfer/Headless/HeadlessSystemFlavorMap.java	2015-06-19 15:14:51.737664064 +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-06-19 15:14:52.305664054 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorForNativeTest.java	2015-06-19 15:14:52.145664057 +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-06-19 15:14:52.705664047 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java	2015-06-19 15:14:52.545664049 +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-06-19 15:14:53.113664039 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/AddNativeForFlavorTest.java	2015-06-19 15:14:52.949664042 +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-06-19 15:14:53.517664032 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/AddNativeTest.java	2015-06-19 15:14:53.357664035 +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-06-19 15:14:53.929664025 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/DuplicateMappingTest.java	2015-06-19 15:14:53.765664028 +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-06-19 15:14:54.337664018 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/DuplicatedNativesTest.java	2015-06-19 15:14:54.177664021 +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-06-19 15:14:54.745664011 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/GetFlavorsForNewNativeTest.java	2015-06-19 15:14:54.581664014 +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-06-19 15:14:55.141664004 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/GetNativesForFlavorTest.java	2015-06-19 15:14:54.985664006 +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-06-19 15:14:55.545663997 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/GetNativesForNewFlavorTest.java	2015-06-19 15:14:55.385663999 +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-06-19 15:14:55.957663989 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/InvalidMapArgumentsTest.java	2015-06-19 15:14:55.801663992 +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-06-19 15:14:56.349663982 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/ManyFlavorMapTest.java	2015-06-19 15:14:56.193663985 +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-06-19 15:14:56.761663975 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/MappingGenerationTest.java	2015-06-19 15:14:56.593663978 +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-06-19 15:14:57.169663968 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/SetDataFlavorsTest.java	2015-06-19 15:14:57.005663971 +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-06-19 15:14:57.565663961 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/SetFlavorsForNativeTest.java	2015-06-19 15:14:57.405663964 +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-06-19 15:14:57.973663954 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavor.java	2015-06-19 15:14:57.813663957 +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-06-19 15:14:58.369663947 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavorTest.java	2015-06-19 15:14:58.209663950 +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-06-19 15:14:58.785663940 +0300
+++ new/test/java/awt/datatransfer/SystemFlavorMap/SetNativesTest.java	2015-06-19 15:14:58.617663942 +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/ComponentEvent/MovedResizedTardyEventTest/MovedResizedTardyEventTest.html	2015-06-19 15:14:59.213663932 +0300
+++ new/test/java/awt/event/ComponentEvent/MovedResizedTardyEventTest/MovedResizedTardyEventTest.html	2015-06-19 15:14:59.037663935 +0300
@@ -27,6 +27,7 @@
   @bug          4985250
   @summary      COMPONENT_MOVED/RESIZED tardy events shouldn't be generated.
   @author       tav@sparc.spb.su
+  @modules java.desktop/sun.awt
   @run applet MovedResizedTardyEventTest.html
   -->
 <head>
--- old/test/java/awt/event/KeyEvent/AltCharAcceleratorTest/AltCharAcceleratorTest.java	2015-06-19 15:14:59.621663925 +0300
+++ new/test/java/awt/event/KeyEvent/AltCharAcceleratorTest/AltCharAcceleratorTest.java	2015-06-19 15:14:59.465663928 +0300
@@ -26,6 +26,7 @@
 @bug 8068283
 @summary Checks that <Alt>+Char accelerators work when pressed in a text component
 @author Anton Nashatyrev
+@modules java.desktop/sun.awt
 @run main AltCharAcceleratorTest
 */
 
--- old/test/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java	2015-06-19 15:15:00.037663917 +0300
+++ new/test/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java	2015-06-19 15:14:59.873663920 +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
@@ -28,6 +28,7 @@
   @author    anton.tarasov: area=awt.focus
   @library   ../../../regtesthelpers
   @library ../../../../../lib/testlibrary
+  @modules java.desktop/sun.awt
   @build jdk.testlibrary.OSInfo
   @build     Util
   @run       main SwallowKeyEvents
--- old/test/java/awt/event/OtherEvents/UngrabID/UngrabID.java	2015-06-19 15:15:00.453663910 +0300
+++ new/test/java/awt/event/OtherEvents/UngrabID/UngrabID.java	2015-06-19 15:15:00.285663913 +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/im/8041990/bug8041990.java	2015-06-19 15:15:00.857663903 +0300
+++ new/test/java/awt/im/8041990/bug8041990.java	2015-06-19 15:15:00.697663906 +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 @@
   @bug 8041990
   @summary Language specific keys does not work in applets when opened outside the browser
   @author Petr Pchelko
+  @modules java.desktop/sun.awt
 */
 
 import sun.awt.SunToolkit;
--- old/test/java/awt/image/MultiResolutionImage/NSImageToMultiResolutionImageTest.java	2015-06-19 15:15:01.285663895 +0300
+++ new/test/java/awt/image/MultiResolutionImage/NSImageToMultiResolutionImageTest.java	2015-06-19 15:15:01.125663898 +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-06-19 15:15:01.697663888 +0300
+++ new/test/java/awt/image/MultiResolutionImageTest.java	2015-06-19 15:15:01.533663891 +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-06-19 15:15:02.113663881 +0300
+++ new/test/java/awt/image/mlib/MlibOpsTest.java	2015-06-19 15:15:01.953663884 +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-06-19 15:15:02.525663874 +0300
+++ new/test/java/awt/image/multiresolution/MultiResolutionToolkitImageTest.java	2015-06-19 15:15:02.361663877 +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/keyboard/EqualKeyCode/EqualKeyCode.java	2015-06-19 15:15:02.957663866 +0300
+++ new/test/java/awt/keyboard/EqualKeyCode/EqualKeyCode.java	2015-06-19 15:15:02.797663869 +0300
@@ -26,6 +26,7 @@
   @bug 6799551
   @summary Extended key codes for small letters undefined
   @author Andrei Dmitriev: area=awt.keyboard
+  @modules java.desktop/sun.awt
   @run main EqualKeyCode
 */
 
--- old/test/java/awt/print/bug8023392/bug8023392.html	2015-06-19 15:15:03.361663859 +0300
+++ new/test/java/awt/print/bug8023392/bug8023392.html	2015-06-19 15:15:03.201663862 +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 @@
   @bug 8023392
   @summary Swing text components printed with spaces between chars
   @author Anton Nashatyrev
+  @modules java.desktop/sun.swing
   @run applet/manual=yesno bug8023392.html
   -->
 <head>
--- old/test/java/awt/xembed/server/RunTestXEmbed.java	2015-06-19 15:15:03.773663852 +0300
+++ new/test/java/awt/xembed/server/RunTestXEmbed.java	2015-06-19 15:15:03.605663855 +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-06-19 15:15:04.169663845 +0300
+++ new/test/java/awt/xembed/server/TestXEmbedServerJava.java	2015-06-19 15:15:04.005663848 +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-06-19 15:15:04.565663838 +0300
+++ new/test/java/beans/Introspector/Test6277246.java	2015-06-19 15:15:04.405663840 +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/Introspector/TestCacheRecursion.java	2015-06-19 15:15:04.961663831 +0300
+++ new/test/java/beans/Introspector/TestCacheRecursion.java	2015-06-19 15:15:04.801663834 +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 8039137
  * @summary Tests Cache recursion
  * @author Sergey Malenkov
+ * @modules java.desktop/com.sun.beans.util
  * @compile -XDignore.symbol.file TestCacheRecursion.java
  * @run main TestCacheRecursion
  */
--- old/test/java/beans/Introspector/TestTypeResolver.java	2015-06-19 15:15:05.365663824 +0300
+++ new/test/java/beans/Introspector/TestTypeResolver.java	2015-06-19 15:15:05.205663826 +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
@@ -25,6 +25,8 @@
  * @test
  * @summary Tests com.sun.beans.TypeResolver
  * @author Eamonn McManus
+ * @modules java.base/sun.reflect.generics.reflectiveObjects
+ *          java.desktop/com.sun.beans
  */
 
 import com.sun.beans.TypeResolver;
--- old/test/java/beans/PropertyEditor/6380849/TestPropertyEditor.java	2015-06-19 15:15:05.777663816 +0300
+++ new/test/java/beans/PropertyEditor/6380849/TestPropertyEditor.java	2015-06-19 15:15:05.617663819 +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-06-19 15:15:06.201663809 +0300
+++ new/test/java/beans/PropertyEditor/Test6397609.java	2015-06-19 15:15:06.021663812 +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-06-19 15:15:06.609663802 +0300
+++ new/test/java/beans/PropertyEditor/Test6963811.java	2015-06-19 15:15:06.449663804 +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-06-19 15:15:07.009663795 +0300
+++ new/test/java/beans/PropertyEditor/TestBooleanClass.java	2015-06-19 15:15:06.849663797 +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-06-19 15:15:07.413663787 +0300
+++ new/test/java/beans/PropertyEditor/TestBooleanClassJava.java	2015-06-19 15:15:07.253663790 +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-06-19 15:15:07.825663780 +0300
+++ new/test/java/beans/PropertyEditor/TestBooleanClassNull.java	2015-06-19 15:15:07.665663783 +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-06-19 15:15:08.233663773 +0300
+++ new/test/java/beans/PropertyEditor/TestBooleanClassValue.java	2015-06-19 15:15:08.069663776 +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-06-19 15:15:08.637663766 +0300
+++ new/test/java/beans/PropertyEditor/TestBooleanType.java	2015-06-19 15:15:08.473663769 +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-06-19 15:15:09.041663759 +0300
+++ new/test/java/beans/PropertyEditor/TestBooleanTypeJava.java	2015-06-19 15:15:08.877663762 +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-06-19 15:15:09.445663752 +0300
+++ new/test/java/beans/PropertyEditor/TestBooleanTypeNull.java	2015-06-19 15:15:09.281663755 +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-06-19 15:15:09.853663744 +0300
+++ new/test/java/beans/PropertyEditor/TestBooleanTypeValue.java	2015-06-19 15:15:09.689663747 +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-06-19 15:15:10.261663737 +0300
+++ new/test/java/beans/PropertyEditor/TestByteClass.java	2015-06-19 15:15:10.101663740 +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-06-19 15:15:10.681663730 +0300
+++ new/test/java/beans/PropertyEditor/TestByteClassJava.java	2015-06-19 15:15:10.517663733 +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-06-19 15:15:11.081663723 +0300
+++ new/test/java/beans/PropertyEditor/TestByteClassNull.java	2015-06-19 15:15:10.921663726 +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-06-19 15:15:11.485663716 +0300
+++ new/test/java/beans/PropertyEditor/TestByteClassValue.java	2015-06-19 15:15:11.325663719 +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-06-19 15:15:11.893663709 +0300
+++ new/test/java/beans/PropertyEditor/TestByteType.java	2015-06-19 15:15:11.733663711 +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-06-19 15:15:12.317663701 +0300
+++ new/test/java/beans/PropertyEditor/TestByteTypeJava.java	2015-06-19 15:15:12.149663704 +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-06-19 15:15:12.729663694 +0300
+++ new/test/java/beans/PropertyEditor/TestByteTypeNull.java	2015-06-19 15:15:12.561663697 +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-06-19 15:15:13.149663686 +0300
+++ new/test/java/beans/PropertyEditor/TestByteTypeValue.java	2015-06-19 15:15:12.981663689 +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-06-19 15:15:13.553663679 +0300
+++ new/test/java/beans/PropertyEditor/TestColorClass.java	2015-06-19 15:15:13.393663682 +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-06-19 15:15:13.957663672 +0300
+++ new/test/java/beans/PropertyEditor/TestColorClassJava.java	2015-06-19 15:15:13.801663675 +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-06-19 15:15:14.369663665 +0300
+++ new/test/java/beans/PropertyEditor/TestColorClassNull.java	2015-06-19 15:15:14.209663668 +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-06-19 15:15:14.777663658 +0300
+++ new/test/java/beans/PropertyEditor/TestColorClassValue.java	2015-06-19 15:15:14.613663661 +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-06-19 15:15:15.209663650 +0300
+++ new/test/java/beans/PropertyEditor/TestDoubleClass.java	2015-06-19 15:15:15.041663653 +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-06-19 15:15:15.685663642 +0300
+++ new/test/java/beans/PropertyEditor/TestDoubleClassJava.java	2015-06-19 15:15:15.497663645 +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-06-19 15:15:16.109663634 +0300
+++ new/test/java/beans/PropertyEditor/TestDoubleClassNull.java	2015-06-19 15:15:15.937663637 +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-06-19 15:15:16.529663627 +0300
+++ new/test/java/beans/PropertyEditor/TestDoubleClassValue.java	2015-06-19 15:15:16.365663630 +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-06-19 15:15:16.949663619 +0300
+++ new/test/java/beans/PropertyEditor/TestDoubleType.java	2015-06-19 15:15:16.785663622 +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-06-19 15:15:17.357663612 +0300
+++ new/test/java/beans/PropertyEditor/TestDoubleTypeJava.java	2015-06-19 15:15:17.197663615 +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-06-19 15:15:17.801663604 +0300
+++ new/test/java/beans/PropertyEditor/TestDoubleTypeNull.java	2015-06-19 15:15:17.637663607 +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-06-19 15:15:18.269663596 +0300
+++ new/test/java/beans/PropertyEditor/TestDoubleTypeValue.java	2015-06-19 15:15:18.069663600 +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-06-19 15:15:18.729663588 +0300
+++ new/test/java/beans/PropertyEditor/TestEnumClass.java	2015-06-19 15:15:18.549663591 +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-06-19 15:15:19.197663580 +0300
+++ new/test/java/beans/PropertyEditor/TestEnumClassJava.java	2015-06-19 15:15:19.013663583 +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-06-19 15:15:19.669663571 +0300
+++ new/test/java/beans/PropertyEditor/TestEnumClassNull.java	2015-06-19 15:15:19.485663575 +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-06-19 15:15:20.145663563 +0300
+++ new/test/java/beans/PropertyEditor/TestEnumClassValue.java	2015-06-19 15:15:19.961663566 +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-06-19 15:15:20.605663555 +0300
+++ new/test/java/beans/PropertyEditor/TestEnumSubclass.java	2015-06-19 15:15:20.421663558 +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-06-19 15:15:21.069663547 +0300
+++ new/test/java/beans/PropertyEditor/TestEnumSubclassJava.java	2015-06-19 15:15:20.893663550 +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-06-19 15:15:21.553663538 +0300
+++ new/test/java/beans/PropertyEditor/TestEnumSubclassNull.java	2015-06-19 15:15:21.357663542 +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-06-19 15:15:22.017663530 +0300
+++ new/test/java/beans/PropertyEditor/TestEnumSubclassValue.java	2015-06-19 15:15:21.837663533 +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-06-19 15:15:22.473663522 +0300
+++ new/test/java/beans/PropertyEditor/TestFloatClass.java	2015-06-19 15:15:22.289663525 +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-06-19 15:15:22.933663514 +0300
+++ new/test/java/beans/PropertyEditor/TestFloatClassJava.java	2015-06-19 15:15:22.753663517 +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-06-19 15:15:23.433663505 +0300
+++ new/test/java/beans/PropertyEditor/TestFloatClassNull.java	2015-06-19 15:15:23.217663509 +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-06-19 15:15:23.929663496 +0300
+++ new/test/java/beans/PropertyEditor/TestFloatClassValue.java	2015-06-19 15:15:23.741663500 +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-06-19 15:15:24.397663488 +0300
+++ new/test/java/beans/PropertyEditor/TestFloatType.java	2015-06-19 15:15:24.217663491 +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-06-19 15:15:25.013663477 +0300
+++ new/test/java/beans/PropertyEditor/TestFloatTypeJava.java	2015-06-19 15:15:24.833663480 +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-06-19 15:15:26.089663458 +0300
+++ new/test/java/beans/PropertyEditor/TestFloatTypeNull.java	2015-06-19 15:15:25.925663461 +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-06-19 15:15:26.505663451 +0300
+++ new/test/java/beans/PropertyEditor/TestFloatTypeValue.java	2015-06-19 15:15:26.329663454 +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-06-19 15:15:26.945663443 +0300
+++ new/test/java/beans/PropertyEditor/TestFontClass.java	2015-06-19 15:15:26.773663446 +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-06-19 15:15:27.461663434 +0300
+++ new/test/java/beans/PropertyEditor/TestFontClassJava.java	2015-06-19 15:15:27.225663438 +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-06-19 15:15:27.973663425 +0300
+++ new/test/java/beans/PropertyEditor/TestFontClassNull.java	2015-06-19 15:15:27.789663428 +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-06-19 15:15:28.425663417 +0300
+++ new/test/java/beans/PropertyEditor/TestFontClassValue.java	2015-06-19 15:15:28.249663420 +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-06-19 15:15:28.881663409 +0300
+++ new/test/java/beans/PropertyEditor/TestIntegerClass.java	2015-06-19 15:15:28.685663413 +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-06-19 15:15:29.437663399 +0300
+++ new/test/java/beans/PropertyEditor/TestIntegerClassJava.java	2015-06-19 15:15:29.169663404 +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-06-19 15:15:29.953663390 +0300
+++ new/test/java/beans/PropertyEditor/TestIntegerClassNull.java	2015-06-19 15:15:29.749663394 +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-06-19 15:15:30.465663381 +0300
+++ new/test/java/beans/PropertyEditor/TestIntegerClassValue.java	2015-06-19 15:15:30.265663385 +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-06-19 15:15:30.973663372 +0300
+++ new/test/java/beans/PropertyEditor/TestIntegerType.java	2015-06-19 15:15:30.789663376 +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-06-19 15:15:31.477663363 +0300
+++ new/test/java/beans/PropertyEditor/TestIntegerTypeJava.java	2015-06-19 15:15:31.281663367 +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-06-19 15:15:31.949663355 +0300
+++ new/test/java/beans/PropertyEditor/TestIntegerTypeNull.java	2015-06-19 15:15:31.769663358 +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-06-19 15:15:32.425663347 +0300
+++ new/test/java/beans/PropertyEditor/TestIntegerTypeValue.java	2015-06-19 15:15:32.237663350 +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-06-19 15:15:32.893663338 +0300
+++ new/test/java/beans/PropertyEditor/TestLongClass.java	2015-06-19 15:15:32.709663342 +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-06-19 15:15:33.389663330 +0300
+++ new/test/java/beans/PropertyEditor/TestLongClassJava.java	2015-06-19 15:15:33.197663333 +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-06-19 15:15:33.881663321 +0300
+++ new/test/java/beans/PropertyEditor/TestLongClassNull.java	2015-06-19 15:15:33.681663325 +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-06-19 15:15:34.361663313 +0300
+++ new/test/java/beans/PropertyEditor/TestLongClassValue.java	2015-06-19 15:15:34.169663316 +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-06-19 15:15:34.801663305 +0300
+++ new/test/java/beans/PropertyEditor/TestLongType.java	2015-06-19 15:15:34.629663308 +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-06-19 15:15:35.241663297 +0300
+++ new/test/java/beans/PropertyEditor/TestLongTypeJava.java	2015-06-19 15:15:35.045663301 +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-06-19 15:15:35.685663289 +0300
+++ new/test/java/beans/PropertyEditor/TestLongTypeNull.java	2015-06-19 15:15:35.513663292 +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-06-19 15:15:36.137663281 +0300
+++ new/test/java/beans/PropertyEditor/TestLongTypeValue.java	2015-06-19 15:15:35.965663284 +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-06-19 15:15:36.645663272 +0300
+++ new/test/java/beans/PropertyEditor/TestShortClass.java	2015-06-19 15:15:36.429663276 +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-06-19 15:15:37.121663264 +0300
+++ new/test/java/beans/PropertyEditor/TestShortClassJava.java	2015-06-19 15:15:36.945663267 +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-06-19 15:15:37.585663256 +0300
+++ new/test/java/beans/PropertyEditor/TestShortClassNull.java	2015-06-19 15:15:37.405663259 +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-06-19 15:15:38.041663248 +0300
+++ new/test/java/beans/PropertyEditor/TestShortClassValue.java	2015-06-19 15:15:37.861663251 +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-06-19 15:15:38.489663240 +0300
+++ new/test/java/beans/PropertyEditor/TestShortType.java	2015-06-19 15:15:38.309663243 +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-06-19 15:15:38.965663231 +0300
+++ new/test/java/beans/PropertyEditor/TestShortTypeJava.java	2015-06-19 15:15:38.785663235 +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-06-19 15:15:39.437663223 +0300
+++ new/test/java/beans/PropertyEditor/TestShortTypeNull.java	2015-06-19 15:15:39.245663227 +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-06-19 15:15:39.893663215 +0300
+++ new/test/java/beans/PropertyEditor/TestShortTypeValue.java	2015-06-19 15:15:39.717663218 +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-06-19 15:15:40.341663207 +0300
+++ new/test/java/beans/PropertyEditor/TestStringClass.java	2015-06-19 15:15:40.169663210 +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-06-19 15:15:40.793663199 +0300
+++ new/test/java/beans/PropertyEditor/TestStringClassJava.java	2015-06-19 15:15:40.613663202 +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-06-19 15:15:41.253663191 +0300
+++ new/test/java/beans/PropertyEditor/TestStringClassNull.java	2015-06-19 15:15:41.081663194 +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-06-19 15:15:41.717663183 +0300
+++ new/test/java/beans/PropertyEditor/TestStringClassValue.java	2015-06-19 15:15:41.537663186 +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-06-19 15:15:42.197663175 +0300
+++ new/test/java/beans/XMLDecoder/8028054/TestConstructorFinder.java	2015-06-19 15:15:42.001663178 +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-06-19 15:15:42.653663166 +0300
+++ new/test/java/beans/XMLDecoder/8028054/TestMethodFinder.java	2015-06-19 15:15:42.473663170 +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-06-19 15:15:43.101663159 +0300
+++ new/test/java/beans/XMLEncoder/java_sql_Date.java	2015-06-19 15:15:42.929663162 +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-06-19 15:15:43.565663150 +0300
+++ new/test/java/beans/XMLEncoder/java_sql_Time.java	2015-06-19 15:15:43.385663154 +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-06-19 15:15:44.025663142 +0300
+++ new/test/java/beans/XMLEncoder/java_sql_Timestamp.java	2015-06-19 15:15:43.845663145 +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-06-19 15:15:44.505663134 +0300
+++ new/test/java/beans/XMLEncoder/sun_swing_PrintColorUIResource.java	2015-06-19 15:15:44.309663137 +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-06-19 15:15:45.005663125 +0300
+++ new/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	2015-06-19 15:15:44.805663129 +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-06-19 15:15:45.465663117 +0300
+++ new/test/javax/sound/midi/Gervill/AudioFloatConverter/GetFormat.java	2015-06-19 15:15:45.289663120 +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-06-19 15:15:45.913663109 +0300
+++ new/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java	2015-06-19 15:15:45.729663112 +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-06-19 15:15:46.361663101 +0300
+++ new/test/javax/sound/midi/Gervill/AudioFloatFormatConverter/SkipTest.java	2015-06-19 15:15:46.189663104 +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-06-19 15:15:46.809663093 +0300
+++ new/test/javax/sound/midi/Gervill/AudioFloatInputStream/Available.java	2015-06-19 15:15:46.629663096 +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-06-19 15:15:47.329663084 +0300
+++ new/test/javax/sound/midi/Gervill/AudioFloatInputStream/Close.java	2015-06-19 15:15:47.089663088 +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-06-19 15:15:47.885663074 +0300
+++ new/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFormat.java	2015-06-19 15:15:47.649663078 +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-06-19 15:15:48.397663065 +0300
+++ new/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFrameLength.java	2015-06-19 15:15:48.205663069 +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-06-19 15:15:48.869663057 +0300
+++ new/test/javax/sound/midi/Gervill/AudioFloatInputStream/MarkSupported.java	2015-06-19 15:15:48.685663060 +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-06-19 15:15:49.421663047 +0300
+++ new/test/javax/sound/midi/Gervill/AudioFloatInputStream/Read.java	2015-06-19 15:15:49.161663052 +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-06-19 15:15:49.905663039 +0300
+++ new/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArray.java	2015-06-19 15:15:49.725663042 +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-06-19 15:15:50.365663031 +0300
+++ new/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArrayIntInt.java	2015-06-19 15:15:50.177663034 +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/AudioFloatInputStream/Reset.java	2015-06-19 15:15:50.845663022 +0300
+++ new/test/javax/sound/midi/Gervill/AudioFloatInputStream/Reset.java	2015-06-19 15:15:50.657663025 +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 reset method */
+   @summary Test AudioFloatInputStream reset method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.*;
 
--- old/test/javax/sound/midi/Gervill/AudioFloatInputStream/Skip.java	2015-06-19 15:15:51.337663013 +0300
+++ new/test/javax/sound/midi/Gervill/AudioFloatInputStream/Skip.java	2015-06-19 15:15:51.113663017 +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 skip method */
+   @summary Test AudioFloatInputStream skip method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.*;
 
--- old/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankFile.java	2015-06-19 15:15:51.797663005 +0300
+++ new/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankFile.java	2015-06-19 15:15:51.621663008 +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 DLSSoundbankReader getSoundbank(File) method */
+ @summary Test DLSSoundbankReader getSoundbank(File) method 
+ @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 
--- old/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream.java	2015-06-19 15:15:52.229662998 +0300
+++ new/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream.java	2015-06-19 15:15:52.045663001 +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 DLSSoundbankReader getSoundbank(InputStream) method */
+ @summary Test DLSSoundbankReader getSoundbank(InputStream) method 
+ @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.BufferedInputStream;
 import java.io.File;
--- old/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream2.java	2015-06-19 15:15:52.677662990 +0300
+++ new/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream2.java	2015-06-19 15:15:52.485662993 +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 DLSSoundbankReader 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/DLSSoundbankReader/TestGetSoundbankUrl.java	2015-06-19 15:15:53.105662982 +0300
+++ new/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankUrl.java	2015-06-19 15:15:52.933662985 +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 DLSSoundbankReader getSoundbank(File) method */
+ @summary Test DLSSoundbankReader getSoundbank(File) method 
+ @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.net.URL;
--- old/test/javax/sound/midi/Gervill/EmergencySoundbank/TestCreateSoundbank.java	2015-06-19 15:15:53.593662974 +0300
+++ new/test/javax/sound/midi/Gervill/EmergencySoundbank/TestCreateSoundbank.java	2015-06-19 15:15:53.397662977 +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 EmergencySoundbank createSoundbank() method */
+ @summary Test EmergencySoundbank createSoundbank() method 
+ @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 
--- old/test/javax/sound/midi/Gervill/ModelByteBuffer/GetInputStream.java	2015-06-19 15:15:54.089662965 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/GetInputStream.java	2015-06-19 15:15:53.889662968 +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 getInputStream method */
+   @summary Test ModelByteBuffer getInputStream method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelByteBuffer/GetRoot.java	2015-06-19 15:15:54.589662956 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/GetRoot.java	2015-06-19 15:15:54.377662960 +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-06-19 15:15:55.101662947 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/Load.java	2015-06-19 15:15:54.885662951 +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-06-19 15:15:55.593662938 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/LoadAll.java	2015-06-19 15:15:55.381662942 +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-06-19 15:15:56.093662930 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArray.java	2015-06-19 15:15:55.845662934 +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-06-19 15:15:56.633662920 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArrayIntInt.java	2015-06-19 15:15:56.385662924 +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-06-19 15:15:57.077662912 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFile.java	2015-06-19 15:15:56.877662916 +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-06-19 15:15:57.537662904 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFileLongLong.java	2015-06-19 15:15:57.341662908 +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-06-19 15:15:57.977662896 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Available.java	2015-06-19 15:15:57.797662900 +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-06-19 15:15:58.429662888 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Close.java	2015-06-19 15:15:58.241662892 +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-06-19 15:15:58.873662881 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkReset.java	2015-06-19 15:15:58.693662884 +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-06-19 15:15:59.341662872 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkSupported.java	2015-06-19 15:15:59.125662876 +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-06-19 15:15:59.809662864 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Read.java	2015-06-19 15:15:59.613662868 +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-06-19 15:16:00.253662856 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByte.java	2015-06-19 15:16:00.069662860 +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-06-19 15:16:00.693662849 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java	2015-06-19 15:16:00.509662852 +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-06-19 15:16:01.161662840 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Skip.java	2015-06-19 15:16:00.985662843 +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-06-19 15:16:02.433662818 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLong.java	2015-06-19 15:16:02.253662821 +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-06-19 15:16:02.861662810 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLong.java	2015-06-19 15:16:02.689662813 +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-06-19 15:16:03.345662802 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLongBoolean.java	2015-06-19 15:16:03.169662805 +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-06-19 15:16:03.749662795 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/Unload.java	2015-06-19 15:16:03.581662798 +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-06-19 15:16:04.169662787 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBuffer/WriteTo.java	2015-06-19 15:16:03.993662790 +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-06-19 15:16:04.605662780 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetAttenuation.java	2015-06-19 15:16:04.421662783 +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-06-19 15:16:05.089662771 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetChannels.java	2015-06-19 15:16:04.897662774 +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-06-19 15:16:05.573662763 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopLength.java	2015-06-19 15:16:05.337662767 +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-06-19 15:16:06.033662754 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopStart.java	2015-06-19 15:16:05.841662758 +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-06-19 15:16:06.505662746 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetPitchCorrection.java	2015-06-19 15:16:06.309662750 +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-06-19 15:16:06.961662738 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java	2015-06-19 15:16:06.785662741 +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-06-19 15:16:07.389662731 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormat.java	2015-06-19 15:16:07.221662734 +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-06-19 15:16:07.817662723 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormatFloat.java	2015-06-19 15:16:07.645662726 +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-06-19 15:16:08.253662715 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferFloat.java	2015-06-19 15:16:08.077662718 +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-06-19 15:16:08.681662708 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Open.java	2015-06-19 15:16:08.505662711 +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-06-19 15:16:09.105662700 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/OpenStream.java	2015-06-19 15:16:08.933662703 +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
@@ -23,7 +23,9 @@
 
 /* @test
  @summary Test AudioFloatInputStream.getFrameLength() returned from
- ModelByteBufferWavetable openStream method */
+ 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-06-19 15:16:09.517662693 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Set8BitExtensionBuffer.java	2015-06-19 15:16:09.349662696 +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-06-19 15:16:09.945662686 +0300
+++ new/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/SetLoopType.java	2015-06-19 15:16:09.777662688 +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-06-19 15:16:10.369662678 +0300
+++ new/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestination.java	2015-06-19 15:16:10.201662681 +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-06-19 15:16:10.793662671 +0300
+++ new/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestinationModelIdentifier.java	2015-06-19 15:16:10.617662674 +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-06-19 15:16:11.213662663 +0300
+++ new/test/javax/sound/midi/Gervill/ModelDestination/SetIdentifier.java	2015-06-19 15:16:11.041662666 +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-06-19 15:16:11.633662656 +0300
+++ new/test/javax/sound/midi/Gervill/ModelDestination/SetTransform.java	2015-06-19 15:16:11.461662659 +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-06-19 15:16:12.057662648 +0300
+++ new/test/javax/sound/midi/Gervill/ModelIdentifier/EqualsObject.java	2015-06-19 15:16:11.889662651 +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-06-19 15:16:12.481662641 +0300
+++ new/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierString.java	2015-06-19 15:16:12.313662644 +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-06-19 15:16:12.913662633 +0300
+++ new/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringInt.java	2015-06-19 15:16:12.741662636 +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-06-19 15:16:13.333662626 +0300
+++ new/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringString.java	2015-06-19 15:16:13.161662629 +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-06-19 15:16:13.757662618 +0300
+++ new/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java	2015-06-19 15:16:13.585662621 +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-06-19 15:16:14.177662611 +0300
+++ new/test/javax/sound/midi/Gervill/ModelIdentifier/SetInstance.java	2015-06-19 15:16:14.009662614 +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-06-19 15:16:14.597662604 +0300
+++ new/test/javax/sound/midi/Gervill/ModelIdentifier/SetObject.java	2015-06-19 15:16:14.429662607 +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-06-19 15:16:15.021662596 +0300
+++ new/test/javax/sound/midi/Gervill/ModelIdentifier/SetVariable.java	2015-06-19 15:16:14.845662599 +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-06-19 15:16:15.445662589 +0300
+++ new/test/javax/sound/midi/Gervill/ModelPerformer/GetOscillators.java	2015-06-19 15:16:15.277662592 +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-06-19 15:16:15.873662581 +0300
+++ new/test/javax/sound/midi/Gervill/ModelPerformer/SetConnectionBlocks.java	2015-06-19 15:16:15.701662584 +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-06-19 15:16:16.309662573 +0300
+++ new/test/javax/sound/midi/Gervill/ModelPerformer/SetDefaultConnectionsEnabled.java	2015-06-19 15:16:16.137662576 +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-06-19 15:16:16.741662566 +0300
+++ new/test/javax/sound/midi/Gervill/ModelPerformer/SetExclusiveClass.java	2015-06-19 15:16:16.573662569 +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-06-19 15:16:17.161662558 +0300
+++ new/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyFrom.java	2015-06-19 15:16:16.993662561 +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-06-19 15:16:17.581662551 +0300
+++ new/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyTo.java	2015-06-19 15:16:17.417662554 +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-06-19 15:16:18.005662543 +0300
+++ new/test/javax/sound/midi/Gervill/ModelPerformer/SetName.java	2015-06-19 15:16:17.837662546 +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-06-19 15:16:18.421662536 +0300
+++ new/test/javax/sound/midi/Gervill/ModelPerformer/SetSelfNonExclusive.java	2015-06-19 15:16:18.253662539 +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-06-19 15:16:18.845662529 +0300
+++ new/test/javax/sound/midi/Gervill/ModelPerformer/SetVelFrom.java	2015-06-19 15:16:18.673662532 +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-06-19 15:16:19.281662521 +0300
+++ new/test/javax/sound/midi/Gervill/ModelPerformer/SetVelTo.java	2015-06-19 15:16:19.105662524 +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-06-19 15:16:19.701662514 +0300
+++ new/test/javax/sound/midi/Gervill/ModelSource/NewModelSource.java	2015-06-19 15:16:19.529662517 +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-06-19 15:16:20.129662506 +0300
+++ new/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifier.java	2015-06-19 15:16:19.961662509 +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-06-19 15:16:20.561662498 +0300
+++ new/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBoolean.java	2015-06-19 15:16:20.389662501 +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-06-19 15:16:20.981662491 +0300
+++ new/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBoolean.java	2015-06-19 15:16:20.813662494 +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-06-19 15:16:21.405662484 +0300
+++ new/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBooleanInt.java	2015-06-19 15:16:21.237662487 +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-06-19 15:16:21.837662476 +0300
+++ new/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierModelTransform.java	2015-06-19 15:16:21.669662479 +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-06-19 15:16:22.257662469 +0300
+++ new/test/javax/sound/midi/Gervill/ModelSource/SetIdentifier.java	2015-06-19 15:16:22.089662472 +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-06-19 15:16:22.681662461 +0300
+++ new/test/javax/sound/midi/Gervill/ModelSource/SetTransform.java	2015-06-19 15:16:22.509662464 +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-06-19 15:16:23.105662454 +0300
+++ new/test/javax/sound/midi/Gervill/ModelStandardIndexedDirector/ModelStandardIndexedDirectorTest.java	2015-06-19 15:16:22.933662457 +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-06-19 15:16:23.537662446 +0300
+++ new/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransform.java	2015-06-19 15:16:23.365662449 +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-06-19 15:16:23.961662439 +0300
+++ new/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBoolean.java	2015-06-19 15:16:23.789662442 +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-06-19 15:16:24.385662431 +0300
+++ new/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBoolean.java	2015-06-19 15:16:24.217662434 +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-06-19 15:16:24.817662423 +0300
+++ new/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBooleanInt.java	2015-06-19 15:16:24.645662426 +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-06-19 15:16:25.253662416 +0300
+++ new/test/javax/sound/midi/Gervill/ModelStandardTransform/SetDirection.java	2015-06-19 15:16:25.085662419 +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/ModelStandardTransform/SetPolarity.java	2015-06-19 15:16:25.673662408 +0300
+++ new/test/javax/sound/midi/Gervill/ModelStandardTransform/SetPolarity.java	2015-06-19 15:16:25.505662411 +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 setPolarity method */
+   @summary Test ModelStandardTransform setPolarity method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelStandardTransform/SetTransform.java	2015-06-19 15:16:26.077662401 +0300
+++ new/test/javax/sound/midi/Gervill/ModelStandardTransform/SetTransform.java	2015-06-19 15:16:25.913662404 +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 setTransform method */
+   @summary Test ModelStandardTransform setTransform method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformAbsolute.java	2015-06-19 15:16:26.509662394 +0300
+++ new/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformAbsolute.java	2015-06-19 15:16:26.337662397 +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 transform method */
+   @summary Test ModelStandardTransform transform method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import com.sun.media.sound.ModelStandardTransform;
 
--- old/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConcave.java	2015-06-19 15:16:26.929662386 +0300
+++ new/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConcave.java	2015-06-19 15:16:26.757662389 +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 transform method */
+   @summary Test ModelStandardTransform transform method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import com.sun.media.sound.ModelStandardTransform;
 
--- old/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConvex.java	2015-06-19 15:16:27.357662379 +0300
+++ new/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConvex.java	2015-06-19 15:16:27.185662382 +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 transform method */
+   @summary Test ModelStandardTransform transform method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import com.sun.media.sound.ModelStandardTransform;
 
--- old/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformLinear.java	2015-06-19 15:16:27.773662371 +0300
+++ new/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformLinear.java	2015-06-19 15:16:27.605662374 +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 transform method */
+   @summary Test ModelStandardTransform transform method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import com.sun.media.sound.ModelStandardTransform;
 
--- old/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformSwitch.java	2015-06-19 15:16:28.201662364 +0300
+++ new/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformSwitch.java	2015-06-19 15:16:28.033662367 +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 transform method */
+   @summary Test ModelStandardTransform transform method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import com.sun.media.sound.ModelStandardTransform;
 
--- old/test/javax/sound/midi/Gervill/RiffReaderWriter/Available.java	2015-06-19 15:16:28.613662357 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/Available.java	2015-06-19 15:16:28.449662359 +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-06-19 15:16:29.041662349 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/Close.java	2015-06-19 15:16:28.873662352 +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-06-19 15:16:29.465662342 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/GetFilePointer.java	2015-06-19 15:16:29.297662344 +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-06-19 15:16:29.881662334 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/GetSize.java	2015-06-19 15:16:29.717662337 +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-06-19 15:16:30.301662327 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/HasNextChunk.java	2015-06-19 15:16:30.133662330 +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-06-19 15:16:30.729662319 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/Read.java	2015-06-19 15:16:30.553662322 +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-06-19 15:16:31.141662312 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByte.java	2015-06-19 15:16:30.977662315 +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-06-19 15:16:31.565662305 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByteArrayIntInt.java	2015-06-19 15:16:31.401662307 +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-06-19 15:16:31.989662297 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadInt.java	2015-06-19 15:16:31.821662300 +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-06-19 15:16:32.409662290 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadLong.java	2015-06-19 15:16:32.241662293 +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-06-19 15:16:32.825662282 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadShort.java	2015-06-19 15:16:32.657662285 +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-06-19 15:16:33.245662275 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadString.java	2015-06-19 15:16:33.073662278 +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-06-19 15:16:33.677662267 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedByte.java	2015-06-19 15:16:33.501662270 +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-06-19 15:16:34.105662260 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedInt.java	2015-06-19 15:16:33.937662263 +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-06-19 15:16:34.533662252 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedShort.java	2015-06-19 15:16:34.361662255 +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-06-19 15:16:34.961662245 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/Skip.java	2015-06-19 15:16:34.793662248 +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-06-19 15:16:35.377662237 +0300
+++ new/test/javax/sound/midi/Gervill/RiffReaderWriter/WriteOutputStream.java	2015-06-19 15:16:35.209662240 +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-06-19 15:16:35.797662230 +0300
+++ new/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankFile.java	2015-06-19 15:16:35.629662233 +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-06-19 15:16:36.201662223 +0300
+++ new/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream.java	2015-06-19 15:16:36.033662226 +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-06-19 15:16:36.621662215 +0300
+++ new/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream2.java	2015-06-19 15:16:36.449662218 +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-06-19 15:16:37.045662208 +0300
+++ new/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankUrl.java	2015-06-19 15:16:36.877662211 +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-06-19 15:16:37.457662201 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrument.java	2015-06-19 15:16:37.289662204 +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-06-19 15:16:38.125662189 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntInt.java	2015-06-19 15:16:37.961662192 +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-06-19 15:16:38.561662181 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntInt.java	2015-06-19 15:16:38.385662184 +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-06-19 15:16:38.973662174 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntIntInt.java	2015-06-19 15:16:38.801662177 +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-06-19 15:16:39.389662167 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformer.java	2015-06-19 15:16:39.225662170 +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-06-19 15:16:39.817662159 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArray.java	2015-06-19 15:16:39.645662162 +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-06-19 15:16:40.237662152 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntInt.java	2015-06-19 15:16:40.069662155 +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-06-19 15:16:40.677662144 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntInt.java	2015-06-19 15:16:40.505662147 +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-06-19 15:16:41.093662137 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntIntInt.java	2015-06-19 15:16:40.925662140 +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-06-19 15:16:41.505662129 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntInt.java	2015-06-19 15:16:41.333662132 +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-06-19 15:16:41.929662122 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntInt.java	2015-06-19 15:16:41.757662125 +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-06-19 15:16:42.381662114 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntIntInt.java	2015-06-19 15:16:42.217662117 +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-06-19 15:16:42.809662106 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/Clear.java	2015-06-19 15:16:42.641662109 +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-06-19 15:16:43.237662099 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/SetName.java	2015-06-19 15:16:43.065662102 +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-06-19 15:16:43.673662091 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleInstrument/SetPatch.java	2015-06-19 15:16:43.501662094 +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-06-19 15:16:44.105662084 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleSoundbank/AddInstrument.java	2015-06-19 15:16:43.937662087 +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-06-19 15:16:44.529662076 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleSoundbank/AddResource.java	2015-06-19 15:16:44.361662079 +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-06-19 15:16:44.949662069 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleSoundbank/GetInstrument.java	2015-06-19 15:16:44.781662072 +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-06-19 15:16:45.361662061 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleSoundbank/RemoveInstrument.java	2015-06-19 15:16:45.197662064 +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-06-19 15:16:45.785662054 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleSoundbank/SetDescription.java	2015-06-19 15:16:45.617662057 +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-06-19 15:16:46.193662047 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleSoundbank/SetName.java	2015-06-19 15:16:46.029662050 +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-06-19 15:16:46.621662039 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVendor.java	2015-06-19 15:16:46.449662042 +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-06-19 15:16:47.057662032 +0300
+++ new/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVersion.java	2015-06-19 15:16:46.885662035 +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-06-19 15:16:47.481662024 +0300
+++ new/test/javax/sound/midi/Gervill/SoftAudioBuffer/Array.java	2015-06-19 15:16:47.313662027 +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-06-19 15:16:47.913662016 +0300
+++ new/test/javax/sound/midi/Gervill/SoftAudioBuffer/Clear.java	2015-06-19 15:16:47.741662019 +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-06-19 15:16:48.349662009 +0300
+++ new/test/javax/sound/midi/Gervill/SoftAudioBuffer/Get.java	2015-06-19 15:16:48.173662012 +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-06-19 15:16:48.793662001 +0300
+++ new/test/javax/sound/midi/Gervill/SoftAudioBuffer/NewSoftAudioBuffer.java	2015-06-19 15:16:48.613662004 +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-06-19 15:16:49.225661993 +0300
+++ new/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetFormat.java	2015-06-19 15:16:49.045661996 +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-06-19 15:16:49.653661986 +0300
+++ new/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetPropertyInfo.java	2015-06-19 15:16:49.485661989 +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-06-19 15:16:50.073661978 +0300
+++ new/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/Open.java	2015-06-19 15:16:49.905661981 +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-06-19 15:16:50.501661971 +0300
+++ new/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/OpenStream.java	2015-06-19 15:16:50.329661974 +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-06-19 15:16:50.921661963 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/AllNotesOff.java	2015-06-19 15:16:50.757661966 +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-06-19 15:16:51.349661956 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/AllSoundOff.java	2015-06-19 15:16:51.185661959 +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-06-19 15:16:51.769661948 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/ChannelPressure.java	2015-06-19 15:16:51.597661952 +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-06-19 15:16:52.197661941 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/Controller.java	2015-06-19 15:16:52.033661944 +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-06-19 15:16:52.617661934 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/LocalControl.java	2015-06-19 15:16:52.445661937 +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-06-19 15:16:53.049661926 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/Mono.java	2015-06-19 15:16:52.869661929 +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-06-19 15:16:53.469661919 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/Mute.java	2015-06-19 15:16:53.301661921 +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-06-19 15:16:53.885661911 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/NoteOff.java	2015-06-19 15:16:53.721661914 +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-06-19 15:16:54.297661904 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/NoteOff2.java	2015-06-19 15:16:54.133661907 +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-06-19 15:16:54.721661896 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/NoteOn.java	2015-06-19 15:16:54.553661899 +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-06-19 15:16:55.133661889 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest.java	2015-06-19 15:16:54.965661892 +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-06-19 15:16:55.561661882 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java	2015-06-19 15:16:55.397661885 +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-06-19 15:16:55.985661874 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/Omni.java	2015-06-19 15:16:55.817661877 +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/SoftChannel/PitchBend.java	2015-06-19 15:16:56.405661867 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/PitchBend.java	2015-06-19 15:16:56.237661870 +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 pitchBend method */
+   @summary Test SoftChannel pitchBend method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftChannel/PolyPressure.java	2015-06-19 15:16:56.825661859 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/PolyPressure.java	2015-06-19 15:16:56.657661862 +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 polyPressure method */
+   @summary Test SoftChannel polyPressure method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftChannel/ProgramAndBankChange.java	2015-06-19 15:16:57.261661852 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/ProgramAndBankChange.java	2015-06-19 15:16:57.093661855 +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 SoftChannel program and bank change */
+   @summary Test SoftChannel program and bank change 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.IOException;
 
--- old/test/javax/sound/midi/Gervill/SoftChannel/ProgramChange.java	2015-06-19 15:16:57.685661844 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/ProgramChange.java	2015-06-19 15:16:57.513661847 +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 programChange method */
+   @summary Test SoftChannel programChange method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftChannel/ResetAllControllers.java	2015-06-19 15:16:58.105661837 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/ResetAllControllers.java	2015-06-19 15:16:57.941661840 +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 resetAllControllers method */
+   @summary Test SoftChannel resetAllControllers method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftChannel/Solo.java	2015-06-19 15:16:58.517661830 +0300
+++ new/test/javax/sound/midi/Gervill/SoftChannel/Solo.java	2015-06-19 15:16:58.357661832 +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 solo method */
+   @summary Test SoftChannel solo method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import javax.sound.midi.*;
 import javax.sound.sampled.*;
--- old/test/javax/sound/midi/Gervill/SoftCubicResampler/Interpolate.java	2015-06-19 15:16:58.933661822 +0300
+++ new/test/javax/sound/midi/Gervill/SoftCubicResampler/Interpolate.java	2015-06-19 15:16:58.765661825 +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 SoftCubicResampler interpolate method */
+   @summary Test SoftCubicResampler interpolate method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileOutputStream;
--- old/test/javax/sound/midi/Gervill/SoftFilter/TestProcessAudio.java	2015-06-19 15:16:59.361661815 +0300
+++ new/test/javax/sound/midi/Gervill/SoftFilter/TestProcessAudio.java	2015-06-19 15:16:59.193661818 +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-06-19 15:16:59.793661807 +0300
+++ new/test/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java	2015-06-19 15:16:59.613661810 +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-06-19 15:17:00.225661799 +0300
+++ new/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix.java	2015-06-19 15:17:00.053661803 +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-06-19 15:17:00.645661792 +0300
+++ new/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono.java	2015-06-19 15:17:00.473661795 +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-06-19 15:17:01.081661784 +0300
+++ new/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java	2015-06-19 15:17:00.913661787 +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-06-19 15:17:01.501661777 +0300
+++ new/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_overdrive.java	2015-06-19 15:17:01.329661780 +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-06-19 15:17:01.925661770 +0300
+++ new/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal.java	2015-06-19 15:17:01.753661773 +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-06-19 15:17:02.357661762 +0300
+++ new/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal_mono.java	2015-06-19 15:17:02.181661765 +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-06-19 15:17:02.777661755 +0300
+++ new/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive.java	2015-06-19 15:17:02.613661757 +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-06-19 15:17:03.201661747 +0300
+++ new/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive_mono.java	2015-06-19 15:17:03.033661750 +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-06-19 15:17:03.625661740 +0300
+++ new/test/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java	2015-06-19 15:17:03.461661742 +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-06-19 15:17:04.041661732 +0300
+++ new/test/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java	2015-06-19 15:17:03.873661735 +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-06-19 15:17:04.457661725 +0300
+++ new/test/javax/sound/midi/Gervill/SoftLowFrequencyOscillator/TestProcessControlLogic.java	2015-06-19 15:17:04.289661728 +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-06-19 15:17:04.877661717 +0300
+++ new/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java	2015-06-19 15:17:04.709661720 +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-06-19 15:17:05.309661710 +0300
+++ new/test/javax/sound/midi/Gervill/SoftProvider/GetDevice.java	2015-06-19 15:17:05.141661713 +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-06-19 15:17:05.725661703 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Close.java	2015-06-19 15:17:05.557661706 +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-06-19 15:17:06.153661695 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java	2015-06-19 15:17:05.989661698 +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-06-19 15:17:06.573661688 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_ActiveSense.java	2015-06-19 15:17:06.409661690 +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-06-19 15:17:07.001661680 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllNotesOff.java	2015-06-19 15:17:06.825661683 +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-06-19 15:17:07.421661673 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllSoundOff.java	2015-06-19 15:17:07.249661676 +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-06-19 15:17:07.841661665 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_ChannelPressure.java	2015-06-19 15:17:07.677661668 +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-06-19 15:17:08.269661658 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_Controller.java	2015-06-19 15:17:08.101661661 +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-06-19 15:17:08.681661650 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_Mono.java	2015-06-19 15:17:08.513661653 +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-06-19 15:17:09.109661643 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOff.java	2015-06-19 15:17:08.941661646 +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-06-19 15:17:09.529661636 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn.java	2015-06-19 15:17:09.361661638 +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-06-19 15:17:09.953661628 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_AllChannels.java	2015-06-19 15:17:09.785661631 +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-06-19 15:17:10.369661621 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Delayed.java	2015-06-19 15:17:10.201661624 +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-06-19 15:17:10.785661613 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Multiple.java	2015-06-19 15:17:10.617661616 +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-06-19 15:17:11.213661606 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_Omni.java	2015-06-19 15:17:11.037661609 +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-06-19 15:17:11.633661598 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_PitchBend.java	2015-06-19 15:17:11.465661601 +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-06-19 15:17:12.061661591 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_PolyPressure.java	2015-06-19 15:17:11.897661594 +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-06-19 15:17:12.489661583 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_ProgramChange.java	2015-06-19 15:17:12.317661586 +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-06-19 15:17:12.917661576 +0300
+++ new/test/javax/sound/midi/Gervill/SoftReceiver/Send_ResetAllControllers.java	2015-06-19 15:17:12.745661579 +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-06-19 15:17:13.609661564 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSincResampler/Interpolate.java	2015-06-19 15:17:13.437661567 +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-06-19 15:17:14.021661556 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/Close.java	2015-06-19 15:17:13.853661559 +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-06-19 15:17:14.445661549 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments.java	2015-06-19 15:17:14.273661552 +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-06-19 15:17:14.869661541 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments2.java	2015-06-19 15:17:14.697661544 +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-06-19 15:17:15.301661534 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetChannels.java	2015-06-19 15:17:15.125661537 +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-06-19 15:17:15.717661526 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDefaultSoundbank.java	2015-06-19 15:17:15.549661529 +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-06-19 15:17:16.145661519 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDeviceInfo.java	2015-06-19 15:17:15.973661522 +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-06-19 15:17:16.581661511 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLatency.java	2015-06-19 15:17:16.405661514 +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-06-19 15:17:17.009661504 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments.java	2015-06-19 15:17:16.837661507 +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-06-19 15:17:17.433661496 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments2.java	2015-06-19 15:17:17.269661499 +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-06-19 15:17:17.853661489 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxPolyphony.java	2015-06-19 15:17:17.685661492 +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-06-19 15:17:18.273661481 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxReceivers.java	2015-06-19 15:17:18.105661484 +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-06-19 15:17:18.705661474 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxTransmitters.java	2015-06-19 15:17:18.533661477 +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-06-19 15:17:19.125661466 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMicrosecondPosition.java	2015-06-19 15:17:18.961661469 +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-06-19 15:17:19.549661459 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetPropertyInfo.java	2015-06-19 15:17:19.381661462 +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-06-19 15:17:19.977661451 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver.java	2015-06-19 15:17:19.809661454 +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-06-19 15:17:20.409661444 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver2.java	2015-06-19 15:17:20.233661447 +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-06-19 15:17:20.845661436 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceivers.java	2015-06-19 15:17:20.673661439 +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-06-19 15:17:21.285661428 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitter.java	2015-06-19 15:17:21.113661431 +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-06-19 15:17:21.789661419 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitters.java	2015-06-19 15:17:21.545661424 +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-06-19 15:17:22.397661409 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/GetVoiceStatus.java	2015-06-19 15:17:22.161661413 +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-06-19 15:17:22.849661401 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/ImplicitOpenClose.java	2015-06-19 15:17:22.669661404 +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-06-19 15:17:23.273661393 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/IsOpen.java	2015-06-19 15:17:23.109661396 +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-06-19 15:17:23.697661386 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/IsSoundbankSupported.java	2015-06-19 15:17:23.529661389 +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-06-19 15:17:24.117661378 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadAllInstruments.java	2015-06-19 15:17:23.945661381 +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-06-19 15:17:24.541661371 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstrument.java	2015-06-19 15:17:24.373661374 +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/SoftSynthesizer/LoadInstruments.java	2015-06-19 15:17:24.965661363 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstruments.java	2015-06-19 15:17:24.793661367 +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/Open.java	2015-06-19 15:17:25.493661354 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/Open.java	2015-06-19 15:17:25.321661357 +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 open method */
+   @summary Test SoftSynthesizer open method 
+   @modules java.desktop/com.sun.media.sound
+*/
 
 import java.lang.reflect.Field;
 
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/OpenStream.java	2015-06-19 15:17:25.913661347 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/OpenStream.java	2015-06-19 15:17:25.745661350 +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 openStream method */
+   @summary Test SoftSynthesizer openStream 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/RemapInstrument.java	2015-06-19 15:17:26.333661339 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/RemapInstrument.java	2015-06-19 15:17:26.157661342 +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 remapInstrument method */
+   @summary Test SoftSynthesizer remapInstrument 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/TestDisableLoadDefaultSoundbank.java	2015-06-19 15:17:26.749661332 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/TestDisableLoadDefaultSoundbank.java	2015-06-19 15:17:26.581661335 +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 Disable/enable loading default soundbank in SoftSynthesizer */
+ @summary Test Disable/enable loading default soundbank in SoftSynthesizer 
+ @modules java.desktop/com.sun.media.sound
+*/
 
 import java.util.HashMap;
 import java.util.Map;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/TestPreciseTimestampRendering.java	2015-06-19 15:17:27.165661325 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/TestPreciseTimestampRendering.java	2015-06-19 15:17:26.997661328 +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 rendering when using precise timestamps */
+ @summary Test rendering when using precise timestamps 
+ @modules java.desktop/com.sun.media.sound
+*/
 
 import java.util.Arrays;
 import java.util.Random;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/TestRender1.java	2015-06-19 15:17:27.585661317 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/TestRender1.java	2015-06-19 15:17:27.417661320 +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 simple note rendering in many settings */
+ @summary Test SoftSynthesizer simple note rendering in many settings 
+ @modules java.desktop/com.sun.media.sound
+*/
 
 import java.io.File;
 import java.io.FileInputStream;
--- old/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadAllInstruments.java	2015-06-19 15:17:28.017661310 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadAllInstruments.java	2015-06-19 15:17:27.845661313 +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 unloadAllInstruments method */
+   @summary Test SoftSynthesizer unloadAllInstruments 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/UnloadInstrument.java	2015-06-19 15:17:28.445661302 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstrument.java	2015-06-19 15:17:28.277661305 +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 unloadInstrument method */
+   @summary Test SoftSynthesizer unloadInstrument 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/UnloadInstruments.java	2015-06-19 15:17:28.873661295 +0300
+++ new/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstruments.java	2015-06-19 15:17:28.701661298 +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 unloadInstruments method */
+   @summary Test SoftSynthesizer unloadInstruments 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-06-19 15:17:29.301661287 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/GetName.java	2015-06-19 15:17:29.133661290 +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-06-19 15:17:29.725661280 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/GetTuning.java	2015-06-19 15:17:29.557661283 +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-06-19 15:17:30.145661272 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/GetTuningInt.java	2015-06-19 15:17:29.973661275 +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-06-19 15:17:30.565661265 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/Load1.java	2015-06-19 15:17:30.397661268 +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-06-19 15:17:31.005661257 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/Load2.java	2015-06-19 15:17:30.829661260 +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-06-19 15:17:31.465661249 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/Load4.java	2015-06-19 15:17:31.273661252 +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-06-19 15:17:31.961661240 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/Load5.java	2015-06-19 15:17:31.753661244 +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-06-19 15:17:32.597661229 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/Load6.java	2015-06-19 15:17:32.317661234 +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-06-19 15:17:33.133661220 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/Load7.java	2015-06-19 15:17:32.937661223 +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-06-19 15:17:33.601661211 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/Load8.java	2015-06-19 15:17:33.413661215 +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-06-19 15:17:34.085661203 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/Load9.java	2015-06-19 15:17:33.885661206 +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-06-19 15:17:34.529661195 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuning.java	2015-06-19 15:17:34.353661198 +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-06-19 15:17:34.985661187 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningByteArray.java	2015-06-19 15:17:34.801661190 +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-06-19 15:17:35.453661179 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatch.java	2015-06-19 15:17:35.265661182 +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-06-19 15:17:35.925661170 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatchByteArray.java	2015-06-19 15:17:35.741661174 +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-06-19 15:17:36.445661161 +0300
+++ new/test/javax/sound/midi/Gervill/SoftTuning/RealTimeTuning.java	2015-06-19 15:17:36.265661164 +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-06-19 15:17:36.957661152 +0300
+++ new/test/javax/swing/DataTransfer/6456844/bug6456844.java	2015-06-19 15:17:36.765661156 +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-06-19 15:17:37.493661143 +0300
+++ new/test/javax/swing/JButton/4796987/bug4796987.java	2015-06-19 15:17:37.313661146 +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,8 @@
  * @author Alexander Scherbatiy
  * @library ../../regtesthelpers
  * @library ../../../../lib/testlibrary
+ * @modules java.desktop/com.sun.java.swing.plaf.windows
+ *          java.desktop/sun.awt
  * @build jdk.testlibrary.OSInfo
  * @build Util
  * @run main bug4796987
--- old/test/javax/swing/JCheckBox/4449413/bug4449413.java	2015-06-19 15:17:37.965661134 +0300
+++ new/test/javax/swing/JCheckBox/4449413/bug4449413.java	2015-06-19 15:17:37.785661138 +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-06-19 15:17:38.425661126 +0300
+++ new/test/javax/swing/JColorChooser/Test6524757.java	2015-06-19 15:17:38.237661130 +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-06-19 15:17:38.885661118 +0300
+++ new/test/javax/swing/JComboBox/4199622/bug4199622.java	2015-06-19 15:17:38.701661121 +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-06-19 15:17:39.325661110 +0300
+++ new/test/javax/swing/JComboBox/8015300/Test8015300.java	2015-06-19 15:17:39.149661114 +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-06-19 15:17:39.765661103 +0300
+++ new/test/javax/swing/JComponent/6683775/bug6683775.java	2015-06-19 15:17:39.593661106 +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/JComponent/8043610/bug8043610.java	2015-06-19 15:17:40.209661095 +0300
+++ new/test/javax/swing/JComponent/8043610/bug8043610.java	2015-06-19 15:17:40.029661098 +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 @@
   @summary Tests that JComponent invalidate, revalidate and repaint methods could
            be called from any thread
   @author Petr Pchelko
+  @modules java.desktop/sun.awt
 */
 
 import sun.awt.SunToolkit;
--- old/test/javax/swing/JEditorPane/bug4714674.java	2015-06-19 15:17:40.649661087 +0300
+++ new/test/javax/swing/JEditorPane/bug4714674.java	2015-06-19 15:17:40.465661090 +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
@@ -25,6 +25,8 @@
    @bug 4714674
    @summary Tests that JEditorPane opens HTTP connection asynchronously
    @author Peter Zhelezniakov
+   @modules java.desktop
+            jdk.httpserver
    @run main bug4714674
 */
 
--- old/test/javax/swing/JFileChooser/4847375/bug4847375.java	2015-06-19 15:17:41.125661079 +0300
+++ new/test/javax/swing/JFileChooser/4847375/bug4847375.java	2015-06-19 15:17:40.933661082 +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-06-19 15:17:41.573661071 +0300
+++ new/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java	2015-06-19 15:17:41.393661074 +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-06-19 15:17:42.013661063 +0300
+++ new/test/javax/swing/JFileChooser/6550546/bug6550546.java	2015-06-19 15:17:41.841661066 +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-06-19 15:17:42.453661055 +0300
+++ new/test/javax/swing/JFileChooser/6713352/bug6713352.java	2015-06-19 15:17:42.281661058 +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-06-19 15:17:42.913661047 +0300
+++ new/test/javax/swing/JFileChooser/6741890/bug6741890.java	2015-06-19 15:17:42.729661050 +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-06-19 15:17:43.369661039 +0300
+++ new/test/javax/swing/JFileChooser/6798062/bug6798062.java	2015-06-19 15:17:43.193661042 +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-06-19 15:17:43.817661031 +0300
+++ new/test/javax/swing/JFileChooser/6817933/Test6817933.java	2015-06-19 15:17:43.637661034 +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-06-19 15:17:44.253661024 +0300
+++ new/test/javax/swing/JFileChooser/6840086/bug6840086.java	2015-06-19 15:17:44.081661027 +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-06-19 15:17:44.725661015 +0300
+++ new/test/javax/swing/JFileChooser/6945316/bug6945316.java	2015-06-19 15:17:44.541661019 +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-06-19 15:17:45.177661007 +0300
+++ new/test/javax/swing/JFileChooser/8046391/bug8046391.java	2015-06-19 15:17:45.001661010 +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/8062561/bug8062561.java	2015-06-19 15:17:45.637660999 +0300
+++ new/test/javax/swing/JFileChooser/8062561/bug8062561.java	2015-06-19 15:17:45.453661002 +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
@@ -38,6 +38,7 @@
  * @bug 8062561
  * @summary File system view returns null default directory
  * @library ../../../../lib/testlibrary
+ * @modules java.desktop/sun.awt
  * @build jdk.testlibrary.OSInfo
  * @run main/othervm bug8062561 GENERATE_POLICY
  * @run main/othervm/policy=security.policy bug8062561 CHECK_DEFAULT_DIR run
--- old/test/javax/swing/JInternalFrame/6725409/bug6725409.java	2015-06-19 15:17:46.089660991 +0300
+++ new/test/javax/swing/JInternalFrame/6725409/bug6725409.java	2015-06-19 15:17:45.913660994 +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-06-19 15:17:46.549660983 +0300
+++ new/test/javax/swing/JLabel/7004134/bug7004134.java	2015-06-19 15:17:46.365660986 +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-06-19 15:17:47.033660975 +0300
+++ new/test/javax/swing/JPopupMenu/6495920/bug6495920.java	2015-06-19 15:17:46.853660978 +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/6827786/bug6827786.java	2015-06-19 15:17:47.481660967 +0300
+++ new/test/javax/swing/JPopupMenu/6827786/bug6827786.java	2015-06-19 15:17:47.301660970 +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
@@ -28,6 +28,7 @@
  * @author Peter Zhelezniakov
  * @library ../../regtesthelpers
  * @library ../../../../lib/testlibrary
+ * @modules java.desktop/sun.awt
  * @build jdk.testlibrary.OSInfo
  * @build Util
  * @run main bug6827786
--- old/test/javax/swing/JPopupMenu/7156657/bug7156657.java	2015-06-19 15:17:47.969660958 +0300
+++ new/test/javax/swing/JPopupMenu/7156657/bug7156657.java	2015-06-19 15:17:47.765660962 +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/JSlider/6524424/bug6524424.java	2015-06-19 15:17:48.425660950 +0300
+++ new/test/javax/swing/JSlider/6524424/bug6524424.java	2015-06-19 15:17:48.237660953 +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-06-19 15:17:49.425660932 +0300
+++ new/test/javax/swing/JTable/6788484/bug6788484.java	2015-06-19 15:17:49.229660936 +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-06-19 15:17:49.929660924 +0300
+++ new/test/javax/swing/JTable/6937798/bug6937798.java	2015-06-19 15:17:49.729660927 +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-06-19 15:17:50.389660915 +0300
+++ new/test/javax/swing/JTree/8004298/bug8004298.java	2015-06-19 15:17:50.209660919 +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/Security/6657138/bug6657138.java	2015-06-19 15:17:50.985660905 +0300
+++ new/test/javax/swing/Security/6657138/bug6657138.java	2015-06-19 15:17:50.725660910 +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-06-19 15:17:51.509660896 +0300
+++ new/test/javax/swing/Security/6938813/bug6938813.java	2015-06-19 15:17:51.317660899 +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-06-19 15:17:52.017660887 +0300
+++ new/test/javax/swing/SwingUtilities/8032219/DrawRect.java	2015-06-19 15:17:51.797660891 +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/7123767/bug7123767.java	2015-06-19 15:17:52.593660877 +0300
+++ new/test/javax/swing/ToolTipManager/7123767/bug7123767.java	2015-06-19 15:17:52.353660881 +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
@@ -25,6 +25,7 @@
    @bug 7123767
    @summary Wrong tooltip location in Multi-Monitor configurations
    @author Vladislav Karnaukhov
+   @modules java.desktop/sun.awt
    @run main bug7123767
 */
 
--- old/test/javax/swing/ToolTipManager/Test6657026.java	2015-06-19 15:17:53.141660867 +0300
+++ new/test/javax/swing/ToolTipManager/Test6657026.java	2015-06-19 15:17:52.905660871 +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-06-19 15:17:53.625660858 +0300
+++ new/test/javax/swing/UIDefaults/6795356/TableTest.java	2015-06-19 15:17:53.429660862 +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-06-19 15:17:54.097660850 +0300
+++ new/test/javax/swing/UIManager/Test6657026.java	2015-06-19 15:17:53.901660854 +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-06-19 15:17:54.557660842 +0300
+++ new/test/javax/swing/border/Test4856008.java	2015-06-19 15:17:54.381660845 +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-06-19 15:17:55.005660834 +0300
+++ new/test/javax/swing/border/Test6978482.java	2015-06-19 15:17:54.837660837 +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-06-19 15:17:55.441660826 +0300
+++ new/test/javax/swing/plaf/basic/BasicSplitPaneUI/Test6657026.java	2015-06-19 15:17:55.269660829 +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-06-19 15:17:55.893660818 +0300
+++ new/test/javax/swing/plaf/metal/MetalBumps/Test6657026.java	2015-06-19 15:17:55.725660821 +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-06-19 15:17:56.329660811 +0300
+++ new/test/javax/swing/plaf/metal/MetalInternalFrameUI/Test6657026.java	2015-06-19 15:17:56.161660814 +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-06-19 15:17:56.761660803 +0300
+++ new/test/javax/swing/plaf/metal/MetalSliderUI/Test6657026.java	2015-06-19 15:17:56.593660806 +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-06-19 15:17:57.193660796 +0300
+++ new/test/javax/swing/plaf/nimbus/Test6741426.java	2015-06-19 15:17:57.017660799 +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-06-19 15:17:57.605660788 +0300
+++ new/test/javax/swing/plaf/synth/7143614/bug7143614.java	2015-06-19 15:17:57.441660791 +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-06-19 15:17:58.025660781 +0300
+++ new/test/javax/swing/plaf/synth/Test6660049.java	2015-06-19 15:17:57.853660784 +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-06-19 15:17:58.449660773 +0300
+++ new/test/javax/swing/system/6799345/TestShutdown.java	2015-06-19 15:17:58.277660776 +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-06-19 15:17:58.881660766 +0300
+++ new/test/javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java	2015-06-19 15:17:58.701660769 +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-06-19 15:17:59.309660758 +0300
+++ new/test/javax/swing/text/LayoutQueue/Test6588003.java	2015-06-19 15:17:59.141660761 +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-06-19 15:17:59.729660751 +0300
+++ new/test/javax/swing/text/html/parser/Parser/6990651/bug6990651.java	2015-06-19 15:17:59.561660754 +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-06-19 15:18:00.165660743 +0300
+++ new/test/javax/swing/text/html/parser/Test8017492.java	2015-06-19 15:17:59.993660746 +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-06-19 15:18:00.629660735 +0300
+++ new/test/sun/awt/AppContext/8012933/Test8012933.java	2015-06-19 15:18:00.449660738 +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-06-19 15:18:01.045660728 +0300
+++ new/test/sun/awt/AppContext/MultiThread/MultiThreadTest.java	2015-06-19 15:18:00.881660731 +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-06-19 15:18:01.469660720 +0300
+++ new/test/sun/awt/datatransfer/DataFlavorComparatorTest.java	2015-06-19 15:18:01.301660723 +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-06-19 15:18:01.897660713 +0300
+++ new/test/sun/awt/datatransfer/DataFlavorComparatorTest1.java	2015-06-19 15:18:01.725660716 +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-06-19 15:18:02.321660705 +0300
+++ new/test/sun/awt/datatransfer/SuplementaryCharactersTransferTest.java	2015-06-19 15:18:02.149660708 +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-06-19 15:18:02.749660698 +0300
+++ new/test/sun/java2d/SunGraphics2D/EmptyClipRenderingTest.java	2015-06-19 15:18:02.577660701 +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-06-19 15:18:03.185660690 +0300
+++ new/test/sun/java2d/pipe/RegionOps.java	2015-06-19 15:18:03.013660693 +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-06-19 15:18:03.613660682 +0300
+++ new/test/sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java	2015-06-19 15:18:03.445660685 +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-06-19 15:18:04.045660675 +0300
+++ new/test/sun/java2d/pipe/hw/RSLContextInvalidationTest/RSLContextInvalidationTest.java	2015-06-19 15:18:03.885660678 +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-06-19 15:18:04.493660667 +0300
+++ new/test/sun/java2d/pipe/hw/VSyncedBufferStrategyTest/VSyncedBufferStrategyTest.java	2015-06-19 15:18:04.309660670 +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-06-19 12:45:39.381821825 +0300
+++ new/test/com/apple/eawt/TEST.properties	2015-06-19 15:18:04.761660662 +0300
@@ -0,0 +1,2 @@
+modules=java.desktop
+
--- /dev/null	2015-06-19 12:45:39.381821825 +0300
+++ new/test/com/sun/awt/TEST.properties	2015-06-19 15:18:05.153660655 +0300
@@ -0,0 +1,2 @@
+modules=java.desktop
+
--- /dev/null	2015-06-19 12:45:39.381821825 +0300
+++ new/test/com/sun/java/swing/TEST.properties	2015-06-19 15:18:05.597660647 +0300
@@ -0,0 +1,2 @@
+modules=java.desktop
+
--- /dev/null	2015-06-19 12:45:39.381821825 +0300
+++ new/test/java/awt/TEST.properties	2015-06-19 15:18:05.985660641 +0300
@@ -0,0 +1,2 @@
+modules=java.desktop
+
--- /dev/null	2015-06-19 12:45:39.381821825 +0300
+++ new/test/java/beans/TEST.properties	2015-06-19 15:18:06.393660633 +0300
@@ -0,0 +1,2 @@
+modules=java.desktop
+
--- /dev/null	2015-06-19 12:45:39.381821825 +0300
+++ new/test/javax/accessibility/TEST.properties	2015-06-19 15:18:06.785660627 +0300
@@ -0,0 +1,2 @@
+modules=java.desktop
+
--- /dev/null	2015-06-19 12:45:39.381821825 +0300
+++ new/test/javax/imageio/TEST.properties	2015-06-19 15:18:07.181660620 +0300
@@ -0,0 +1 @@
+modules=java.desktop
--- /dev/null	2015-06-19 12:45:39.381821825 +0300
+++ new/test/javax/print/TEST.properties	2015-06-19 15:18:07.585660612 +0300
@@ -0,0 +1,2 @@
+modules=java.desktop
+
--- /dev/null	2015-06-19 12:45:39.381821825 +0300
+++ new/test/javax/sound/TEST.properties	2015-06-19 15:18:07.993660605 +0300
@@ -0,0 +1,2 @@
+modules=java.desktop
+
--- /dev/null	2015-06-19 12:45:39.381821825 +0300
+++ new/test/javax/swing/TEST.properties	2015-06-19 15:18:08.385660598 +0300
@@ -0,0 +1,2 @@
+modules=java.desktop
+
--- /dev/null	2015-06-19 12:45:39.381821825 +0300
+++ new/test/sun/awt/TEST.properties	2015-06-19 15:18:08.773660591 +0300
@@ -0,0 +1,2 @@
+modules=java.desktop
+
--- /dev/null	2015-06-19 12:45:39.381821825 +0300
+++ new/test/sun/java2d/TEST.properties	2015-06-19 15:18:09.173660584 +0300
@@ -0,0 +1,2 @@
+modules=java.desktop
+
--- /dev/null	2015-06-19 12:45:39.381821825 +0300
+++ new/test/sun/pisces/TEST.properties	2015-06-19 15:18:09.565660578 +0300
@@ -0,0 +1 @@
+modules=java.desktop