changeset 31448:1066345d2a8a

8076468: Add @modules to tests in jdk_desktop test group Reviewed-by: yan, alexsch
author yan
date Tue, 23 Jun 2015 11:59:27 +0300
parents a5d56b872e3a
children 6b42ca2b2dca 738dd49e1689
files jdk/test/com/apple/eawt/DefaultMenuBar/DefaultMenuBarTest.java jdk/test/com/apple/eawt/TEST.properties jdk/test/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java jdk/test/com/sun/awt/TEST.properties jdk/test/com/sun/awt/Translucency/WindowOpacity.java jdk/test/com/sun/java/swing/TEST.properties jdk/test/com/sun/java/swing/plaf/windows/Test6824600.java jdk/test/java/awt/Choice/ItemStateChangeTest/ItemStateChangeTest.java jdk/test/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.java jdk/test/java/awt/Desktop/8064934/bug8064934.java jdk/test/java/awt/Dialog/CloseDialog/CloseDialogTest.java jdk/test/java/awt/EventDispatchThread/EDTShutdownTest/EDTShutdownTest.java jdk/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html jdk/test/java/awt/EventQueue/MainAppContext/MainAppContext.java jdk/test/java/awt/EventQueue/PostEventOrderingTest/PostEventOrderingTest.java jdk/test/java/awt/EventQueue/PushPopDeadlock2/PushPopTest.java jdk/test/java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.html jdk/test/java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.html jdk/test/java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.html jdk/test/java/awt/Graphics2D/Test8004859/Test8004859.java jdk/test/java/awt/Graphics2D/TransformSetGet/TransformSetGet.java jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html jdk/test/java/awt/Menu/OpensWithNoGrab/OpensWithNoGrab.java jdk/test/java/awt/Mixing/AWT_Mixing/JButtonInGlassPaneOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JColorChooserOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JEditorPaneInGlassPaneOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JEditorPaneOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JGlassPaneInternalFrameOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JGlassPaneMoveOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JLabelInGlassPaneOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JLabelOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JListInGlassPaneOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JListOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JPanelInGlassPaneOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JPanelOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JProgressBarInGlassPaneOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JProgressBarOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JScrollBarInGlassPaneOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JScrollBarOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JScrollPaneOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JSliderInGlassPaneOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JSliderOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JSpinnerInGlassPaneOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JSpinnerOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JTableOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JTextAreaInGlassPaneOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JTextAreaOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JTextFieldInGlassPaneOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JTextFieldOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JToggleButtonInGlassPaneOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/JToggleButtonOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/MixingFrameResizing.java jdk/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java jdk/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java jdk/test/java/awt/Mixing/AWT_Mixing/ViewportOverlapping.java jdk/test/java/awt/Mixing/OpaqueTest.java jdk/test/java/awt/SplashScreen/FullscreenAfterSplash/FullScreenAfterSplash.java jdk/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java jdk/test/java/awt/TEST.properties jdk/test/java/awt/Toolkit/RealSync/RealSyncOnEDT.java jdk/test/java/awt/Toolkit/RealSync/Test.java jdk/test/java/awt/Window/AlwaysOnTop/AutoTestOnTop.java jdk/test/java/awt/Window/Grab/GrabTest.java jdk/test/java/awt/Window/WindowsLeak/WindowsLeak.java jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh jdk/test/java/awt/datatransfer/Clipboard/BasicClipboardTest.java jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorCloneTest/DataFlavorCloneTest.java jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorEqualsNullTest.java jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorEqualsTest.java jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorFileListTest.java jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorSerializedTest.java jdk/test/java/awt/datatransfer/DataFlavor/DefaultMatchTest.java jdk/test/java/awt/datatransfer/DataFlavor/EqualsHashCodeSymmetryTest/EqualsHashCodeSymmetryTest.java jdk/test/java/awt/datatransfer/DataFlavor/ExternalizeTest.java jdk/test/java/awt/datatransfer/DataFlavor/GetReaderForTextIAEForStringSelectionTest.java jdk/test/java/awt/datatransfer/DataFlavor/GetReaderForTextNPETest.java jdk/test/java/awt/datatransfer/DataFlavor/MimeTypeSerializationTest.java jdk/test/java/awt/datatransfer/DataFlavor/NoClassParameterTest.java jdk/test/java/awt/datatransfer/DataFlavor/NormalizeMimeTypeParameter.java jdk/test/java/awt/datatransfer/DataFlavor/ReaderForUnicodeText.java jdk/test/java/awt/datatransfer/DataFlavor/SelectBestFlavorNPETest.java jdk/test/java/awt/datatransfer/DataFlavor/SelectBestTextFlavorBadArrayTest.java jdk/test/java/awt/datatransfer/DataFlavor/ToStringNullPointerTest.java jdk/test/java/awt/datatransfer/Headless/HeadlessClipboard.java jdk/test/java/awt/datatransfer/Headless/HeadlessDataFlavor.java jdk/test/java/awt/datatransfer/Headless/HeadlessSystemFlavorMap.java jdk/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorForNativeTest.java jdk/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java jdk/test/java/awt/datatransfer/SystemFlavorMap/AddNativeForFlavorTest.java jdk/test/java/awt/datatransfer/SystemFlavorMap/AddNativeTest.java jdk/test/java/awt/datatransfer/SystemFlavorMap/DuplicateMappingTest.java jdk/test/java/awt/datatransfer/SystemFlavorMap/DuplicatedNativesTest.java jdk/test/java/awt/datatransfer/SystemFlavorMap/GetFlavorsForNewNativeTest.java jdk/test/java/awt/datatransfer/SystemFlavorMap/GetNativesForFlavorTest.java jdk/test/java/awt/datatransfer/SystemFlavorMap/GetNativesForNewFlavorTest.java jdk/test/java/awt/datatransfer/SystemFlavorMap/InvalidMapArgumentsTest.java jdk/test/java/awt/datatransfer/SystemFlavorMap/ManyFlavorMapTest.java jdk/test/java/awt/datatransfer/SystemFlavorMap/MappingGenerationTest.java jdk/test/java/awt/datatransfer/SystemFlavorMap/SetDataFlavorsTest.java jdk/test/java/awt/datatransfer/SystemFlavorMap/SetFlavorsForNativeTest.java jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavor.java jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavorTest.java jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesTest.java jdk/test/java/awt/event/ComponentEvent/MovedResizedTardyEventTest/MovedResizedTardyEventTest.html jdk/test/java/awt/event/KeyEvent/AltCharAcceleratorTest/AltCharAcceleratorTest.java jdk/test/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java jdk/test/java/awt/event/OtherEvents/UngrabID/UngrabID.java jdk/test/java/awt/im/8041990/bug8041990.java jdk/test/java/awt/image/MultiResolutionImage/NSImageToMultiResolutionImageTest.java jdk/test/java/awt/image/MultiResolutionImageTest.java jdk/test/java/awt/image/mlib/MlibOpsTest.java jdk/test/java/awt/image/multiresolution/MultiResolutionToolkitImageTest.java jdk/test/java/awt/keyboard/EqualKeyCode/EqualKeyCode.java jdk/test/java/awt/print/bug8023392/bug8023392.html jdk/test/java/awt/xembed/server/RunTestXEmbed.java jdk/test/java/awt/xembed/server/TestXEmbedServerJava.java jdk/test/java/beans/Introspector/Test6277246.java jdk/test/java/beans/Introspector/TestCacheRecursion.java jdk/test/java/beans/Introspector/TestTypeResolver.java jdk/test/java/beans/PropertyEditor/6380849/TestPropertyEditor.java jdk/test/java/beans/PropertyEditor/Test6397609.java jdk/test/java/beans/PropertyEditor/Test6963811.java jdk/test/java/beans/PropertyEditor/TestBooleanClass.java jdk/test/java/beans/PropertyEditor/TestBooleanClassJava.java jdk/test/java/beans/PropertyEditor/TestBooleanClassNull.java jdk/test/java/beans/PropertyEditor/TestBooleanClassValue.java jdk/test/java/beans/PropertyEditor/TestBooleanType.java jdk/test/java/beans/PropertyEditor/TestBooleanTypeJava.java jdk/test/java/beans/PropertyEditor/TestBooleanTypeNull.java jdk/test/java/beans/PropertyEditor/TestBooleanTypeValue.java jdk/test/java/beans/PropertyEditor/TestByteClass.java jdk/test/java/beans/PropertyEditor/TestByteClassJava.java jdk/test/java/beans/PropertyEditor/TestByteClassNull.java jdk/test/java/beans/PropertyEditor/TestByteClassValue.java jdk/test/java/beans/PropertyEditor/TestByteType.java jdk/test/java/beans/PropertyEditor/TestByteTypeJava.java jdk/test/java/beans/PropertyEditor/TestByteTypeNull.java jdk/test/java/beans/PropertyEditor/TestByteTypeValue.java jdk/test/java/beans/PropertyEditor/TestColorClass.java jdk/test/java/beans/PropertyEditor/TestColorClassJava.java jdk/test/java/beans/PropertyEditor/TestColorClassNull.java jdk/test/java/beans/PropertyEditor/TestColorClassValue.java jdk/test/java/beans/PropertyEditor/TestDoubleClass.java jdk/test/java/beans/PropertyEditor/TestDoubleClassJava.java jdk/test/java/beans/PropertyEditor/TestDoubleClassNull.java jdk/test/java/beans/PropertyEditor/TestDoubleClassValue.java jdk/test/java/beans/PropertyEditor/TestDoubleType.java jdk/test/java/beans/PropertyEditor/TestDoubleTypeJava.java jdk/test/java/beans/PropertyEditor/TestDoubleTypeNull.java jdk/test/java/beans/PropertyEditor/TestDoubleTypeValue.java jdk/test/java/beans/PropertyEditor/TestEnumClass.java jdk/test/java/beans/PropertyEditor/TestEnumClassJava.java jdk/test/java/beans/PropertyEditor/TestEnumClassNull.java jdk/test/java/beans/PropertyEditor/TestEnumClassValue.java jdk/test/java/beans/PropertyEditor/TestEnumSubclass.java jdk/test/java/beans/PropertyEditor/TestEnumSubclassJava.java jdk/test/java/beans/PropertyEditor/TestEnumSubclassNull.java jdk/test/java/beans/PropertyEditor/TestEnumSubclassValue.java jdk/test/java/beans/PropertyEditor/TestFloatClass.java jdk/test/java/beans/PropertyEditor/TestFloatClassJava.java jdk/test/java/beans/PropertyEditor/TestFloatClassNull.java jdk/test/java/beans/PropertyEditor/TestFloatClassValue.java jdk/test/java/beans/PropertyEditor/TestFloatType.java jdk/test/java/beans/PropertyEditor/TestFloatTypeJava.java jdk/test/java/beans/PropertyEditor/TestFloatTypeNull.java jdk/test/java/beans/PropertyEditor/TestFloatTypeValue.java jdk/test/java/beans/PropertyEditor/TestFontClass.java jdk/test/java/beans/PropertyEditor/TestFontClassJava.java jdk/test/java/beans/PropertyEditor/TestFontClassNull.java jdk/test/java/beans/PropertyEditor/TestFontClassValue.java jdk/test/java/beans/PropertyEditor/TestIntegerClass.java jdk/test/java/beans/PropertyEditor/TestIntegerClassJava.java jdk/test/java/beans/PropertyEditor/TestIntegerClassNull.java jdk/test/java/beans/PropertyEditor/TestIntegerClassValue.java jdk/test/java/beans/PropertyEditor/TestIntegerType.java jdk/test/java/beans/PropertyEditor/TestIntegerTypeJava.java jdk/test/java/beans/PropertyEditor/TestIntegerTypeNull.java jdk/test/java/beans/PropertyEditor/TestIntegerTypeValue.java jdk/test/java/beans/PropertyEditor/TestLongClass.java jdk/test/java/beans/PropertyEditor/TestLongClassJava.java jdk/test/java/beans/PropertyEditor/TestLongClassNull.java jdk/test/java/beans/PropertyEditor/TestLongClassValue.java jdk/test/java/beans/PropertyEditor/TestLongType.java jdk/test/java/beans/PropertyEditor/TestLongTypeJava.java jdk/test/java/beans/PropertyEditor/TestLongTypeNull.java jdk/test/java/beans/PropertyEditor/TestLongTypeValue.java jdk/test/java/beans/PropertyEditor/TestShortClass.java jdk/test/java/beans/PropertyEditor/TestShortClassJava.java jdk/test/java/beans/PropertyEditor/TestShortClassNull.java jdk/test/java/beans/PropertyEditor/TestShortClassValue.java jdk/test/java/beans/PropertyEditor/TestShortType.java jdk/test/java/beans/PropertyEditor/TestShortTypeJava.java jdk/test/java/beans/PropertyEditor/TestShortTypeNull.java jdk/test/java/beans/PropertyEditor/TestShortTypeValue.java jdk/test/java/beans/PropertyEditor/TestStringClass.java jdk/test/java/beans/PropertyEditor/TestStringClassJava.java jdk/test/java/beans/PropertyEditor/TestStringClassNull.java jdk/test/java/beans/PropertyEditor/TestStringClassValue.java jdk/test/java/beans/TEST.properties jdk/test/java/beans/XMLDecoder/8028054/TestConstructorFinder.java jdk/test/java/beans/XMLDecoder/8028054/TestMethodFinder.java jdk/test/java/beans/XMLEncoder/java_sql_Date.java jdk/test/java/beans/XMLEncoder/java_sql_Time.java jdk/test/java/beans/XMLEncoder/java_sql_Timestamp.java jdk/test/java/beans/XMLEncoder/sun_swing_PrintColorUIResource.java jdk/test/javax/accessibility/TEST.properties jdk/test/javax/imageio/TEST.properties jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh jdk/test/javax/print/TEST.properties jdk/test/javax/sound/TEST.properties jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/GetFormat.java jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java jdk/test/javax/sound/midi/Gervill/AudioFloatFormatConverter/SkipTest.java jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Available.java jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Close.java jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFormat.java jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFrameLength.java jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/MarkSupported.java jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Read.java jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArray.java jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArrayIntInt.java jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Reset.java jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Skip.java jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankFile.java jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream.java jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream2.java jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankUrl.java jdk/test/javax/sound/midi/Gervill/EmergencySoundbank/TestCreateSoundbank.java jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/GetInputStream.java jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/GetRoot.java jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/Load.java jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/LoadAll.java jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArray.java jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArrayIntInt.java jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFile.java jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFileLongLong.java jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Available.java jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Close.java jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkReset.java jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkSupported.java jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Read.java jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByte.java jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Skip.java jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLong.java jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLong.java jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLongBoolean.java jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/Unload.java jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/WriteTo.java jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetAttenuation.java jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetChannels.java jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopLength.java jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopStart.java jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetPitchCorrection.java jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormat.java jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormatFloat.java jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferFloat.java jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Open.java jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/OpenStream.java jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Set8BitExtensionBuffer.java jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/SetLoopType.java jdk/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestination.java jdk/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestinationModelIdentifier.java jdk/test/javax/sound/midi/Gervill/ModelDestination/SetIdentifier.java jdk/test/javax/sound/midi/Gervill/ModelDestination/SetTransform.java jdk/test/javax/sound/midi/Gervill/ModelIdentifier/EqualsObject.java jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierString.java jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringInt.java jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringString.java jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetInstance.java jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetObject.java jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetVariable.java jdk/test/javax/sound/midi/Gervill/ModelPerformer/GetOscillators.java jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetConnectionBlocks.java jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetDefaultConnectionsEnabled.java jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetExclusiveClass.java jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyFrom.java jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyTo.java jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetName.java jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetSelfNonExclusive.java jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetVelFrom.java jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetVelTo.java jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSource.java jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifier.java jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBoolean.java jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBoolean.java jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBooleanInt.java jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierModelTransform.java jdk/test/javax/sound/midi/Gervill/ModelSource/SetIdentifier.java jdk/test/javax/sound/midi/Gervill/ModelSource/SetTransform.java jdk/test/javax/sound/midi/Gervill/ModelStandardIndexedDirector/ModelStandardIndexedDirectorTest.java jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransform.java jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBoolean.java jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBoolean.java jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBooleanInt.java jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetDirection.java jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetPolarity.java jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetTransform.java jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformAbsolute.java jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConcave.java jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConvex.java jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformLinear.java jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformSwitch.java jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Available.java jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Close.java jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/GetFilePointer.java jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/GetSize.java jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/HasNextChunk.java jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Read.java jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByte.java jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByteArrayIntInt.java jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadInt.java jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadLong.java jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadShort.java jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadString.java jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedByte.java jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedInt.java jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedShort.java jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Skip.java jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/WriteOutputStream.java jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankFile.java jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream.java jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream2.java jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankUrl.java jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrument.java jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntInt.java jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntInt.java jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntIntInt.java jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformer.java jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArray.java jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntInt.java jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntInt.java jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntIntInt.java jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntInt.java jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntInt.java jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntIntInt.java jdk/test/javax/sound/midi/Gervill/SimpleInstrument/Clear.java jdk/test/javax/sound/midi/Gervill/SimpleInstrument/SetName.java jdk/test/javax/sound/midi/Gervill/SimpleInstrument/SetPatch.java jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/AddInstrument.java jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/AddResource.java jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/GetInstrument.java jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/RemoveInstrument.java jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetDescription.java jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetName.java jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVendor.java jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVersion.java jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Array.java jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Clear.java jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Get.java jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/NewSoftAudioBuffer.java jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetFormat.java jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetPropertyInfo.java jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/Open.java jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/OpenStream.java jdk/test/javax/sound/midi/Gervill/SoftChannel/AllNotesOff.java jdk/test/javax/sound/midi/Gervill/SoftChannel/AllSoundOff.java jdk/test/javax/sound/midi/Gervill/SoftChannel/ChannelPressure.java jdk/test/javax/sound/midi/Gervill/SoftChannel/Controller.java jdk/test/javax/sound/midi/Gervill/SoftChannel/LocalControl.java jdk/test/javax/sound/midi/Gervill/SoftChannel/Mono.java jdk/test/javax/sound/midi/Gervill/SoftChannel/Mute.java jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOff.java jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOff2.java jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOn.java jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest.java jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java jdk/test/javax/sound/midi/Gervill/SoftChannel/Omni.java jdk/test/javax/sound/midi/Gervill/SoftChannel/PitchBend.java jdk/test/javax/sound/midi/Gervill/SoftChannel/PolyPressure.java jdk/test/javax/sound/midi/Gervill/SoftChannel/ProgramAndBankChange.java jdk/test/javax/sound/midi/Gervill/SoftChannel/ProgramChange.java jdk/test/javax/sound/midi/Gervill/SoftChannel/ResetAllControllers.java jdk/test/javax/sound/midi/Gervill/SoftChannel/Solo.java jdk/test/javax/sound/midi/Gervill/SoftCubicResampler/Interpolate.java jdk/test/javax/sound/midi/Gervill/SoftFilter/TestProcessAudio.java jdk/test/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix.java jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono.java jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_overdrive.java jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal.java jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal_mono.java jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive.java jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive_mono.java jdk/test/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java jdk/test/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java jdk/test/javax/sound/midi/Gervill/SoftLowFrequencyOscillator/TestProcessControlLogic.java jdk/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java jdk/test/javax/sound/midi/Gervill/SoftProvider/GetDevice.java jdk/test/javax/sound/midi/Gervill/SoftReceiver/Close.java jdk/test/javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ActiveSense.java jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllNotesOff.java jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllSoundOff.java jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ChannelPressure.java jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_Controller.java jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_Mono.java jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOff.java jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn.java jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_AllChannels.java jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Delayed.java jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Multiple.java jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_Omni.java jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_PitchBend.java jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_PolyPressure.java jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ProgramChange.java jdk/test/javax/sound/midi/Gervill/SoftReceiver/Send_ResetAllControllers.java jdk/test/javax/sound/midi/Gervill/SoftSincResampler/Interpolate.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/Close.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments2.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetChannels.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDefaultSoundbank.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDeviceInfo.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLatency.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments2.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxPolyphony.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxReceivers.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxTransmitters.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMicrosecondPosition.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetPropertyInfo.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver2.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceivers.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitter.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitters.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/GetVoiceStatus.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/ImplicitOpenClose.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/IsOpen.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/IsSoundbankSupported.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadAllInstruments.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstrument.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstruments.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/Open.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/OpenStream.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/RemapInstrument.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/TestDisableLoadDefaultSoundbank.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/TestPreciseTimestampRendering.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/TestRender1.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadAllInstruments.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstrument.java jdk/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstruments.java jdk/test/javax/sound/midi/Gervill/SoftTuning/GetName.java jdk/test/javax/sound/midi/Gervill/SoftTuning/GetTuning.java jdk/test/javax/sound/midi/Gervill/SoftTuning/GetTuningInt.java jdk/test/javax/sound/midi/Gervill/SoftTuning/Load1.java jdk/test/javax/sound/midi/Gervill/SoftTuning/Load2.java jdk/test/javax/sound/midi/Gervill/SoftTuning/Load4.java jdk/test/javax/sound/midi/Gervill/SoftTuning/Load5.java jdk/test/javax/sound/midi/Gervill/SoftTuning/Load6.java jdk/test/javax/sound/midi/Gervill/SoftTuning/Load7.java jdk/test/javax/sound/midi/Gervill/SoftTuning/Load8.java jdk/test/javax/sound/midi/Gervill/SoftTuning/Load9.java jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuning.java jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningByteArray.java jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatch.java jdk/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatchByteArray.java jdk/test/javax/sound/midi/Gervill/SoftTuning/RealTimeTuning.java jdk/test/javax/swing/DataTransfer/6456844/bug6456844.java jdk/test/javax/swing/JButton/4796987/bug4796987.java jdk/test/javax/swing/JCheckBox/4449413/bug4449413.java jdk/test/javax/swing/JColorChooser/Test6524757.java jdk/test/javax/swing/JComboBox/4199622/bug4199622.java jdk/test/javax/swing/JComboBox/8015300/Test8015300.java jdk/test/javax/swing/JComponent/6683775/bug6683775.java jdk/test/javax/swing/JComponent/8043610/bug8043610.java jdk/test/javax/swing/JEditorPane/bug4714674.java jdk/test/javax/swing/JFileChooser/4847375/bug4847375.java jdk/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java jdk/test/javax/swing/JFileChooser/6550546/bug6550546.java jdk/test/javax/swing/JFileChooser/6713352/bug6713352.java jdk/test/javax/swing/JFileChooser/6741890/bug6741890.java jdk/test/javax/swing/JFileChooser/6798062/bug6798062.java jdk/test/javax/swing/JFileChooser/6817933/Test6817933.java jdk/test/javax/swing/JFileChooser/6840086/bug6840086.java jdk/test/javax/swing/JFileChooser/6945316/bug6945316.java jdk/test/javax/swing/JFileChooser/8046391/bug8046391.java jdk/test/javax/swing/JFileChooser/8062561/bug8062561.java jdk/test/javax/swing/JInternalFrame/6725409/bug6725409.java jdk/test/javax/swing/JLabel/7004134/bug7004134.java jdk/test/javax/swing/JPopupMenu/6495920/bug6495920.java jdk/test/javax/swing/JPopupMenu/6827786/bug6827786.java jdk/test/javax/swing/JPopupMenu/7156657/bug7156657.java jdk/test/javax/swing/JSlider/6524424/bug6524424.java jdk/test/javax/swing/JTable/6788484/bug6788484.java jdk/test/javax/swing/JTable/6937798/bug6937798.java jdk/test/javax/swing/JTree/8004298/bug8004298.java jdk/test/javax/swing/Security/6657138/bug6657138.java jdk/test/javax/swing/Security/6938813/bug6938813.java jdk/test/javax/swing/SwingUtilities/8032219/DrawRect.java jdk/test/javax/swing/TEST.properties jdk/test/javax/swing/ToolTipManager/7123767/bug7123767.java jdk/test/javax/swing/ToolTipManager/Test6657026.java jdk/test/javax/swing/UIDefaults/6795356/TableTest.java jdk/test/javax/swing/UIManager/Test6657026.java jdk/test/javax/swing/border/Test4856008.java jdk/test/javax/swing/border/Test6978482.java jdk/test/javax/swing/plaf/basic/BasicSplitPaneUI/Test6657026.java jdk/test/javax/swing/plaf/metal/MetalBumps/Test6657026.java jdk/test/javax/swing/plaf/metal/MetalInternalFrameUI/Test6657026.java jdk/test/javax/swing/plaf/metal/MetalSliderUI/Test6657026.java jdk/test/javax/swing/plaf/nimbus/Test6741426.java jdk/test/javax/swing/plaf/synth/7143614/bug7143614.java jdk/test/javax/swing/plaf/synth/Test6660049.java jdk/test/javax/swing/system/6799345/TestShutdown.java jdk/test/javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java jdk/test/javax/swing/text/LayoutQueue/Test6588003.java jdk/test/javax/swing/text/html/parser/Parser/6990651/bug6990651.java jdk/test/javax/swing/text/html/parser/Test8017492.java jdk/test/sun/awt/AppContext/8012933/Test8012933.java jdk/test/sun/awt/AppContext/MultiThread/MultiThreadTest.java jdk/test/sun/awt/TEST.properties jdk/test/sun/awt/datatransfer/DataFlavorComparatorTest.java jdk/test/sun/awt/datatransfer/DataFlavorComparatorTest1.java jdk/test/sun/awt/datatransfer/SuplementaryCharactersTransferTest.java jdk/test/sun/java2d/SunGraphics2D/EmptyClipRenderingTest.java jdk/test/sun/java2d/TEST.properties jdk/test/sun/java2d/pipe/RegionOps.java jdk/test/sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java jdk/test/sun/java2d/pipe/hw/RSLContextInvalidationTest/RSLContextInvalidationTest.java jdk/test/sun/java2d/pipe/hw/VSyncedBufferStrategyTest/VSyncedBufferStrategyTest.java jdk/test/sun/pisces/TEST.properties
diffstat 534 files changed, 1749 insertions(+), 766 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/test/com/apple/eawt/DefaultMenuBar/DefaultMenuBarTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/com/apple/eawt/DefaultMenuBar/DefaultMenuBarTest.java	Tue Jun 23 11:59:27 2015 +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
  */
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/apple/eawt/TEST.properties	Tue Jun 23 11:59:27 2015 +0300
@@ -0,0 +1,2 @@
+modules=java.desktop
+
--- a/jdk/test/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java	Tue Jun 23 11:59:27 2015 +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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/awt/TEST.properties	Tue Jun 23 11:59:27 2015 +0300
@@ -0,0 +1,2 @@
+modules=java.desktop
+
--- a/jdk/test/com/sun/awt/Translucency/WindowOpacity.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/com/sun/awt/Translucency/WindowOpacity.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/java/swing/TEST.properties	Tue Jun 23 11:59:27 2015 +0300
@@ -0,0 +1,2 @@
+modules=java.desktop
+
--- a/jdk/test/com/sun/java/swing/plaf/windows/Test6824600.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/com/sun/java/swing/plaf/windows/Test6824600.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/Choice/ItemStateChangeTest/ItemStateChangeTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Choice/ItemStateChangeTest/ItemStateChangeTest.java	Tue Jun 23 11:59:27 2015 +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
--- a/jdk/test/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Desktop/8064934/bug8064934.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Desktop/8064934/bug8064934.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Dialog/CloseDialog/CloseDialogTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Dialog/CloseDialog/CloseDialogTest.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/awt/EventDispatchThread/EDTShutdownTest/EDTShutdownTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/EventDispatchThread/EDTShutdownTest/EDTShutdownTest.java	Tue Jun 23 11:59:27 2015 +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
  */
 
--- a/jdk/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html	Tue Jun 23 11:59:27 2015 +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
   -->
--- a/jdk/test/java/awt/EventQueue/MainAppContext/MainAppContext.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/EventQueue/MainAppContext/MainAppContext.java	Tue Jun 23 11:59:27 2015 +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.*;
--- a/jdk/test/java/awt/EventQueue/PostEventOrderingTest/PostEventOrderingTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/EventQueue/PostEventOrderingTest/PostEventOrderingTest.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/EventQueue/PushPopDeadlock2/PushPopTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/EventQueue/PushPopDeadlock2/PushPopTest.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.html	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.html	Tue Jun 23 11:59:27 2015 +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>
--- a/jdk/test/java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.html	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.html	Tue Jun 23 11:59:27 2015 +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>
--- a/jdk/test/java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.html	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.html	Tue Jun 23 11:59:27 2015 +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>
--- a/jdk/test/java/awt/Graphics2D/Test8004859/Test8004859.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Graphics2D/Test8004859/Test8004859.java	Tue Jun 23 11:59:27 2015 +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 {
 
--- a/jdk/test/java/awt/Graphics2D/TransformSetGet/TransformSetGet.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Graphics2D/TransformSetGet/TransformSetGet.java	Tue Jun 23 11:59:27 2015 +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 {
 
--- a/jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html	Tue Jun 23 11:59:27 2015 +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
   -->
--- a/jdk/test/java/awt/Menu/OpensWithNoGrab/OpensWithNoGrab.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Menu/OpensWithNoGrab/OpensWithNoGrab.java	Tue Jun 23 11:59:27 2015 +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
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JButtonInGlassPaneOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JButtonInGlassPaneOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JColorChooserOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JColorChooserOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JEditorPaneInGlassPaneOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JEditorPaneInGlassPaneOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JEditorPaneOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JEditorPaneOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JGlassPaneInternalFrameOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JGlassPaneInternalFrameOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JGlassPaneMoveOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JGlassPaneMoveOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JInternalFrameMoveOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JInternalFrameOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JLabelInGlassPaneOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JLabelInGlassPaneOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JLabelOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JLabelOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JListInGlassPaneOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JListInGlassPaneOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JListOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JListOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JPanelInGlassPaneOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JPanelInGlassPaneOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JPanelOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JPanelOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JPopupMenuOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JProgressBarInGlassPaneOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JProgressBarInGlassPaneOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JProgressBarOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JProgressBarOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JScrollBarInGlassPaneOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JScrollBarInGlassPaneOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JScrollBarOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JScrollBarOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JScrollPaneOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JScrollPaneOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JSliderInGlassPaneOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JSliderInGlassPaneOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JSliderOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JSliderOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JSpinnerInGlassPaneOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JSpinnerInGlassPaneOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JSpinnerOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JSpinnerOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JTableOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JTableOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JTextAreaInGlassPaneOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JTextAreaInGlassPaneOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JTextAreaOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JTextAreaOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JTextFieldInGlassPaneOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JTextFieldInGlassPaneOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JTextFieldOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JTextFieldOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JToggleButtonInGlassPaneOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JToggleButtonInGlassPaneOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/JToggleButtonOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/JToggleButtonOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/MixingFrameResizing.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/MixingFrameResizing.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/ViewportOverlapping.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/ViewportOverlapping.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/Mixing/OpaqueTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Mixing/OpaqueTest.java	Tue Jun 23 11:59:27 2015 +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
 */
--- a/jdk/test/java/awt/SplashScreen/FullscreenAfterSplash/FullScreenAfterSplash.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/SplashScreen/FullscreenAfterSplash/FullScreenAfterSplash.java	Tue Jun 23 11:59:27 2015 +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
--- a/jdk/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java	Tue Jun 23 11:59:27 2015 +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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/TEST.properties	Tue Jun 23 11:59:27 2015 +0300
@@ -0,0 +1,2 @@
+modules=java.desktop
+
--- a/jdk/test/java/awt/Toolkit/RealSync/RealSyncOnEDT.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Toolkit/RealSync/RealSyncOnEDT.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/Toolkit/RealSync/Test.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Toolkit/RealSync/Test.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/Window/AlwaysOnTop/AutoTestOnTop.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Window/AlwaysOnTop/AutoTestOnTop.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/Window/Grab/GrabTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Window/Grab/GrabTest.java	Tue Jun 23 11:59:27 2015 +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
 */
--- a/jdk/test/java/awt/Window/WindowsLeak/WindowsLeak.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/Window/WindowsLeak/WindowsLeak.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh	Tue Jun 23 11:59:27 2015 +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
--- a/jdk/test/java/awt/datatransfer/Clipboard/BasicClipboardTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/Clipboard/BasicClipboardTest.java	Tue Jun 23 11:59:27 2015 +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
  */
 
--- a/jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorCloneTest/DataFlavorCloneTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorCloneTest/DataFlavorCloneTest.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorEqualsNullTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorEqualsNullTest.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorEqualsTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorEqualsTest.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorFileListTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorFileListTest.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorSerializedTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/DataFlavorSerializedTest.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/datatransfer/DataFlavor/DefaultMatchTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/DefaultMatchTest.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/datatransfer/DataFlavor/EqualsHashCodeSymmetryTest/EqualsHashCodeSymmetryTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/EqualsHashCodeSymmetryTest/EqualsHashCodeSymmetryTest.java	Tue Jun 23 11:59:27 2015 +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 {
 
--- a/jdk/test/java/awt/datatransfer/DataFlavor/ExternalizeTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/ExternalizeTest.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/datatransfer/DataFlavor/GetReaderForTextIAEForStringSelectionTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/GetReaderForTextIAEForStringSelectionTest.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/datatransfer/DataFlavor/GetReaderForTextNPETest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/GetReaderForTextNPETest.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/datatransfer/DataFlavor/MimeTypeSerializationTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/MimeTypeSerializationTest.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/datatransfer/DataFlavor/NoClassParameterTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/NoClassParameterTest.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/datatransfer/DataFlavor/NormalizeMimeTypeParameter.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/NormalizeMimeTypeParameter.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/datatransfer/DataFlavor/ReaderForUnicodeText.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/ReaderForUnicodeText.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/datatransfer/DataFlavor/SelectBestFlavorNPETest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/SelectBestFlavorNPETest.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/datatransfer/DataFlavor/SelectBestTextFlavorBadArrayTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/SelectBestTextFlavorBadArrayTest.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/datatransfer/DataFlavor/ToStringNullPointerTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/DataFlavor/ToStringNullPointerTest.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/datatransfer/Headless/HeadlessClipboard.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/Headless/HeadlessClipboard.java	Tue Jun 23 11:59:27 2015 +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
  */
 
--- a/jdk/test/java/awt/datatransfer/Headless/HeadlessDataFlavor.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/Headless/HeadlessDataFlavor.java	Tue Jun 23 11:59:27 2015 +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
  */
 
--- a/jdk/test/java/awt/datatransfer/Headless/HeadlessSystemFlavorMap.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/Headless/HeadlessSystemFlavorMap.java	Tue Jun 23 11:59:27 2015 +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
  */
 
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorForNativeTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorForNativeTest.java	Tue Jun 23 11:59:27 2015 +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
  */
 
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java	Tue Jun 23 11:59:27 2015 +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
  */
 
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddNativeForFlavorTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddNativeForFlavorTest.java	Tue Jun 23 11:59:27 2015 +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
  */
 
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddNativeTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/AddNativeTest.java	Tue Jun 23 11:59:27 2015 +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
  */
 
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/DuplicateMappingTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/DuplicateMappingTest.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/DuplicatedNativesTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/DuplicatedNativesTest.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/GetFlavorsForNewNativeTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/GetFlavorsForNewNativeTest.java	Tue Jun 23 11:59:27 2015 +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
  */
 
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/GetNativesForFlavorTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/GetNativesForFlavorTest.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/GetNativesForNewFlavorTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/GetNativesForNewFlavorTest.java	Tue Jun 23 11:59:27 2015 +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
  */
 
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/InvalidMapArgumentsTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/InvalidMapArgumentsTest.java	Tue Jun 23 11:59:27 2015 +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
  */
 
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/ManyFlavorMapTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/ManyFlavorMapTest.java	Tue Jun 23 11:59:27 2015 +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
  */
 
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/MappingGenerationTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/MappingGenerationTest.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetDataFlavorsTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetDataFlavorsTest.java	Tue Jun 23 11:59:27 2015 +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
  */
 
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetFlavorsForNativeTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetFlavorsForNativeTest.java	Tue Jun 23 11:59:27 2015 +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
  */
 
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavor.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavor.java	Tue Jun 23 11:59:27 2015 +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
  */
 
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavorTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesForFlavorTest.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/datatransfer/SystemFlavorMap/SetNativesTest.java	Tue Jun 23 11:59:27 2015 +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
  */
 
--- a/jdk/test/java/awt/event/ComponentEvent/MovedResizedTardyEventTest/MovedResizedTardyEventTest.html	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/event/ComponentEvent/MovedResizedTardyEventTest/MovedResizedTardyEventTest.html	Tue Jun 23 11:59:27 2015 +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>
--- a/jdk/test/java/awt/event/KeyEvent/AltCharAcceleratorTest/AltCharAcceleratorTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/event/KeyEvent/AltCharAcceleratorTest/AltCharAcceleratorTest.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java	Tue Jun 23 11:59:27 2015 +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
--- a/jdk/test/java/awt/event/OtherEvents/UngrabID/UngrabID.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/event/OtherEvents/UngrabID/UngrabID.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/im/8041990/bug8041990.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/im/8041990/bug8041990.java	Tue Jun 23 11:59:27 2015 +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;
--- a/jdk/test/java/awt/image/MultiResolutionImage/NSImageToMultiResolutionImageTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/image/MultiResolutionImage/NSImageToMultiResolutionImageTest.java	Tue Jun 23 11:59:27 2015 +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
  */
 
--- a/jdk/test/java/awt/image/MultiResolutionImageTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/image/MultiResolutionImageTest.java	Tue Jun 23 11:59:27 2015 +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
--- a/jdk/test/java/awt/image/mlib/MlibOpsTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/image/mlib/MlibOpsTest.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER 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
  */
--- a/jdk/test/java/awt/image/multiresolution/MultiResolutionToolkitImageTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/image/multiresolution/MultiResolutionToolkitImageTest.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/awt/keyboard/EqualKeyCode/EqualKeyCode.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/keyboard/EqualKeyCode/EqualKeyCode.java	Tue Jun 23 11:59:27 2015 +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
 */
 
--- a/jdk/test/java/awt/print/bug8023392/bug8023392.html	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/print/bug8023392/bug8023392.html	Tue Jun 23 11:59:27 2015 +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>
--- a/jdk/test/java/awt/xembed/server/RunTestXEmbed.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/xembed/server/RunTestXEmbed.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/awt/xembed/server/TestXEmbedServerJava.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/awt/xembed/server/TestXEmbedServerJava.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/beans/Introspector/Test6277246.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/Introspector/Test6277246.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/beans/Introspector/TestCacheRecursion.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/Introspector/TestCacheRecursion.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/beans/Introspector/TestTypeResolver.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/Introspector/TestTypeResolver.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * 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;
--- a/jdk/test/java/beans/PropertyEditor/6380849/TestPropertyEditor.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/6380849/TestPropertyEditor.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/beans/PropertyEditor/Test6397609.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/Test6397609.java	Tue Jun 23 11:59:27 2015 +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;
--- a/jdk/test/java/beans/PropertyEditor/Test6963811.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/Test6963811.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/beans/PropertyEditor/TestBooleanClass.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestBooleanClass.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestBooleanClassJava.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestBooleanClassJava.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestBooleanClassNull.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestBooleanClassNull.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestBooleanClassValue.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestBooleanClassValue.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestBooleanType.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestBooleanType.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestBooleanTypeJava.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestBooleanTypeJava.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestBooleanTypeNull.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestBooleanTypeNull.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestBooleanTypeValue.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestBooleanTypeValue.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestByteClass.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestByteClass.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestByteClassJava.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestByteClassJava.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestByteClassNull.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestByteClassNull.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestByteClassValue.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestByteClassValue.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestByteType.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestByteType.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestByteTypeJava.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestByteTypeJava.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestByteTypeNull.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestByteTypeNull.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestByteTypeValue.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestByteTypeValue.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestColorClass.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestColorClass.java	Tue Jun 23 11:59:27 2015 +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;
--- a/jdk/test/java/beans/PropertyEditor/TestColorClassJava.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestColorClassJava.java	Tue Jun 23 11:59:27 2015 +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;
--- a/jdk/test/java/beans/PropertyEditor/TestColorClassNull.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestColorClassNull.java	Tue Jun 23 11:59:27 2015 +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;
--- a/jdk/test/java/beans/PropertyEditor/TestColorClassValue.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestColorClassValue.java	Tue Jun 23 11:59:27 2015 +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;
--- a/jdk/test/java/beans/PropertyEditor/TestDoubleClass.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestDoubleClass.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestDoubleClassJava.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestDoubleClassJava.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestDoubleClassNull.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestDoubleClassNull.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestDoubleClassValue.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestDoubleClassValue.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestDoubleType.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestDoubleType.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestDoubleTypeJava.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestDoubleTypeJava.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestDoubleTypeNull.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestDoubleTypeNull.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestDoubleTypeValue.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestDoubleTypeValue.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestEnumClass.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestEnumClass.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestEnumClassJava.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestEnumClassJava.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestEnumClassNull.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestEnumClassNull.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestEnumClassValue.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestEnumClassValue.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestEnumSubclass.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestEnumSubclass.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestEnumSubclassJava.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestEnumSubclassJava.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestEnumSubclassNull.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestEnumSubclassNull.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestEnumSubclassValue.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestEnumSubclassValue.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestFloatClass.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestFloatClass.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestFloatClassJava.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestFloatClassJava.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestFloatClassNull.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestFloatClassNull.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestFloatClassValue.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestFloatClassValue.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestFloatType.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestFloatType.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestFloatTypeJava.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestFloatTypeJava.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestFloatTypeNull.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestFloatTypeNull.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestFloatTypeValue.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestFloatTypeValue.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestFontClass.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestFontClass.java	Tue Jun 23 11:59:27 2015 +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;
--- a/jdk/test/java/beans/PropertyEditor/TestFontClassJava.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestFontClassJava.java	Tue Jun 23 11:59:27 2015 +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;
--- a/jdk/test/java/beans/PropertyEditor/TestFontClassNull.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestFontClassNull.java	Tue Jun 23 11:59:27 2015 +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;
--- a/jdk/test/java/beans/PropertyEditor/TestFontClassValue.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestFontClassValue.java	Tue Jun 23 11:59:27 2015 +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;
--- a/jdk/test/java/beans/PropertyEditor/TestIntegerClass.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestIntegerClass.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestIntegerClassJava.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestIntegerClassJava.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestIntegerClassNull.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestIntegerClassNull.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestIntegerClassValue.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestIntegerClassValue.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestIntegerType.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestIntegerType.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestIntegerTypeJava.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestIntegerTypeJava.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestIntegerTypeNull.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestIntegerTypeNull.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestIntegerTypeValue.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestIntegerTypeValue.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestLongClass.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestLongClass.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestLongClassJava.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestLongClassJava.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestLongClassNull.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestLongClassNull.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestLongClassValue.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestLongClassValue.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestLongType.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestLongType.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestLongTypeJava.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestLongTypeJava.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestLongTypeNull.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestLongTypeNull.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestLongTypeValue.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestLongTypeValue.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestShortClass.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestShortClass.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestShortClassJava.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestShortClassJava.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestShortClassNull.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestShortClassNull.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestShortClassValue.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestShortClassValue.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestShortType.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestShortType.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestShortTypeJava.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestShortTypeJava.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestShortTypeNull.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestShortTypeNull.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestShortTypeValue.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestShortTypeValue.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestStringClass.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestStringClass.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestStringClassJava.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestStringClassJava.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestStringClassNull.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestStringClassNull.java	Tue Jun 23 11:59:27 2015 +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 {
--- a/jdk/test/java/beans/PropertyEditor/TestStringClassValue.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/PropertyEditor/TestStringClassValue.java	Tue Jun 23 11:59:27 2015 +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 {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/TEST.properties	Tue Jun 23 11:59:27 2015 +0300
@@ -0,0 +1,2 @@
+modules=java.desktop
+
--- a/jdk/test/java/beans/XMLDecoder/8028054/TestConstructorFinder.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/XMLDecoder/8028054/TestConstructorFinder.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/beans/XMLDecoder/8028054/TestMethodFinder.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/XMLDecoder/8028054/TestMethodFinder.java	Tue Jun 23 11:59:27 2015 +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
  */
--- a/jdk/test/java/beans/XMLEncoder/java_sql_Date.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/XMLEncoder/java_sql_Date.java	Tue Jun 23 11:59:27 2015 +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;
--- a/jdk/test/java/beans/XMLEncoder/java_sql_Time.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/XMLEncoder/java_sql_Time.java	Tue Jun 23 11:59:27 2015 +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;
--- a/jdk/test/java/beans/XMLEncoder/java_sql_Timestamp.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/XMLEncoder/java_sql_Timestamp.java	Tue Jun 23 11:59:27 2015 +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;
--- a/jdk/test/java/beans/XMLEncoder/sun_swing_PrintColorUIResource.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/java/beans/XMLEncoder/sun_swing_PrintColorUIResource.java	Tue Jun 23 11:59:27 2015 +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;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/accessibility/TEST.properties	Tue Jun 23 11:59:27 2015 +0300
@@ -0,0 +1,2 @@
+modules=java.desktop
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/imageio/TEST.properties	Tue Jun 23 11:59:27 2015 +0300
@@ -0,0 +1,1 @@
+modules=java.desktop
--- a/jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	Tue Jun 23 11:59:27 2015 +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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/print/TEST.properties	Tue Jun 23 11:59:27 2015 +0300
@@ -0,0 +1,2 @@
+modules=java.desktop
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/sound/TEST.properties	Tue Jun 23 11:59:27 2015 +0300
@@ -0,0 +1,2 @@
+modules=java.desktop
+
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/GetFormat.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/GetFormat.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatConverter/ToFloatArray.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatFormatConverter/SkipTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatFormatConverter/SkipTest.java	Tue Jun 23 11:59:27 2015 +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;
 
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Available.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Available.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Close.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Close.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFormat.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFormat.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFrameLength.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFrameLength.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/MarkSupported.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/MarkSupported.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Read.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Read.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArray.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArray.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArrayIntInt.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArrayIntInt.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Reset.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Reset.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Skip.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/AudioFloatInputStream/Skip.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankFile.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankFile.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
 
--- a/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream2.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream2.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * 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;
--- a/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankUrl.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankUrl.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/EmergencySoundbank/TestCreateSoundbank.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/EmergencySoundbank/TestCreateSoundbank.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
 
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/GetInputStream.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/GetInputStream.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/GetRoot.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/GetRoot.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/Load.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/Load.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/LoadAll.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/LoadAll.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArray.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArray.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArrayIntInt.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArrayIntInt.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFile.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFile.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFileLongLong.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFileLongLong.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Available.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Available.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Close.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Close.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkReset.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkReset.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkSupported.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkSupported.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Read.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Read.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByte.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByte.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Skip.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Skip.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLong.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLong.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLong.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLong.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLongBoolean.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLongBoolean.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/Unload.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/Unload.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/WriteTo.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBuffer/WriteTo.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetAttenuation.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetAttenuation.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
 
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetChannels.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetChannels.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
 
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopLength.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopLength.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
 
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopStart.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopStart.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
 
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetPitchCorrection.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetPitchCorrection.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
 
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
 
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormat.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormat.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
 
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormatFloat.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormatFloat.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
 
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferFloat.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferFloat.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
 
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Open.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Open.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
 
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/OpenStream.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/OpenStream.java	Tue Jun 23 11:59:27 2015 +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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Set8BitExtensionBuffer.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Set8BitExtensionBuffer.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
 
--- a/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/SetLoopType.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/SetLoopType.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
 
--- a/jdk/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestination.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestination.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestinationModelIdentifier.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestinationModelIdentifier.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelDestination/SetIdentifier.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelDestination/SetIdentifier.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelDestination/SetTransform.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelDestination/SetTransform.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/EqualsObject.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/EqualsObject.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierString.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierString.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringInt.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringInt.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringString.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringString.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetInstance.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetInstance.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetObject.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetObject.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetVariable.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelIdentifier/SetVariable.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/GetOscillators.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/GetOscillators.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetConnectionBlocks.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetConnectionBlocks.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetDefaultConnectionsEnabled.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetDefaultConnectionsEnabled.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetExclusiveClass.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetExclusiveClass.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyFrom.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyFrom.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyTo.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyTo.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetName.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetName.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetSelfNonExclusive.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetSelfNonExclusive.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetVelFrom.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetVelFrom.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetVelTo.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelPerformer/SetVelTo.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSource.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSource.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifier.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifier.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBoolean.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBoolean.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBoolean.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBoolean.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBooleanInt.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBooleanInt.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierModelTransform.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierModelTransform.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelSource/SetIdentifier.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelSource/SetIdentifier.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelSource/SetTransform.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelSource/SetTransform.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardIndexedDirector/ModelStandardIndexedDirectorTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardIndexedDirector/ModelStandardIndexedDirectorTest.java	Tue Jun 23 11:59:27 2015 +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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransform.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransform.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBoolean.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBoolean.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBoolean.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBoolean.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBooleanInt.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBooleanInt.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetDirection.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetDirection.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetPolarity.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetPolarity.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetTransform.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/SetTransform.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformAbsolute.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformAbsolute.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
 
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConcave.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConcave.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
 
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConvex.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConvex.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
 
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformLinear.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformLinear.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
 
--- a/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformSwitch.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformSwitch.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
 
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Available.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Available.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Close.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Close.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/GetFilePointer.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/GetFilePointer.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/GetSize.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/GetSize.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/HasNextChunk.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/HasNextChunk.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Read.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Read.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByte.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByte.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByteArrayIntInt.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByteArrayIntInt.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadInt.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadInt.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadLong.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadLong.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadShort.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadShort.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadString.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadString.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedByte.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedByte.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedInt.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedInt.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedShort.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedShort.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Skip.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/Skip.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/WriteOutputStream.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/RiffReaderWriter/WriteOutputStream.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankFile.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankFile.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
 
--- a/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream2.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream2.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * 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;
--- a/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankUrl.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankUrl.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrument.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrument.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntInt.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntInt.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntInt.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntInt.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntIntInt.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntIntInt.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformer.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformer.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArray.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArray.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntInt.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntInt.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntInt.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntInt.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntIntInt.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntIntInt.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntInt.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntInt.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntInt.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntInt.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntIntInt.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntIntInt.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/Clear.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/Clear.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/SetName.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/SetName.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/SetPatch.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleInstrument/SetPatch.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/AddInstrument.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/AddInstrument.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/AddResource.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/AddResource.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/GetInstrument.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/GetInstrument.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/RemoveInstrument.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/RemoveInstrument.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetDescription.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetDescription.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetName.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetName.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVendor.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVendor.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVersion.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVersion.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
 
--- a/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Array.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Array.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Clear.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Clear.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Get.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/Get.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/NewSoftAudioBuffer.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftAudioBuffer/NewSoftAudioBuffer.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetFormat.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetFormat.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetPropertyInfo.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetPropertyInfo.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/Open.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/Open.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/OpenStream.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/OpenStream.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/AllNotesOff.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/AllNotesOff.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/AllSoundOff.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/AllSoundOff.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/ChannelPressure.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/ChannelPressure.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/Controller.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/Controller.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/LocalControl.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/LocalControl.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/Mono.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/Mono.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/Mute.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/Mute.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOff.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOff.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOff2.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOff2.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOn.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOn.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java	Tue Jun 23 11:59:27 2015 +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;
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/Omni.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/Omni.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/PitchBend.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/PitchBend.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/PolyPressure.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/PolyPressure.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/ProgramAndBankChange.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/ProgramAndBankChange.java	Tue Jun 23 11:59:27 2015 +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;
 
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/ProgramChange.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/ProgramChange.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/ResetAllControllers.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/ResetAllControllers.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SoftChannel/Solo.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftChannel/Solo.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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.*;
--- a/jdk/test/javax/sound/midi/Gervill/SoftCubicResampler/Interpolate.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftCubicResampler/Interpolate.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/SoftFilter/TestProcessAudio.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftFilter/TestProcessAudio.java	Tue Jun 23 11:59:27 2015 +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;
--- a/jdk/test/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_overdrive.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_overdrive.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal_mono.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal_mono.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive_mono.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive_mono.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;
--- a/jdk/test/javax/sound/midi/Gervill/SoftLowFrequencyOscillator/TestProcessControlLogic.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftLowFrequencyOscillator/TestProcessControlLogic.java	Tue Jun 23 11:59:27 2015 +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;
--- a/jdk/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java	Tue Jun 23 09:54:19 2015 +0300
+++ b/jdk/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java	Tue Jun 23 11:59:27 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES 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;