changeset 11884:b45c81ca8671

8078896: Add @modules as needed to the jdk_svc tests Reviewed-by: alanb, mchung
author ykantser
date Thu, 07 May 2015 09:11:49 +0200
parents 54bc9b11b34d
children 7561e0c497aa
files test/TEST.ROOT test/com/sun/jdi/AcceptTimeout.java test/com/sun/jdi/AccessSpecifierTest.java test/com/sun/jdi/AfterThreadDeathTest.java test/com/sun/jdi/AllLineLocations.java test/com/sun/jdi/ArrayRangeTest.java test/com/sun/jdi/BacktraceFieldTest.java test/com/sun/jdi/BadHandshakeTest.java test/com/sun/jdi/BreakpointTest.java test/com/sun/jdi/ClassLoaderClassesTest.java test/com/sun/jdi/ClassesByName.java test/com/sun/jdi/ClassesByName2Test.java test/com/sun/jdi/CompatibleConnectors.java test/com/sun/jdi/ConnectedVMs.java test/com/sun/jdi/ConstantPoolInfo.java test/com/sun/jdi/CountEvent.java test/com/sun/jdi/CountFilterTest.java test/com/sun/jdi/DebuggerThreadTest.java test/com/sun/jdi/DeleteAllBkptsTest.java test/com/sun/jdi/DeleteEventRequestsTest.java test/com/sun/jdi/DoubleAgentTest.java test/com/sun/jdi/EarlyReturnNegativeTest.java test/com/sun/jdi/EarlyReturnTest.java test/com/sun/jdi/EnumTest.java test/com/sun/jdi/EventQueueDisconnectTest.java test/com/sun/jdi/ExceptionEvents.java test/com/sun/jdi/ExclusiveBind.java test/com/sun/jdi/ExpiredRequestDeletionTest.java test/com/sun/jdi/FieldWatchpoints.java test/com/sun/jdi/FilterMatch.java test/com/sun/jdi/FilterNoMatch.java test/com/sun/jdi/FinalLocalsTest.java test/com/sun/jdi/FinalizerTest.java test/com/sun/jdi/FramesTest.java test/com/sun/jdi/GenericsTest.java test/com/sun/jdi/GetLocalVariables2Test.java test/com/sun/jdi/GetUninitializedStringValue.java test/com/sun/jdi/HomeTest.java test/com/sun/jdi/InstanceFilter.java test/com/sun/jdi/InstancesTest.java test/com/sun/jdi/InterfaceMethodsTest.java test/com/sun/jdi/InterruptHangTest.java test/com/sun/jdi/InvokeHangTest.java test/com/sun/jdi/InvokeTest.java test/com/sun/jdi/JITDebug.sh test/com/sun/jdi/Java_gTest.java test/com/sun/jdi/LambdaBreakpointTest.java test/com/sun/jdi/LambdaStepTest.java test/com/sun/jdi/LaunchCommandLine.java test/com/sun/jdi/LineNumberInfo.java test/com/sun/jdi/LineNumberOnBraceTest.java test/com/sun/jdi/ListenAddress.java test/com/sun/jdi/LocalVariableEqual.java test/com/sun/jdi/LocationTest.java test/com/sun/jdi/MethodEntryExitEvents.java test/com/sun/jdi/MethodExitReturnValuesTest.java test/com/sun/jdi/MixedSuspendTest.sh test/com/sun/jdi/ModificationWatchpoints.java test/com/sun/jdi/MonitorEventTest.java test/com/sun/jdi/MonitorFrameInfo.java test/com/sun/jdi/MultiBreakpointsTest.java test/com/sun/jdi/NativeInstanceFilter.java test/com/sun/jdi/NewInstanceTest.java test/com/sun/jdi/NoLaunchOptionTest.java test/com/sun/jdi/NoLocInfoTest.java test/com/sun/jdi/NullThreadGroupNameTest.java test/com/sun/jdi/OnThrowTest.java test/com/sun/jdi/OptionTest.java test/com/sun/jdi/PopAndInvokeTest.java test/com/sun/jdi/PopAndStepTest.java test/com/sun/jdi/PopAsynchronousTest.java test/com/sun/jdi/PopSynchronousTest.java test/com/sun/jdi/ProcessAttachTest.java test/com/sun/jdi/RedefineCrossEvent.java test/com/sun/jdi/RedefineCrossStart.java test/com/sun/jdi/ReferrersTest.java test/com/sun/jdi/RepStep.java test/com/sun/jdi/RequestReflectionTest.java test/com/sun/jdi/ResumeOneThreadTest.java test/com/sun/jdi/RunToExit.java test/com/sun/jdi/SDENullTest.java test/com/sun/jdi/SimulResumerTest.java test/com/sun/jdi/SourceNameFilterTest.java test/com/sun/jdi/StepTest.java test/com/sun/jdi/SuspendNoFlagTest.java test/com/sun/jdi/SuspendThreadTest.java test/com/sun/jdi/TemplateTest.java test/com/sun/jdi/ThreadGroupTest.java test/com/sun/jdi/TwoThreadsTest.java test/com/sun/jdi/UTF8Test.java test/com/sun/jdi/UnpreparedByName.java test/com/sun/jdi/UnpreparedClasses.java test/com/sun/jdi/VMDeathLastTest.java test/com/sun/jdi/VMDeathRequestTest.java test/com/sun/jdi/VarargsTest.java test/com/sun/jdi/Vars.java test/com/sun/jdi/VisibleMethods.java test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java test/com/sun/jdi/connect/spi/GeneratedConnectors.java test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java test/com/sun/jdi/redefine/RedefineTest.java test/com/sun/jdi/redefineMethod/RedefineTest.java test/com/sun/jdi/sde/FilterMangleTest.java test/com/sun/jdi/sde/MangleStepTest.java test/com/sun/jdi/sde/MangleTest.java test/com/sun/jdi/sde/SourceDebugExtensionTest.java test/com/sun/jdi/sde/TemperatureTableTest.java test/com/sun/jmx/remote/CCAdminReconnectTest.java test/com/sun/jmx/remote/NotificationMarshalVersions/TestSerializationMismatch.java test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanDoubleInvocationTest.java test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanInvocationTest.java test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanPermissionsTest.java test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanTest.java test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationContentTest.java test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationTest.java test/com/sun/management/GarbageCollectorMXBean/LastGCInfo.java test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticOptions.java test/com/sun/management/HotSpotDiagnosticMXBean/GetDoubleVMOption.java test/com/sun/management/HotSpotDiagnosticMXBean/GetVMOption.java test/com/sun/management/HotSpotDiagnosticMXBean/SetAllVMOptions.java test/com/sun/management/HotSpotDiagnosticMXBean/SetVMOption.java test/com/sun/management/OperatingSystemMXBean/GetCommittedVirtualMemorySize.java test/com/sun/management/OperatingSystemMXBean/GetFreePhysicalMemorySize.java test/com/sun/management/OperatingSystemMXBean/GetFreeSwapSpaceSize.java test/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java test/com/sun/management/OperatingSystemMXBean/GetProcessCpuTime.java test/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java test/com/sun/management/OperatingSystemMXBean/GetTotalPhysicalMemorySize.java test/com/sun/management/OperatingSystemMXBean/MemoryStatusOverflow.java test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.java test/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java test/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java test/com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh test/com/sun/tools/attach/BasicTests.java test/com/sun/tools/attach/PermissionTest.java test/com/sun/tools/attach/ProviderTest.java test/com/sun/tools/attach/StartManagementAgent.java test/com/sun/tools/attach/TempDirTest.java test/demo/jvmti/minst/MinstTest.java test/java/lang/instrument/AddTransformerTest.java test/java/lang/instrument/AppendToBootstrapClassPathTest.java test/java/lang/instrument/AppendToClassPathTest.java test/java/lang/instrument/BootClassPath/BootClassPathTest.sh test/java/lang/instrument/DaemonThread/TestDaemonThread.java test/java/lang/instrument/FromShutdownHook.java test/java/lang/instrument/GetAllLoadedClassesTest.java test/java/lang/instrument/GetInitiatedClassesTest.java test/java/lang/instrument/GetObjectSizeTest.java test/java/lang/instrument/IsModifiableClassAgent.java test/java/lang/instrument/ManifestTest.sh test/java/lang/instrument/ManyMethodsBenchmarkAgent.java test/java/lang/instrument/NativeMethodPrefixAgent.java test/java/lang/instrument/NoTransformerAddedTest.java test/java/lang/instrument/NullGetObjectSizeTest.java test/java/lang/instrument/NullRedefineClassesTests.java test/java/lang/instrument/NullTransformerAddTest.java test/java/lang/instrument/NullTransformerRemoveTest.java test/java/lang/instrument/ParallelTransformerLoader.sh test/java/lang/instrument/PremainClass/InheritAgent0010.java test/java/lang/instrument/PremainClass/InheritAgent0011.java test/java/lang/instrument/PremainClass/InheritAgent0110.java test/java/lang/instrument/PremainClass/InheritAgent0111.java test/java/lang/instrument/PremainClass/InheritAgent1000.java test/java/lang/instrument/PremainClass/InheritAgent1001.java test/java/lang/instrument/PremainClass/InheritAgent1010.java test/java/lang/instrument/PremainClass/InheritAgent1011.java test/java/lang/instrument/PremainClass/InheritAgent1100.java test/java/lang/instrument/PremainClass/InheritAgent1101.java test/java/lang/instrument/PremainClass/InheritAgent1110.java test/java/lang/instrument/PremainClass/InheritAgent1111.java test/java/lang/instrument/PremainClass/NoPremainAgentTest.java test/java/lang/instrument/PremainClass/PremainClassTest.java test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java test/java/lang/instrument/RedefineBigClass.sh test/java/lang/instrument/RedefineClassWithNativeMethod.sh test/java/lang/instrument/RedefineClassesDisabledTest.java test/java/lang/instrument/RedefineClassesTests.java test/java/lang/instrument/RedefineMethodAddInvoke.sh test/java/lang/instrument/RedefineMethodDelInvoke.sh test/java/lang/instrument/RedefineMethodInBacktrace.sh test/java/lang/instrument/RedefineMethodWithAnnotations.sh test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh test/java/lang/instrument/RemoveAbsentTransformerTest.java test/java/lang/instrument/RemoveTransformerTest.java test/java/lang/instrument/RetransformAgent.java test/java/lang/instrument/RetransformBigClass.sh test/java/lang/instrument/SingleTransformerTest.java test/java/lang/instrument/StressGetObjectSizeTest.sh test/java/lang/instrument/TransformMethodTest.java test/java/lang/instrument/TransformerManagementThreadAddTests.java test/java/lang/instrument/TransformerManagementThreadRemoveTests.java test/java/lang/instrument/VerifyLocalVariableTableOnRetransformTest.sh test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.sh test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh test/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh test/java/lang/management/BufferPoolMXBean/Basic.java test/java/lang/management/ClassLoadingMXBean/LoadCounts.java test/java/lang/management/CompilationMXBean/Basic.java test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java test/java/lang/management/CompositeData/MemoryUsageCompositeData.java test/java/lang/management/CompositeData/ThreadInfoCompositeData.java test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java test/java/lang/management/MXBean/MXBeanBehavior.java test/java/lang/management/ManagementFactory/GetObjectName.java test/java/lang/management/ManagementFactory/GetPlatformMXBeans.java test/java/lang/management/ManagementFactory/GetPlatformManagementInterfaces.java test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java test/java/lang/management/ManagementFactory/MXBeanException.java test/java/lang/management/ManagementFactory/MXBeanProxyTest.java test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java test/java/lang/management/ManagementFactory/ProxyExceptions.java test/java/lang/management/ManagementFactory/ProxyTypeMapping.java test/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java test/java/lang/management/ManagementFactory/ValidateOpenTypes.java test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java test/java/lang/management/MemoryMXBean/GetMBeanInfo.java test/java/lang/management/MemoryMXBean/LowMemoryTest.java test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh test/java/lang/management/MemoryMXBean/MemoryManagement.java test/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh test/java/lang/management/MemoryMXBean/MemoryTest.java test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh test/java/lang/management/MemoryMXBean/Pending.java test/java/lang/management/MemoryMXBean/PendingAllGC.sh test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java test/java/lang/management/MemoryPoolMXBean/ThresholdTest.java test/java/lang/management/OperatingSystemMXBean/PlatformMXBeanTest.java test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java test/java/lang/management/RuntimeMXBean/GetSystemProperties.java test/java/lang/management/RuntimeMXBean/PropertiesTest.java test/java/lang/management/RuntimeMXBean/TestInputArgument.sh test/java/lang/management/RuntimeMXBean/UpTime.java test/java/lang/management/ThreadMXBean/AllThreadIds.java test/java/lang/management/ThreadMXBean/DisableTest.java test/java/lang/management/ThreadMXBean/EnableTest.java test/java/lang/management/ThreadMXBean/FindDeadlocks.java test/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java test/java/lang/management/ThreadMXBean/InvalidThreadID.java test/java/lang/management/ThreadMXBean/LockedMonitors.java test/java/lang/management/ThreadMXBean/LockedSynchronizers.java test/java/lang/management/ThreadMXBean/Locks.java test/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java test/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java test/java/lang/management/ThreadMXBean/SharedSynchronizer.java test/java/lang/management/ThreadMXBean/SynchronizationStatistics.java test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java test/java/lang/management/ThreadMXBean/ThreadCounts.java test/java/lang/management/ThreadMXBean/ThreadCpuTime.java test/java/lang/management/ThreadMXBean/ThreadDaemonTest.java test/java/lang/management/ThreadMXBean/ThreadInfoArray.java test/java/lang/management/ThreadMXBean/ThreadLists.java test/java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java test/java/lang/management/ThreadMXBean/ThreadStackTrace.java test/java/lang/management/ThreadMXBean/ThreadUserTime.java test/javax/management/ImplementationVersion/ImplVersionTest.java test/javax/management/Introspector/AnnotationSecurityTest.java test/javax/management/Introspector/AnnotationTest.java test/javax/management/Introspector/ChangingNotifsTest.java test/javax/management/Introspector/ClassLeakTest.java test/javax/management/Introspector/DuplicateGetterTest.java test/javax/management/Introspector/FeatureOrderTest.java test/javax/management/Introspector/GetMBeanInfoExceptionTest.java test/javax/management/Introspector/IdenticalMBeanInfoTest.java test/javax/management/Introspector/ImmutableNotificationInfoTest.java test/javax/management/Introspector/InvokeGettersTest.java test/javax/management/Introspector/IsMethodTest.java test/javax/management/Introspector/NotAnMBeanTest.java test/javax/management/Introspector/NotCompliantCauseTest.java test/javax/management/Introspector/SetWrongTypeAttributeTest.java test/javax/management/Introspector/UnregisterMBeanExceptionTest.java test/javax/management/MBeanInfo/EqualExceptionTest.java test/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java test/javax/management/MBeanInfo/MBeanInfoEqualsTest.java test/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java test/javax/management/MBeanInfo/NotificationInfoTest.java test/javax/management/MBeanInfo/NullInfoArraysTest.java test/javax/management/MBeanInfo/SerializationTest.java test/javax/management/MBeanInfo/SerializationTest1.java test/javax/management/MBeanInfo/TooManyFooTest.java test/javax/management/MBeanServer/AttributeListTypeSafeTest.java test/javax/management/MBeanServer/MBeanExceptionTest.java test/javax/management/MBeanServer/MBeanFallbackTest.java test/javax/management/MBeanServer/MBeanServerInvocationHandlerExceptionTest.java test/javax/management/MBeanServer/MBeanServerNotificationTest.java test/javax/management/MBeanServer/MBeanTest.java test/javax/management/MBeanServer/NewMBeanListenerTest.java test/javax/management/MBeanServer/NotifDeadlockTest.java test/javax/management/MBeanServer/OldMBeanServerTest.java test/javax/management/MBeanServer/PostExceptionTest.java test/javax/management/MBeanServer/PostRegisterDeadlockTest.java test/javax/management/MBeanServer/PostRegisterDeadlockTest2.java test/javax/management/MBeanServer/PreDeregisterDeadlockTest.java test/javax/management/MBeanServer/PreRegisterTest.java test/javax/management/MBeanServerFactory/ReleaseMBeanServerTest.java test/javax/management/MustBeValidMBeanInfo/MustBeValidCommand.java test/javax/management/ObjectInstance/MBeanInfoFailTest.java test/javax/management/ObjectInstance/ObjectInstanceNullTest.java test/javax/management/ObjectInstance/ToStringMethodTest.java test/javax/management/ObjectName/ApplyWildcardTest.java test/javax/management/ObjectName/ComparatorTest.java test/javax/management/ObjectName/DelegateNameWildcardNameTest.java test/javax/management/ObjectName/NullEmptyKeyValueTest.java test/javax/management/ObjectName/ObjectNameGetInstanceTest.java test/javax/management/ObjectName/RepositoryWildcardTest.java test/javax/management/ObjectName/SerialCompatTest.java test/javax/management/ObjectName/ValueWildcardTest.java test/javax/management/descriptor/DefaultDescriptorTest.java test/javax/management/descriptor/DescriptorTest.java test/javax/management/descriptor/EqualsHashCodeTest.java test/javax/management/descriptor/ImmutableArrayFieldTest.java test/javax/management/descriptor/ImmutableDescriptorSerialTest.java test/javax/management/descriptor/ImmutableDescriptorSetFieldsTest.java test/javax/management/descriptor/MBeanInfoInteropTest.java test/javax/management/descriptor/UnionTest.java test/javax/management/generified/GenericTest.java test/javax/management/generified/ListTypeCheckTest.java test/javax/management/loading/ArrayClassTest.java test/javax/management/loading/DocumentRootTest.java test/javax/management/loading/GetMBeansFromURLTest.java test/javax/management/loading/LibraryLoader/LibraryLoaderTest.java test/javax/management/loading/MLetCLR/MLetCommand.java test/javax/management/loading/MLetContentTest.java test/javax/management/loading/MLetInternalsTest.java test/javax/management/loading/ParserInfiniteLoopTest.java test/javax/management/loading/SystemClassLoaderTest.java test/javax/management/modelmbean/AddAttributeChangeNotificationListenerTest.java test/javax/management/modelmbean/DescriptorSupportSerialTest.java test/javax/management/modelmbean/DescriptorSupportTest.java test/javax/management/modelmbean/DescriptorSupportXMLTest.java test/javax/management/modelmbean/ExoticTargetTypeTest.java test/javax/management/modelmbean/InfoSupportTest.java test/javax/management/modelmbean/LoggingExceptionTest.java test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java test/javax/management/modelmbean/OnUnregisterTest.java test/javax/management/modelmbean/RequiredModelMBeanGetAttributeTest.java test/javax/management/modelmbean/RequiredModelMBeanMethodTest.java test/javax/management/modelmbean/RequiredModelMBeanSetAttributeTest.java test/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java test/javax/management/modelmbean/UnserializableTargetObjectTest.java test/javax/management/monitor/AttributeArbitraryDataTypeTest.java test/javax/management/monitor/CounterMonitorDeadlockTest.java test/javax/management/monitor/CounterMonitorInitThresholdTest.java test/javax/management/monitor/CounterMonitorTest.java test/javax/management/monitor/CounterMonitorThresholdTest.java test/javax/management/monitor/DerivedGaugeMonitorTest.java test/javax/management/monitor/GaugeMonitorDeadlockTest.java test/javax/management/monitor/MultiMonitorTest.java test/javax/management/monitor/NonComparableAttributeValueTest.java test/javax/management/monitor/NullAttributeValueTest.java test/javax/management/monitor/ReflectionExceptionTest.java test/javax/management/monitor/RuntimeExceptionTest.java test/javax/management/monitor/StartStopTest.java test/javax/management/monitor/StringMonitorDeadlockTest.java test/javax/management/monitor/ThreadPoolAccTest.java test/javax/management/monitor/ThreadPoolTest.java test/javax/management/mxbean/AmbiguousConstructorTest.java test/javax/management/mxbean/ComparatorExceptionTest.java test/javax/management/mxbean/ExceptionDiagnosisTest.java test/javax/management/mxbean/GenericArrayTypeTest.java test/javax/management/mxbean/GenericTypeTest.java test/javax/management/mxbean/InvalidMXBeanRegistrationTest.java test/javax/management/mxbean/LeakTest.java test/javax/management/mxbean/MBeanOperationInfoTest.java test/javax/management/mxbean/MXBeanAnnotationTest.java test/javax/management/mxbean/MXBeanFallbackTest.java test/javax/management/mxbean/MXBeanFlagTest.java test/javax/management/mxbean/MXBeanPreRegisterTest.java test/javax/management/mxbean/MXBeanRefTest.java test/javax/management/mxbean/MXBeanTest.java test/javax/management/mxbean/MiscTest.java test/javax/management/mxbean/OperationImpactTest.java test/javax/management/mxbean/OverloadTest.java test/javax/management/mxbean/PreRegisterNameTest.java test/javax/management/mxbean/PropertyNamesTest.java test/javax/management/mxbean/SameObjectTwoNamesTest.java test/javax/management/mxbean/StandardMBeanOverrideTest.java test/javax/management/mxbean/ThreadMXBeanTest.java test/javax/management/mxbean/TypeNameTest.java test/javax/management/notification/BroadcasterSupportDeadlockTest.java test/javax/management/notification/FilterExceptionTest.java test/javax/management/notification/NotifExecutorTest.java test/javax/management/notification/NotifInfoTest.java test/javax/management/openmbean/ArrayTypeTest.java test/javax/management/openmbean/BadConstraintTest.java test/javax/management/openmbean/CompositeDataStringTest.java test/javax/management/openmbean/ConstraintTest.java test/javax/management/openmbean/EqualsTest.java test/javax/management/openmbean/IsValueTest.java test/javax/management/openmbean/NullConstructorParamsTest.java test/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java test/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java test/javax/management/openmbean/OpenTypeDescriptorTest.java test/javax/management/openmbean/TabularDataOrderTest.java test/javax/management/proxy/JMXProxyFallbackTest.java test/javax/management/proxy/JMXProxyTest.java test/javax/management/proxy/NotificationEmitterProxy.java test/javax/management/proxy/ProxyObjectMethodsTest.java test/javax/management/query/CustomQueryTest.java test/javax/management/query/InstanceOfExpTest.java test/javax/management/query/QueryExpStringTest.java test/javax/management/query/QueryMatchTest.java test/javax/management/query/QuerySubstringTest.java test/javax/management/relation/NonArrayListTest.java test/javax/management/relation/RelationNotificationSeqNoTest.java test/javax/management/relation/RelationNotificationSourceTest.java test/javax/management/relation/RelationTypeTest.java test/javax/management/remote/mandatory/URLTest.java test/javax/management/remote/mandatory/connection/AddressableTest.java test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java test/javax/management/remote/mandatory/connection/CloseFailedClientTest.java test/javax/management/remote/mandatory/connection/CloseServerTest.java test/javax/management/remote/mandatory/connection/CloseUnconnectedTest.java test/javax/management/remote/mandatory/connection/CloseableTest.java test/javax/management/remote/mandatory/connection/ConnectionListenerNullTest.java test/javax/management/remote/mandatory/connection/ConnectionTest.java test/javax/management/remote/mandatory/connection/DaemonRMIExporterTest.java test/javax/management/remote/mandatory/connection/DeadLockTest.java test/javax/management/remote/mandatory/connection/FailedConnectionTest.java test/javax/management/remote/mandatory/connection/GetConnectionTest.java test/javax/management/remote/mandatory/connection/IIOPURLTest.java test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java test/javax/management/remote/mandatory/connection/MultiOpenCloseTest.java test/javax/management/remote/mandatory/connection/MultiThreadDeadLockTest.java test/javax/management/remote/mandatory/connection/NoIIOP.java test/javax/management/remote/mandatory/connection/RMIConnectionIdTest.java test/javax/management/remote/mandatory/connection/RMIConnectorInternalMapTest.java test/javax/management/remote/mandatory/connection/RMIConnectorNullSubjectConnTest.java test/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java test/javax/management/remote/mandatory/connection/RMIExitTest.java test/javax/management/remote/mandatory/connection/RMISerializeTest.java test/javax/management/remote/mandatory/connection/ReconnectTest.java test/javax/management/remote/mandatory/connectorServer/ConnectorStopDeadlockTest.java test/javax/management/remote/mandatory/connectorServer/JNDIFailureTest.java test/javax/management/remote/mandatory/connectorServer/MBSFPreStartPostStartTest.java test/javax/management/remote/mandatory/connectorServer/RMIExporterTest.java test/javax/management/remote/mandatory/connectorServer/SetMBeanServerForwarder.java test/javax/management/remote/mandatory/loading/DefaultProviderTest.java test/javax/management/remote/mandatory/loading/DeserializeEncodedURLTest.java test/javax/management/remote/mandatory/loading/MethodResultTest.java test/javax/management/remote/mandatory/loading/MissingClassTest.java test/javax/management/remote/mandatory/loading/RMIDownloadTest.java test/javax/management/remote/mandatory/loading/TargetMBeanTest.java test/javax/management/remote/mandatory/loading/UserClassLoaderTest.java test/javax/management/remote/mandatory/notif/AddRemoveTest.java test/javax/management/remote/mandatory/notif/ConcurrentModificationTest.java test/javax/management/remote/mandatory/notif/DeadListenerTest.java test/javax/management/remote/mandatory/notif/DiffHBTest.java test/javax/management/remote/mandatory/notif/EmptyDomainNotificationTest.java test/javax/management/remote/mandatory/notif/ListenerScaleTest.java test/javax/management/remote/mandatory/notif/NotSerializableNotifTest.java test/javax/management/remote/mandatory/notif/NotifBufferSizePropertyNameTest.java test/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java test/javax/management/remote/mandatory/notif/NotificationAccessControllerTest.java test/javax/management/remote/mandatory/notif/NotificationBufferCreationTest.java test/javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java test/javax/management/remote/mandatory/notif/NotificationBufferTest.java test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java test/javax/management/remote/mandatory/notif/RMINotifTest.java test/javax/management/remote/mandatory/notif/ServerNotifs.java test/javax/management/remote/mandatory/notif/UnexpectedNotifTest.java test/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java test/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java test/javax/management/remote/mandatory/passwordAuthenticator/RMIAltAuthTest.java test/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java test/javax/management/remote/mandatory/provider/ProviderTest.java test/javax/management/remote/mandatory/serverError/JMXServerErrorTest.java test/javax/management/remote/mandatory/socketFactories/RMISocketFactoriesTest.java test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation1Test.java test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java test/javax/management/remote/mandatory/threads/ExecutorTest.java test/javax/management/remote/mandatory/threads/NoServerTimeoutTest.java test/javax/management/remote/mandatory/util/MapNullValuesTest.java test/javax/management/remote/mandatory/version/ImplVersionTest.java test/javax/management/security/AvoidGetMBeanInfoCallsTest.java test/javax/management/security/MBeanPermissionTest.java test/javax/management/standardmbean/DeadlockTest.java test/javax/management/timer/MissingNotificationTest.java test/javax/management/timer/StartTest.java test/sun/jvmstat/monitor/HostIdentifier/HostIdentifierCreate.java test/sun/jvmstat/monitor/MonitoredVm/CR6672135.java test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java test/sun/jvmstat/monitor/VmIdentifier/VmIdentifierCreateResolve.java test/sun/jvmstat/perfdata/PrologSanity/PrologSizeSanityCheck.java test/sun/management/AgentCMETest.java test/sun/management/AgentCheckTest.java test/sun/management/HotspotClassLoadingMBean/GetClassInitializationTime.java test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java test/sun/management/HotspotClassLoadingMBean/GetInitializedClassCount.java test/sun/management/HotspotClassLoadingMBean/GetLoadedClassSize.java test/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java test/sun/management/HotspotClassLoadingMBean/GetUnloadedClassSize.java test/sun/management/HotspotRuntimeMBean/GetSafepointCount.java test/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java test/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java test/sun/management/HotspotThreadMBean/GetInternalThreads.java test/sun/management/jdp/JdpDefaultsTest.java test/sun/management/jdp/JdpOffTest.java test/sun/management/jdp/JdpSpecificAddressTest.java test/sun/management/jmxremote/LocalRMIServerSocketFactoryTest.java test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java test/sun/management/jmxremote/bootstrap/LocalManagementTest.java test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.java test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh test/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.java test/sun/management/jmxremote/startstop/JMXStartStopTest.java test/sun/tools/jcmd/TestJcmdDefaults.java test/sun/tools/jcmd/TestJcmdSanity.java test/sun/tools/jconsole/ResourceCheckTest.java test/sun/tools/jhat/HatHeapDump1Test.java test/sun/tools/jinfo/JInfoLauncherTest.java test/sun/tools/jinfo/JInfoRunningProcessFlagTest.java test/sun/tools/jinfo/JInfoRunningProcessTest.java test/sun/tools/jinfo/JInfoSanityTest.java test/sun/tools/jmap/BasicJMapTest.java test/sun/tools/jmap/heapconfig/JMapHeapConfigTest.java test/sun/tools/jps/TestJpsClass.java test/sun/tools/jps/TestJpsJar.java test/sun/tools/jps/TestJpsJarRelative.java test/sun/tools/jps/TestJpsSanity.java test/sun/tools/jstack/BasicJStackTest.java test/sun/tools/jstat/JStatInterval.java test/sun/tools/jstat/snap2.awk test/sun/tools/jstatd/TestJstatdDefaults.java test/sun/tools/jstatd/TestJstatdExternalRegistry.java test/sun/tools/jstatd/TestJstatdPort.java test/sun/tools/jstatd/TestJstatdPortAndServer.java test/sun/tools/jstatd/TestJstatdServer.java test/sun/tools/jstatd/TestJstatdUsage.java
diffstat 542 files changed, 1194 insertions(+), 578 deletions(-) [+]
line wrap: on
line diff
--- a/test/TEST.ROOT	Wed May 06 16:00:15 2015 -0700
+++ b/test/TEST.ROOT	Thu May 07 09:11:49 2015 +0200
@@ -20,5 +20,5 @@
 # Group definitions
 groups=TEST.groups [closed/TEST.groups]
 
-# Tests using jtreg 4.1 b10 features
-requiredVersion=4.1 b10
+# Tests using jtreg 4.1 b11 features
+requiredVersion=4.1 b11
--- a/test/com/sun/jdi/AcceptTimeout.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/AcceptTimeout.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 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
@@ -25,6 +25,7 @@
  * @bug 6198277
  * @summary Test that each ListeningConnector that supports a "timeout" argument will
  *     timeout with TransportTimeoutException
+ * @modules jdk.jdi
  */
 import com.sun.jdi.Bootstrap;
 import com.sun.jdi.connect.Connector;
--- a/test/com/sun/jdi/AccessSpecifierTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/AccessSpecifierTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2007, 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
@@ -28,6 +28,7 @@
  *
  *  @author Tim Bell
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g AccessSpecifierTest.java
  *  @run driver AccessSpecifierTest
--- a/test/com/sun/jdi/AfterThreadDeathTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/AfterThreadDeathTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 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
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g AfterThreadDeathTest.java
  *  @run driver AfterThreadDeathTest
--- a/test/com/sun/jdi/AllLineLocations.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/AllLineLocations.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2000, 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
@@ -28,6 +28,7 @@
  *  @author Gordon Hirsch
  *
  *  @library scaffold
+ *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g RefTypes.java
  *  @run build AllLineLocations
--- a/test/com/sun/jdi/ArrayRangeTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/ArrayRangeTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 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
@@ -30,6 +30,7 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g ArrayRangeTest.java
  *  @run driver ArrayRangeTest
--- a/test/com/sun/jdi/BacktraceFieldTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/BacktraceFieldTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002, 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
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g BacktraceFieldTest.java
  *  @run driver BacktraceFieldTest
--- a/test/com/sun/jdi/BadHandshakeTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/BadHandshakeTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, 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
@@ -44,6 +44,8 @@
  * @summary Check that a bad handshake doesn't cause a debuggee to abort
  * @library /lib/testlibrary
  *
+ * @modules java.management
+ *          jdk.jdi
  * @build jdk.testlibrary.* VMConnection BadHandshakeTest Exit0
  * @run driver BadHandshakeTest
  */
--- a/test/com/sun/jdi/BreakpointTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/BreakpointTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2007, 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
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g BreakpointTest.java
  *  @run driver BreakpointTest
@@ -44,7 +45,7 @@
 // the debuggee, waits a bit, and enables the bkpt again.
 
 class BreakpointTarg {
-    public final static int BKPT_LINE = 54;
+    public final static int BKPT_LINE = 55;
             // LINE NUMBER SENSITIVE
 
     public static long count;
--- a/test/com/sun/jdi/ClassLoaderClassesTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/ClassLoaderClassesTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 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
@@ -30,6 +30,7 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g ClassLoaderClassesTest.java
  *  @run driver ClassLoaderClassesTest
--- a/test/com/sun/jdi/ClassesByName.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/ClassesByName.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 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
@@ -27,6 +27,7 @@
  *  @author Robert Field
  *
  *  @library scaffold
+ *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g HelloWorld.java
  *  @run build ClassesByName
--- a/test/com/sun/jdi/ClassesByName2Test.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/ClassesByName2Test.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2008, 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
@@ -28,6 +28,8 @@
  *
  *  @author Tim Bell (based on ClassesByName by Robert Field)
  *
+ *  @modules java.corba
+ *           jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g ClassesByName2Test.java
  *  @run driver ClassesByName2Test
--- a/test/com/sun/jdi/CompatibleConnectors.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/CompatibleConnectors.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -27,6 +27,7 @@
  *
  * This test checks that VirtualMachineManager creates Connectors that
  * are "compatible" those created by 1.4 or earilier releases.
+ * @modules jdk.jdi
  */
 
 import com.sun.jdi.*;
--- a/test/com/sun/jdi/ConnectedVMs.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/ConnectedVMs.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER 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 4329140
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g InstTarg.java
  *  @run driver ConnectedVMs Kill
--- a/test/com/sun/jdi/ConstantPoolInfo.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/ConstantPoolInfo.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -28,6 +28,7 @@
  *
  *  @author Swamy Venkataramanappa
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection
  *  @run compile -g ConstantPoolInfo.java
  *  @run driver ConstantPoolInfo
--- a/test/com/sun/jdi/CountEvent.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/CountEvent.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetAdapter TargetListener
  *  @run compile -g CountEvent.java
  *  @run driver CountEvent
--- a/test/com/sun/jdi/CountFilterTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/CountFilterTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 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
@@ -28,6 +28,7 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g CountFilterTest.java
  *  @run driver CountFilterTest
--- a/test/com/sun/jdi/DebuggerThreadTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/DebuggerThreadTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002, 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
@@ -28,6 +28,7 @@
  *
  *  @author Tim Bell
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g DebuggerThreadTest.java
  *  @run driver DebuggerThreadTest
--- a/test/com/sun/jdi/DeleteAllBkptsTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/DeleteAllBkptsTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 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 @@
  *  @author jjh
  *
  *  @library ..
+ *  @modules jdk.jdi
  *  @run build  TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g DeleteAllBkptsTest.java
  *  @run driver DeleteAllBkptsTest
--- a/test/com/sun/jdi/DeleteEventRequestsTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/DeleteEventRequestsTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 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
@@ -28,6 +28,7 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g DeleteEventRequestsTest.java
  *  @run driver DeleteEventRequestsTest
--- a/test/com/sun/jdi/DoubleAgentTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/DoubleAgentTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, 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
@@ -30,6 +30,7 @@
  * @summary Check that multiple -agentlib statements in command line fails
  *
  * @library /lib/testlibrary
+ * @modules java.management
  * @build jdk.testlibarary.*
  * @build DoubleAgentTest Exit0
  * @run driver DoubleAgentTest
--- a/test/com/sun/jdi/EarlyReturnNegativeTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/EarlyReturnNegativeTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  *  @summary Unexpected ClassCastException in ThreadReference.forceEarlyReturn
  *  @author Jim Holmlund
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g EarlyReturnNegativeTest.java
  *  @run driver EarlyReturnNegativeTest
--- a/test/com/sun/jdi/EarlyReturnTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/EarlyReturnTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, 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
@@ -34,6 +34,7 @@
  *
  *  @author Tim Bell (based on MethodExitReturnValuesTest by Jim Holmlund)
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g EarlyReturnTest.java
  *  @run driver EarlyReturnTest
--- a/test/com/sun/jdi/EnumTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/EnumTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g EnumTest.java
  *  @run driver EnumTest
--- a/test/com/sun/jdi/EventQueueDisconnectTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/EventQueueDisconnectTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2006, 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
@@ -26,6 +26,7 @@
  *  @bug 4425852
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build VMConnection
  *  @run compile -g EventQueueDisconnectTest.java
  *  @run driver EventQueueDisconnectTest
--- a/test/com/sun/jdi/ExceptionEvents.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/ExceptionEvents.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, 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
@@ -29,6 +29,7 @@
  *  @author Robert Field
  *
  *  @library scaffold
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection
  *  @run compile -g ExceptionEvents.java
  *
--- a/test/com/sun/jdi/ExclusiveBind.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/ExclusiveBind.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, 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
@@ -27,6 +27,8 @@
  *          at the same time.
  * @library /lib/testlibrary
  *
+ * @modules java.management
+ *          jdk.jdi
  * @build jdk.testlibrary.* VMConnection ExclusiveBind HelloWorld
  * @run driver ExclusiveBind
  */
--- a/test/com/sun/jdi/ExpiredRequestDeletionTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/ExpiredRequestDeletionTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 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
@@ -29,6 +29,7 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g ExpiredRequestDeletionTest.java
  *  @run driver ExpiredRequestDeletionTest
--- a/test/com/sun/jdi/FieldWatchpoints.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/FieldWatchpoints.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002, 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
@@ -28,6 +28,7 @@
  *
  *  @author Tim Bell
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g FieldWatchpoints.java
  *  @run driver FieldWatchpoints
--- a/test/com/sun/jdi/FilterMatch.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/FilterMatch.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2007, 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
@@ -29,6 +29,7 @@
  *  @author Robert Field/Jim Holmlund
  *
  *  @library scaffold
+ *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g HelloWorld.java
  *  @run driver FilterMatch
--- a/test/com/sun/jdi/FilterNoMatch.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/FilterNoMatch.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, 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
@@ -29,6 +29,7 @@
  *  @author Robert Field/Jim Holmlund
  *
  *  @library scaffold
+ *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g HelloWorld.java
  *  @run driver FilterNoMatch
--- a/test/com/sun/jdi/FinalLocalsTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/FinalLocalsTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
  *
  *  @author Tim Bell
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g FinalLocalsTest.java
  *  @run driver FinalLocalsTest
--- a/test/com/sun/jdi/FinalizerTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/FinalizerTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2001, 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
@@ -27,6 +27,7 @@
  *  @summary Test debugger operations in finalize() methods
  *  @author Gordon Hirsch  (modified for HotSpot by tbell & rfield)
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g FinalizerTest.java
  *
--- a/test/com/sun/jdi/FramesTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/FramesTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 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
@@ -28,6 +28,7 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g FramesTest.java
  *  @run driver FramesTest
--- a/test/com/sun/jdi/GenericsTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/GenericsTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g GenericsTest.java
  *  @run driver GenericsTest
--- a/test/com/sun/jdi/GetLocalVariables2Test.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/GetLocalVariables2Test.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 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
@@ -28,6 +28,7 @@
  *
  *  @author Tim Bell
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g GetLocalVariables2Test.java
  *  @run driver GetLocalVariables2Test
--- a/test/com/sun/jdi/GetUninitializedStringValue.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/GetUninitializedStringValue.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *
  *  @author Staffan Larsen
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g GetUninitializedStringValue.java
  *  @run driver GetUninitializedStringValue
--- a/test/com/sun/jdi/HomeTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/HomeTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 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
@@ -28,6 +28,7 @@
  *
  *  @author Tim Bell (based on "HomeTest.java" by Eugene I. Latkin)
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g HomeTest.java
  *  @run driver HomeTest
--- a/test/com/sun/jdi/InstanceFilter.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/InstanceFilter.java	Thu May 07 09:11:49 2015 +0200
@@ -29,6 +29,7 @@
  *
  *  @author Robert Field/Jim Holmlund
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetAdapter TargetListener
  *  @run compile -g InstanceFilter.java
  *  @run driver InstanceFilter
--- a/test/com/sun/jdi/InstancesTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/InstancesTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, 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
@@ -27,6 +27,7 @@
  *  @summary Add ReferenceType.getAllInstances () method to JDI.
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g InstancesTest.java
  *  @run driver InstancesTest
--- a/test/com/sun/jdi/InterfaceMethodsTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/InterfaceMethodsTest.java	Thu May 07 09:11:49 2015 +0200
@@ -27,6 +27,7 @@
  *  @bug 8071657
  *  @summary  JDI: Add support for static and default methods in interfaces
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run build InterfaceMethodsTest
  *  @run driver InterfaceMethodsTest
--- a/test/com/sun/jdi/InterruptHangTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/InterruptHangTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,3 +1,30 @@
+/*
+ * 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import com.sun.jdi.*;
+import com.sun.jdi.event.*;
+import com.sun.jdi.request.*;
+
 /**
  *  @test
  *  @bug 6459476
@@ -5,15 +32,13 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g InterruptHangTest.java
  *  @run driver InterruptHangTest
  */
-import com.sun.jdi.*;
-import com.sun.jdi.event.*;
-import com.sun.jdi.request.*;
 
-/*
+/**
  * Debuggee has two threads.  Debugger keeps stepping in
  * the first thread.  The second thread keeps interrupting the first
  * thread.  If a long time goes by with the debugger not getting
--- a/test/com/sun/jdi/InvokeHangTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/InvokeHangTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g InvokeHangTest.java
  *  @run driver InvokeHangTest
--- a/test/com/sun/jdi/InvokeTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/InvokeTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002, 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
@@ -29,6 +29,7 @@
  *  @author Robert Field
  *
  *  @library ..
+ *  @modules jdk.jdi
  *  @run build  TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g InvokeTest.java
  *  @run driver InvokeTest
--- a/test/com/sun/jdi/JITDebug.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/JITDebug.sh	Thu May 07 09:11:49 2015 +0200
@@ -1,7 +1,7 @@
 #!/bin/ksh -p
 
 #
-# Copyright (c) 2002, 2012, 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
@@ -31,6 +31,7 @@
 #   @author     Tim Bell
 #   Based on test/java/awt/TEMPLATE/AutomaticShellTest.sh
 #
+#   @modules jdk.jdi
 #   @run build TestScaffold VMConnection TargetListener TargetAdapter
 #   @run compile -g JITDebug.java
 #   @run shell JITDebug.sh
--- a/test/com/sun/jdi/Java_gTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/Java_gTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2005, 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
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g Java_gTest.java
  *  @run driver Java_gTest
--- a/test/com/sun/jdi/LambdaBreakpointTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/LambdaBreakpointTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -29,6 +29,7 @@
  *
  *  @author Staffan Larsen
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g LambdaBreakpointTest.java
  *  @run driver LambdaBreakpointTest
@@ -51,7 +52,7 @@
 class LambdaBreakpointTestTarg {
 
     static int[] breakpointLines = {
-            62, 66, 63, 64, 65, 67
+            63, 67, 64, 65, 66, 68
     };
 
     public static void main(String[] args) {
--- a/test/com/sun/jdi/LambdaStepTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/LambdaStepTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 @@
  *
  *  @author Staffan Larsen
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g LambdaStepTest.java
  *  @run driver LambdaStepTest
--- a/test/com/sun/jdi/LaunchCommandLine.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/LaunchCommandLine.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 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
@@ -28,6 +28,7 @@
  *  @author Gordon Hirsch
  *
  *  @library scaffold
+ *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g HelloWorld.java
  *  @run build LaunchCommandLine
--- a/test/com/sun/jdi/LineNumberInfo.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/LineNumberInfo.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2006, 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
@@ -27,6 +27,7 @@
  *  @summary Test javac regressions in the generation of line number info
  *  @author Gordon Hirsch
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g LineNumberInfo.java ControlFlow.java
  *
--- a/test/com/sun/jdi/LineNumberOnBraceTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/LineNumberOnBraceTest.java	Thu May 07 09:11:49 2015 +0200
@@ -18,8 +18,8 @@
     /********** LINE NUMBER SENSITIVE! *****************************************************************/
 class LineNumberOnBraceTarg {
 
-    public final static int stopLine = 28;   // THIS MUST BE THE LINE NUMBER OF THE // stopline LINE
-    public final static int stopLine2 = 34;  // THIS MUST BE THE LINE NUMBER OF THE // stopline2 LINE
+    public final static int stopLine = 29;   // THIS MUST BE THE LINE NUMBER OF THE // stopline LINE
+    public final static int stopLine2 = 35;  // THIS MUST BE THE LINE NUMBER OF THE // stopline2 LINE
 
 
     public static void main(String[] args){
--- a/test/com/sun/jdi/ListenAddress.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/ListenAddress.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 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
@@ -26,6 +26,7 @@
  * @summary Test that startListening(Map) method of the com.sun.jdi.SocketListen
  *          Connector returns an address that is usable for the address option on
  *          remove debuggees.
+ * @modules jdk.jdi
  */
 import java.net.InetAddress;
 import java.net.Inet4Address;
--- a/test/com/sun/jdi/LocalVariableEqual.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/LocalVariableEqual.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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 @@
  *
  *  @author Serguei Spitsyn
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g LocalVariableEqual.java
  *  @run driver LocalVariableEqual
--- a/test/com/sun/jdi/LocationTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/LocationTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 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
@@ -28,6 +28,7 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g LocationTest.java
  *  @run driver LocationTest
--- a/test/com/sun/jdi/MethodEntryExitEvents.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/MethodEntryExitEvents.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, 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
@@ -27,6 +27,7 @@
  *  @summary Test the bug fix for: MethodExitEvents disappear when Object-Methods are called from main
  *  @author Tim Bell
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g MethodEntryExitEvents.java
  *  @run driver MethodEntryExitEvents SUSPEND_EVENT_THREAD MethodEntryExitEventsDebugee
--- a/test/com/sun/jdi/MethodExitReturnValuesTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/MethodExitReturnValuesTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, 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
@@ -27,6 +27,7 @@
  *  @summary JDWP, JDI: Add return value to Method Exit Event
  *  @author Jim Holmlund
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g MethodExitReturnValuesTest.java
  *  @run driver MethodExitReturnValuesTest
--- a/test/com/sun/jdi/MixedSuspendTest.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/MixedSuspendTest.sh	Thu May 07 09:11:49 2015 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2005, 2014 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
@@ -29,6 +29,7 @@
 # 
 #  @author Jim Holmlund
 # 
+#  @modules jdk.jdi
 #  @run build TestScaffold VMConnection TargetListener TargetAdapter
 #  @run shell MixedSuspendTest.sh
 
--- a/test/com/sun/jdi/ModificationWatchpoints.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/ModificationWatchpoints.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 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
@@ -30,6 +30,7 @@
  *  @author Robert Field (modified to JDIScaffold)
  *
  *  @library scaffold
+ *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g ModificationWatchpoints.java
  *  @run driver ModificationWatchpoints
--- a/test/com/sun/jdi/MonitorEventTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/MonitorEventTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -28,6 +28,7 @@
  *
  *  @author Swamy Venkataramanappa
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g MonitorEventTest.java
  *  @run driver MonitorEventTest
--- a/test/com/sun/jdi/MonitorFrameInfo.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/MonitorFrameInfo.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, 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
@@ -29,6 +29,7 @@
  *  @summary MonitorInfo objects aren't invalidated when the owning thread is resumed
  *  @author Swamy Venkataramanappa
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g MonitorFrameInfo.java
  *  @run driver MonitorFrameInfo
--- a/test/com/sun/jdi/MultiBreakpointsTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/MultiBreakpointsTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 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
@@ -29,6 +29,7 @@
  *
  *  @author tbell, jjh
  *
+ *  @modules jdk.jdi
  *  @build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g MultiBreakpointsTest.java
  *  @run driver MultiBreakpointsTest
--- a/test/com/sun/jdi/NativeInstanceFilter.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/NativeInstanceFilter.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -29,6 +29,7 @@
  *  @author Keith McGuigan
  *
  *  @library scaffold
+ *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @compile -XDignore.symbol.file NativeInstanceFilterTarg.java
  *  @run driver NativeInstanceFilter
--- a/test/com/sun/jdi/NewInstanceTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/NewInstanceTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 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
@@ -29,6 +29,7 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g NewInstanceTest.java
  *  @run driver NewInstanceTest
--- a/test/com/sun/jdi/NoLaunchOptionTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/NoLaunchOptionTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, 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
@@ -27,6 +27,7 @@
  *   @summary    Test for -Xrunjdwp:[onthrow,onuncaught] suboptions require launch suboption
  *   @author     Tim Bell
  *
+ *  @modules jdk.jdi
  *  @run compile -g NoLaunchOptionTest.java
  *  @build VMConnection
  *  @run driver NoLaunchOptionTest
--- a/test/com/sun/jdi/NoLocInfoTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/NoLocInfoTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 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
@@ -29,6 +29,7 @@
  *
  *  @author Serguei Spitsyn
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g:none NoLocInfoTest.java
  *  @run driver NoLocInfoTest
--- a/test/com/sun/jdi/NullThreadGroupNameTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/NullThreadGroupNameTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 7105883
  *  @summary Ensure that JDWP doesn't crash with a null thread group name
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run driver NullThreadGroupNameTest
  */
--- a/test/com/sun/jdi/OnThrowTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/OnThrowTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, 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
@@ -27,6 +27,7 @@
  *   @summary    Test for -agentlib::[onthrow,launch]
  *   @author     Kelly O'Hair
  *
+ *  @modules jdk.jdi
  *  @run compile -g OnThrowTest.java
  *  @run compile -g OnThrowTarget.java
  *  @run compile -g VMConnection.java
--- a/test/com/sun/jdi/OptionTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/OptionTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2014, 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
@@ -27,6 +27,7 @@
  *   @summary    Test for misc jdwp options, just that the option is parsed
  *   @author     Kelly O'Hair (copied from Tim Bell's NoLaunchOptionTest)
  *
+ *  @modules jdk.jdi
  *  @run compile -g OptionTest.java
  *  @run compile -g HelloWorld.java
  *  @run compile -g VMConnection.java
--- a/test/com/sun/jdi/PopAndInvokeTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/PopAndInvokeTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /**
  *  @test
  *  @bug 6517249
+ *  @modules jdk.jdi
  *  @ignore 6951287
  *  @summary JDWP: Cannot do an invokeMethod after a popFrames operation
  *
--- a/test/com/sun/jdi/PopAndStepTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/PopAndStepTest.java	Thu May 07 09:11:49 2015 +0200
@@ -8,6 +8,7 @@
  *  @author jjh
  *
  *  @library ..
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g PopAndStepTest.java
  *  @run driver PopAndStepTest
@@ -23,20 +24,20 @@
 class PopAndStepTarg {
     public void B() {
         System.out.println("debuggee: in B");
-        System.out.println("debuggee: in B, back to A");   // add line breakpoint here line 26 !!!
+        System.out.println("debuggee: in B, back to A");   // add line breakpoint here line 27 !!!
     }
 
     public void A() {
-        System.out.println("debuggee: in A, about to call B");  // line 30
+        System.out.println("debuggee: in A, about to call B");  // line 31
         B();
-        System.out.println("debuggee: in A, back from B");      // line 32
-        throw new RuntimeException("debuggee: Got to line 33");
+        System.out.println("debuggee: in A, back from B");      // line 33
+        throw new RuntimeException("debuggee: Got to line 34");
     }
 
     public static void main(String[] args) {
-        System.out.println("debuggee: Howdy!");      // line 37
-        PopAndStepTarg xxx = new PopAndStepTarg();   // line 39
-        xxx.A();                                     // line 40
+        System.out.println("debuggee: Howdy!");      // line 38
+        PopAndStepTarg xxx = new PopAndStepTarg();   // line 40
+        xxx.A();                                     // line 41
         System.out.println("debugee: Goodbye from PopAndStepTarg!");
     }
 }
@@ -115,10 +116,10 @@
         BreakpointEvent bpe = startToMain("PopAndStepTarg");
         targetClass = bpe.location().declaringType();
         mainThread = bpe.thread();
-        getDebuggeeLineNum(37);
+        getDebuggeeLineNum(38);
 
-        println("Resuming to line 26");
-        bpe = resumeTo("PopAndStepTarg", 26); getDebuggeeLineNum(26);
+        println("Resuming to line 27");
+        bpe = resumeTo("PopAndStepTarg", 27); getDebuggeeLineNum(27);
 
         // The failure is this:
         //   create step request
@@ -140,21 +141,21 @@
         srInto.enable(); // This fails
         mainThread.popFrames(frameFor("A"));
         //srInto.enable();   // if the enable is moved here, it passes
-        println("Popped back to line 40 in main, the call to A()");
-        println("Stepping into line 30");
+        println("Popped back to line 41 in main, the call to A()");
+        println("Stepping into line 31");
         waitForRequestedEvent(srInto);   // println
         srInto.disable();
 
-        getDebuggeeLineNum(30);
+        getDebuggeeLineNum(31);
 
         // The failure occurs here.
-        println("Stepping over to line 31");
+        println("Stepping over to line 32");
         stepOverLine(mainThread);   // println
-        getDebuggeeLineNum(31);
+        getDebuggeeLineNum(32);
 
-        println("Stepping over to line 32");
+        println("Stepping over to line 33");
         stepOverLine(mainThread);        // call to B()
-        getDebuggeeLineNum(32);
+        getDebuggeeLineNum(33);
 
         vm().exit(0);
 
--- a/test/com/sun/jdi/PopAsynchronousTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/PopAsynchronousTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002, 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
@@ -29,6 +29,7 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g PopAsynchronousTest.java
  *  @run driver PopAsynchronousTest
--- a/test/com/sun/jdi/PopSynchronousTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/PopSynchronousTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 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
@@ -29,6 +29,7 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g PopSynchronousTest.java
  *  @run driver PopSynchronousTest
--- a/test/com/sun/jdi/ProcessAttachTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/ProcessAttachTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,8 @@
  * @summary Unit test for ProcessAttachingConnector
  *
  * @library /lib/testlibrary
+ * @modules java.management
+ *          jdk.jdi
  * @build jdk.testlibrary.* ProcessAttachTest
  * @run driver ProcessAttachTest
  */
--- a/test/com/sun/jdi/RedefineCrossEvent.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/RedefineCrossEvent.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 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
@@ -28,6 +28,8 @@
  *
  *  @author Robert Field
  *
+ *  @modules java.corba
+ *           jdk.jdi
  *  @run build TestScaffold VMConnection TargetAdapter TargetListener
  *  @run compile -g AccessSpecifierTest.java
  *  @run compile -g AfterThreadDeathTest.java
--- a/test/com/sun/jdi/RedefineCrossStart.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/RedefineCrossStart.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 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
@@ -31,6 +31,7 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g CountEvent.java
  *  @run compile -g CountFilterTest.java
--- a/test/com/sun/jdi/ReferrersTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/ReferrersTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  *  @summary Add support for backtracking reference graph.
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g ReferrersTest.java
  *  @run driver ReferrersTest
--- a/test/com/sun/jdi/RepStep.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/RepStep.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER 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 4334008
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run compile -g RepStepTarg.java
  *  @run build VMConnection RepStep
  *
--- a/test/com/sun/jdi/RequestReflectionTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/RequestReflectionTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 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
@@ -26,6 +26,7 @@
  *  @bug 4425840
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g RequestReflectionTest.java
  *  @run driver RequestReflectionTest
--- a/test/com/sun/jdi/ResumeOneThreadTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/ResumeOneThreadTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g ResumeOneThreadTest.java
  *  @run driver ResumeOneThreadTest
--- a/test/com/sun/jdi/RunToExit.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/RunToExit.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, 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
@@ -25,6 +25,8 @@
  * @bug 4997445
  * @summary Test that with server=y, when VM runs to System.exit() no error happens
  * @library /lib/testlibrary
+ * @modules java.management
+ *          jdk.jdi
  * @build jdk.testlibrary.* VMConnection RunToExit Exit0
  * @run driver RunToExit
  */
--- a/test/com/sun/jdi/SDENullTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/SDENullTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 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
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build  TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g SDENullTest.java
  *  @run driver SDENullTest
--- a/test/com/sun/jdi/SimulResumerTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/SimulResumerTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g SimulResumerTest.java
  *  @run driver SimulResumerTest
--- a/test/com/sun/jdi/SourceNameFilterTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/SourceNameFilterTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, 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 jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g SourceNameFilterTest.java
  *  @run driver SourceNameFilterTest
--- a/test/com/sun/jdi/StepTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/StepTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2004, 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
@@ -26,6 +26,7 @@
  *  @bug 4270488 4787861
  *  @author Gordon Hirsch
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetAdapter TargetListener
  *  @run compile -g MethodCalls.java
  *  @run compile -g MethodCallsReflection.java
--- a/test/com/sun/jdi/SuspendNoFlagTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/SuspendNoFlagTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, 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 @@
  * @bug 4914611
  * @summary Test for JDWP: -agentlib:jdwp=suspend=n hanging
  * @library /lib/testlibrary
+ * @modules java.management
  * @build jdk.testlibarary.*
  * @compile -g HelloWorld.java
  * @run driver SuspendNoFlagTest
--- a/test/com/sun/jdi/SuspendThreadTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/SuspendThreadTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g SuspendThreadTest.java
  *  @run driver SuspendThreadTest
--- a/test/com/sun/jdi/TemplateTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/TemplateTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 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
@@ -31,6 +31,7 @@
  *
  *  @author <AUTHOR>
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g TemplateTest.java
  *  @run driver TemplateTest
--- a/test/com/sun/jdi/ThreadGroupTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/ThreadGroupTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 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 @@
  *           destroyed this should not impact subsequent thread creation by
  *           the virtual machine manager.
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile ThreadGroupTest.java
  *  @run driver ThreadGroupTest
--- a/test/com/sun/jdi/TwoThreadsTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/TwoThreadsTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g TwoThreadsTest.java
  *  @run driver TwoThreadsTest
--- a/test/com/sun/jdi/UTF8Test.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/UTF8Test.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2007, 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
@@ -28,6 +28,7 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g UTF8Test.java
  *  @run driver UTF8Test
--- a/test/com/sun/jdi/UnpreparedByName.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/UnpreparedByName.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 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
@@ -29,6 +29,7 @@
  *  @author Robert Field
  *
  *  @library scaffold
+ *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g InnerTarg.java
  *  @run build UnpreparedByName
--- a/test/com/sun/jdi/UnpreparedClasses.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/UnpreparedClasses.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 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
@@ -29,6 +29,7 @@
  *  @author Robert Field
  *
  *  @library scaffold
+ *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g InnerTarg.java
  *  @run build UnpreparedClasses
--- a/test/com/sun/jdi/VMDeathLastTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/VMDeathLastTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2003, 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
@@ -28,6 +28,7 @@
  *
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g HelloWorld.java
  *  @run build VMDeathLastTest
--- a/test/com/sun/jdi/VMDeathRequestTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/VMDeathRequestTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 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
@@ -26,6 +26,7 @@
  *  @bug 4419314
  *  @author Robert Field
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g HelloWorld.java
  *  @run build VMDeathRequestTest
--- a/test/com/sun/jdi/VarargsTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/VarargsTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 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 @@
  *
  *  @author jjh
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g VarargsTest.java
  *  @run driver VarargsTest
--- a/test/com/sun/jdi/Vars.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/Vars.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
  * 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 Robert Field
  *
  *  @library scaffold
+ *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g Vars.java
  *  @run driver Vars
--- a/test/com/sun/jdi/VisibleMethods.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/VisibleMethods.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *
  *  @author Staffan Larsen
  *
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g VisibleMethods.java
  *  @run driver VisibleMethods
--- a/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -27,6 +27,7 @@
  *
  * This tests launches a debuggee using a custom LaunchingConnector.
  *
+ * @modules jdk.jdi/com.sun.tools.jdi
  * @build DebugUsingCustomConnector SimpleLaunchingConnector Foo NullTransportService
  * @run main/othervm DebugUsingCustomConnector
  */
--- a/test/com/sun/jdi/connect/spi/GeneratedConnectors.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/connect/spi/GeneratedConnectors.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -30,6 +30,7 @@
  * to encapsulate the transport. This tests that the connectors are
  * created and that they have an "address" argument.
  *
+ * @modules jdk.jdi
  * @build GeneratedConnectors NullTransportService
  * @run main/othervm GeneratedConnectors
  */
--- a/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2012, 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
--- a/test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -93,7 +93,7 @@
 
     public SimpleLaunchingConnector() {
         try {
-            Class c = Class.forName("com.sun.tools.jdi.SocketTransportService");
+            Class<?> c = Class.forName("com.sun.tools.jdi.SocketTransportService");
             ts = (TransportService)c.newInstance();
         } catch (Exception x) {
             throw new Error(x);
--- a/test/com/sun/jdi/redefine/RedefineTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/redefine/RedefineTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002, 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
@@ -31,6 +31,7 @@
  *  @author Robert Field
  *
  *  @library ..
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g RedefineTest.java
  *  @run shell RedefineSetUp.sh
--- a/test/com/sun/jdi/redefineMethod/RedefineTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/redefineMethod/RedefineTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 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 @@
  *  @author Robert Field
  *
  *  @library ..
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
  *  @run compile -g RedefineTest.java
  *  @run shell RedefineSetUp.sh
--- a/test/com/sun/jdi/sde/FilterMangleTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/sde/FilterMangleTest.java	Thu May 07 09:11:49 2015 +0200
@@ -6,6 +6,7 @@
  *  @author Robert Field / Jim Holmlund
  *
  *  @library ..
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter InstallSDE
  *  @run compile FilterMangleTest.java
  *  @run compile -g onion/pickle/Mangle.java
--- a/test/com/sun/jdi/sde/MangleStepTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/sde/MangleStepTest.java	Thu May 07 09:11:49 2015 +0200
@@ -7,6 +7,7 @@
  *  @author Robert Field
  *
  *  @library ..
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter InstallSDE
  *  @run compile MangleStepTest.java
  *  @run compile -g  onion/pickle/Mangle.java
--- a/test/com/sun/jdi/sde/MangleTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/sde/MangleTest.java	Thu May 07 09:11:49 2015 +0200
@@ -7,6 +7,7 @@
  *  @author Robert Field
  *
  *  @library ..
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter InstallSDE
  *  @run compile MangleTest.java
  *  @run compile -g onion/pickle/Mangle.java
--- a/test/com/sun/jdi/sde/SourceDebugExtensionTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/sde/SourceDebugExtensionTest.java	Thu May 07 09:11:49 2015 +0200
@@ -7,6 +7,7 @@
  *  @author Robert Field
  *
  *  @library ..
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter InstallSDE
  *  @run compile SourceDebugExtensionTest.java
  *  @run compile -g SourceDebugExtensionTarg.java
--- a/test/com/sun/jdi/sde/TemperatureTableTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jdi/sde/TemperatureTableTest.java	Thu May 07 09:11:49 2015 +0200
@@ -7,6 +7,7 @@
  *  @author Robert Field
  *
  *  @library ..
+ *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter InstallSDE HelloWorld
  *  @run compile TemperatureTableTest.java
  *  @run compile -g TemperatureTableServlet.java
--- a/test/com/sun/jmx/remote/CCAdminReconnectTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jmx/remote/CCAdminReconnectTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 7009998
  * @summary Tests the correct processing of concurrent ClientComunicatorAdmin reconnect requests.
  * @author Jaroslav Bachorik
+ * @modules java.management/com.sun.jmx.remote.internal
  * @run clean CCAdminReconnectTest
  * @run build CCAdminReconnectTest
  * @run main CCAdminReconnectTest
--- a/test/com/sun/jmx/remote/NotificationMarshalVersions/TestSerializationMismatch.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/jmx/remote/NotificationMarshalVersions/TestSerializationMismatch.java	Thu May 07 09:11:49 2015 +0200
@@ -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,8 @@
  * @author Jaroslav Bachorik
  * @bug 6937053 8005472
  *
+ * @modules java.management
+ *          jdk.compiler
  * @run clean TestSerializationMismatch
  * @run main/othervm TestSerializationMismatch
  *
--- a/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanDoubleInvocationTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanDoubleInvocationTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Basic Test for the DiagnosticCommandMBean
  * @author  Frederic Parain, Shanliang JIANG
  *
+ * @modules jdk.management
  * @run main/othervm DcmdMBeanDoubleInvocationTest
  */
 
--- a/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanInvocationTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanInvocationTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Basic Test for the DiagnosticCommandMBean
  * @author  Frederic Parain, Shanliang JIANG
  *
+ * @modules jdk.management
  * @run main/othervm DcmdMBeanInvocationTest
  */
 
--- a/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanPermissionsTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanPermissionsTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Permissions Tests for the DiagnosticCommandMBean
  * @author  Frederic Parain
  *
+ * @modules jdk.management
  * @run main/othervm DcmdMBeanPermissionsTest
  */
 
--- a/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Basic Test for the DiagnosticCommandMBean
  * @author  Frederic Parain, Shanliang JIANG
  *
+ * @modules jdk.management
  * @run main/othervm DcmdMBeanTest
  */
 
--- a/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationContentTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationContentTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 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
@@ -27,6 +27,7 @@
  * @summary Check that GarbageCollectionNotification contents are reasonable
  * @author  Frederic Parain
  * @requires vm.opt.ExplicitGCInvokesConcurrent == null | vm.opt.ExplicitGCInvokesConcurrent == false
+ * @modules jdk.management
  * @run     main/othervm GarbageCollectionNotificationContentTest
  */
 
--- a/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 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
@@ -27,6 +27,7 @@
  * @summary Check that GarbageCollection notification are thrown by every GarbageCollectorMXBean
  * @author  Frederic Parain
  * @requires vm.opt.ExplicitGCInvokesConcurrent == null | vm.opt.ExplicitGCInvokesConcurrent == false
+ * @modules jdk.management
  * @run     main/othervm GarbageCollectionNotificationTest
  */
 
--- a/test/com/sun/management/GarbageCollectorMXBean/LastGCInfo.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/GarbageCollectorMXBean/LastGCInfo.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013 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
@@ -27,6 +27,7 @@
  * @summary Sanity Test for GarbageCollectorMXBean.getLastGcInfo().
  * @author  Mandy Chung
  *
+ * @modules jdk.management
  * @run main/othervm -XX:-ExplicitGCInvokesConcurrent LastGCInfo
  */
 // Passing "-XX:-ExplicitGCInvokesConcurrent" to force System.gc()
--- a/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 8028994
  * @author Staffan Larsen
  * @library /lib/testlibrary
+ * @modules jdk.attach/sun.tools.attach
+ *          jdk.management
  * @build jdk.testlibrary.*
  * @run main CheckOrigin
  */
--- a/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh	Thu May 07 09:11:49 2015 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# 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
@@ -29,6 +29,7 @@
 # @summary Sanity test for com.sun.management.HotSpotDiagnosticMXBean.dumpHeap 
 #          method 
 #
+# @modules jdk.management
 # @build DumpHeap
 # @run shell DumpHeap.sh
 
--- a/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticOptions.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticOptions.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, 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
@@ -27,6 +27,7 @@
  * @summary Basic Test for HotSpotDiagnosticMXBean.getDiagnosticOptions()
  * @author  Daniel Fuchs
  *
+ * @modules jdk.management
  * @run main GetDiagnosticOptions
  */
 
--- a/test/com/sun/management/HotSpotDiagnosticMXBean/GetDoubleVMOption.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/HotSpotDiagnosticMXBean/GetDoubleVMOption.java	Thu May 07 09:11:49 2015 +0200
@@ -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 Basic Test for HotSpotDiagnosticMXBean.getVMOption() and double values
  * @author  Jaroslav Bachorik
  *
+ * @modules jdk.management
  * @run main/othervm -XX:CompileThresholdScaling=0.14 GetDoubleVMOption
  */
 
--- a/test/com/sun/management/HotSpotDiagnosticMXBean/GetVMOption.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/HotSpotDiagnosticMXBean/GetVMOption.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, 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
@@ -27,6 +27,7 @@
  * @summary Basic Test for HotSpotDiagnosticMXBean.getVMOption()
  * @author  Mandy Chung
  *
+ * @modules jdk.management
  * @run main/othervm -XX:+PrintGCDetails GetVMOption
  */
 
--- a/test/com/sun/management/HotSpotDiagnosticMXBean/SetAllVMOptions.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/HotSpotDiagnosticMXBean/SetAllVMOptions.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, 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
@@ -27,6 +27,7 @@
  * @summary Basic Test for HotSpotDiagnosticMXBean.setVMOption()
  * @author  Tomas Hurka, Daniel Fuchs
  *
+ * @modules jdk.management
  * @run main SetAllVMOptions
  */
 
--- a/test/com/sun/management/HotSpotDiagnosticMXBean/SetVMOption.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/HotSpotDiagnosticMXBean/SetVMOption.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, 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
@@ -29,6 +29,7 @@
  * @author  Mandy Chung
  * @author  Jaroslav Bachorik
  *
+ * @modules jdk.management
  * @run main/othervm -XX:+PrintGCDetails SetVMOption
  */
 
--- a/test/com/sun/management/OperatingSystemMXBean/GetCommittedVirtualMemorySize.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/OperatingSystemMXBean/GetCommittedVirtualMemorySize.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -26,6 +26,7 @@
  * @bug     4858522 6191542
  * @summary Basic unit test of OperatingSystemMXBean.getCommittedVirtualMemorySize()
  * @author  Steve Bohne
+ * @modules jdk.management
  */
 
 /*
--- a/test/com/sun/management/OperatingSystemMXBean/GetFreePhysicalMemorySize.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/OperatingSystemMXBean/GetFreePhysicalMemorySize.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -26,6 +26,7 @@
  * @bug     4858522
  * @summary Basic unit test of OperatingSystemMXBean.getFreePhysicalMemorySize()
  * @author  Steve Bohne
+ * @modules jdk.management
  */
 
 /*
--- a/test/com/sun/management/OperatingSystemMXBean/GetFreeSwapSpaceSize.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/OperatingSystemMXBean/GetFreeSwapSpaceSize.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -26,6 +26,7 @@
  * @bug     4858522
  * @summary Basic unit test of OperatingSystemMXBean.getFreeSwapSpaceSize()
  * @author  Steve Bohne
+ * @modules jdk.management
  */
 
 /*
--- a/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 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     7028071
  * @summary Basic unit test of OperatingSystemMXBean.getProcessCpuLoad()
  *
+ * @modules jdk.management
  * @run main GetProcessCpuLoad
  */
 
--- a/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuTime.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuTime.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -26,6 +26,7 @@
  * @bug     4858522
  * @summary Basic unit test of OperatingSystemMXBean.getProcessCpuTime()
  * @author  Steve Bohne
+ * @modules jdk.management
  */
 
 /*
--- a/test/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 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     7028071
  * @summary Basic unit test of OperatingSystemMXBean.getProcessCpuLoad()
  *
+ * @modules jdk.management
  * @run main GetSystemCpuLoad
  */
 
--- a/test/com/sun/management/OperatingSystemMXBean/GetTotalPhysicalMemorySize.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/OperatingSystemMXBean/GetTotalPhysicalMemorySize.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -26,6 +26,7 @@
  * @bug     4858522
  * @summary Basic unit test of OperatingSystemMXBean.getTotalPhysicalMemorySize()
  * @author  Steve Bohne
+ * @modules jdk.management
  */
 
 /*
--- a/test/com/sun/management/OperatingSystemMXBean/MemoryStatusOverflow.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/OperatingSystemMXBean/MemoryStatusOverflow.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -29,6 +29,7 @@
  *      the GlobalMemoryStatus function can return incorrect information,
  *      reporting a value of -1 to indicate an overflow.
  *
+ * @modules jdk.management
  * @run main MemoryStatusOverflow
  */
 
--- a/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.java	Thu May 07 09:11:49 2015 +0200
@@ -27,6 +27,7 @@
  * @summary Basic unit test of OperatingSystemMXBean.getTotalSwapSpaceSize()
  *
  * @library /lib/testlibrary
+ * @modules jdk.management
  * @build TestTotalSwap jdk.testlibrary.*
  * @run main TestTotalSwap
  *
--- a/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 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     6173675
  * @summary Basic test of ThreadMXBean.getThreadAllocatedBytes
  * @author  Paul Hohensee
+ * @modules jdk.management
  */
 
 import java.lang.management.*;
--- a/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 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     6173675
  * @summary Basic test of ThreadMXBean.getThreadAllocatedBytes(long[])
  * @author  Paul Hohensee
+ * @modules jdk.management
  */
 
 import java.lang.management.*;
--- a/test/com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 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
@@ -28,6 +28,7 @@
  *          getThreadUserTime(long[]).
  * @author  Paul Hohensee
  * @key randomness
+ * @modules jdk.management
  */
 
 import java.lang.management.*;
--- a/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
 # @summary 
 # @author  Steve Bohne
 #
+# @modules jdk.management
 # @run shell GetMaxFileDescriptorCount.sh
 #
 
--- a/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
 # @summary 
 # @author  Steve Bohne
 #
+# @modules jdk.management
 # @run shell GetOpenFileDescriptorCount.sh
 #
 
--- a/test/com/sun/tools/attach/BasicTests.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/tools/attach/BasicTests.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2011, 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
@@ -38,6 +38,9 @@
  * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757
  * @summary Basic unit tests for the VM attach mechanism.
  * @library /lib/testlibrary
+ * @modules java.instrument
+ *          java.management
+ *          jdk.jartool/sun.tools.jar
  * @run build jdk.testlibrary.* Agent BadAgent RedefineAgent Application RedefineDummy RunnerUtil
  * @run main BasicTests
  *
--- a/test/com/sun/tools/attach/PermissionTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/tools/attach/PermissionTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -33,6 +33,9 @@
  * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757
  * @summary Basic unit tests for the VM attach mechanism.
  * @library /lib/testlibrary
+ * @modules java.management
+ *          jdk.attach
+ *          jdk.jartool/sun.tools.jar
  * @run build jdk.testlibrary.* Application
  * @run main PermissionTest
  *
--- a/test/com/sun/tools/attach/ProviderTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/tools/attach/ProviderTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -33,6 +33,9 @@
  * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757
  * @summary Basic unit tests for the VM attach mechanism.
  * @library /lib/testlibrary
+ * @modules java.management
+ *          jdk.attach
+ *          jdk.jartool/sun.tools.jar
  * @run build jdk.testlibrary.* SimpleProvider
  * @run main ProviderTest
  *
--- a/test/com/sun/tools/attach/StartManagementAgent.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/tools/attach/StartManagementAgent.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -40,6 +40,9 @@
  * @test
  * @summary Test for VirtualMachine.startManagementAgent and VirtualMachine.startLocalManagementAgent
  * @library /lib/testlibrary
+ * @modules java.management
+ *          jdk.attach
+ *          jdk.jartool/sun.tools.jar
  * @run build Application SimpleProvider jdk.testlibrary.*
  * @run main/timeout=300 StartManagementAgent
  */
--- a/test/com/sun/tools/attach/TempDirTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/com/sun/tools/attach/TempDirTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,8 @@
  * @bug 8033104
  * @summary Test to make sure attach and jvmstat works correctly when java.io.tmpdir is set
  * @library /lib/testlibrary
+ * @modules java.management
+ *          jdk.jartool/sun.tools.jar
  * @run build jdk.testlibrary.* Application RunnerUtil
  * @run main/timeout=200 TempDirTest
  */
--- a/test/demo/jvmti/minst/MinstTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/demo/jvmti/minst/MinstTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, 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
@@ -38,7 +38,7 @@
         DemoRun demo;
 
         /* Run demo that uses JVMTI minst agent (no options) */
-        demo = new DemoRun("minst", "exclude=java/*,exclude=javax/*,exclude=com/*,exclude=sun/*" /* options to minst */ );
+        demo = new DemoRun("minst", "exclude=java/*,exclude=javax/*,exclude=com/*,exclude=jdk/*,exclude=sun/*" /* options to minst */ );
         demo.runit(args[0]);
 
         /* Make sure patterns in output look ok */
--- a/test/java/lang/instrument/AddTransformerTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/AddTransformerTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -27,6 +27,7 @@
  * @summary confirms that added transformers all really run
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build AddTransformerTest ATransformerManagementTestCase
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar AddTransformerTest AddTransformerTest
--- a/test/java/lang/instrument/AppendToBootstrapClassPathTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/AppendToBootstrapClassPathTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -27,6 +27,7 @@
  * @summary simple test for the Boot-Class-Path manifest attribute
  * @author Gabriel Adauto, Wily Technology, Robert Field, Sun Microsystems
  *
+ * @modules java.instrument
  * @run build AppendToBootstrapClassPathTest ExampleForBootClassPath
  * @run shell AppendToBootstrapClassPathSetUp.sh
  * @run shell MakeJAR.sh bootclasspathAgent
--- a/test/java/lang/instrument/AppendToClassPathTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/AppendToClassPathTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -27,6 +27,7 @@
  * @summary simple test for the Class-Path manifest attribute
  * @author Gabriel Adauto, Wily Technology; Robert Field, Sun Microsystems
  *
+ * @modules java.instrument
  * @run build AppendToClassPathTest
  * @run shell AppendToClassPathSetUp.sh
  * @run shell MakeJAR.sh classpathAgent
--- a/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2013, 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 @@
 # @summary Test non US-ASCII characters in the value of the Boot-Class-Path
 #          attribute.
 #
+# @modules java.instrument
 # @run shell/timeout=240 BootClassPathTest.sh
 
 if [ "${TESTJAVA}" = "" ]
--- a/test/java/lang/instrument/DaemonThread/TestDaemonThread.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/DaemonThread/TestDaemonThread.java	Thu May 07 09:11:49 2015 +0200
@@ -1,6 +1,6 @@
 /*
  * Copyright 2014 Goldman Sachs.
- * 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,8 @@
  * @summary Assert in java.lang.instrument agents during shutdown when classloading occurs after shutdown
  * @library /lib/testlibrary
  *
+ * @modules java.instrument
+ *          java.management
  * @build jdk.testlibrary.* DummyAgent DummyClass TestDaemonThreadLauncher TestDaemonThread
  * @run shell ../MakeJAR3.sh DummyAgent
  * @run main/timeout=240 TestDaemonThreadLauncher
--- a/test/java/lang/instrument/FromShutdownHook.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/FromShutdownHook.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 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 5050487
  * @summary Check that Instrumentation methods can execute from a runtime
  *          shutdown hook
+ * @modules java.instrument
  * @run build FromShutdownHook
  * @run shell MakeJAR.sh basicAgent
  * @run main/othervm -javaagent:basicAgent.jar FromShutdownHook FromShutdownHook
--- a/test/java/lang/instrument/GetAllLoadedClassesTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/GetAllLoadedClassesTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -27,6 +27,7 @@
  * @summary simple tests for getAllLoadedClasses (is Object there? does a newly loaded class show up?)
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build GetAllLoadedClassesTest DummyClass
  * @run shell MakeJAR.sh basicAgent
  * @run main/othervm -javaagent:basicAgent.jar GetAllLoadedClassesTest GetAllLoadedClassesTest
--- a/test/java/lang/instrument/GetInitiatedClassesTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/GetInitiatedClassesTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2006, 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
@@ -27,6 +27,7 @@
  * @summary simple tests for getInitiatedClasses (does a newly loaded class show up?)
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build GetInitiatedClassesTest DummyClass
  * @run shell MakeJAR.sh basicAgent
  * @run main/othervm -javaagent:basicAgent.jar GetInitiatedClassesTest GetInitiatedClassesTest
--- a/test/java/lang/instrument/GetObjectSizeTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/GetObjectSizeTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -27,6 +27,7 @@
  * @summary round-trip test for getObjectSize (does it return, and is the result non-zero?)
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build GetObjectSizeTest
  * @run shell MakeJAR.sh basicAgent
  * @run main/othervm -javaagent:basicAgent.jar GetObjectSizeTest GetObjectSizeTest
--- a/test/java/lang/instrument/IsModifiableClassAgent.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/IsModifiableClassAgent.java	Thu May 07 09:11:49 2015 +0200
@@ -27,6 +27,7 @@
  * @summary test isModifiableClass
  * @author Robert Field, Sun Microsystems
  *
+ * @modules java.instrument
  * @run build IsModifiableClassApp IsModifiableClassAgent
  * @run shell MakeJAR3.sh IsModifiableClassAgent 'Can-Retransform-Classes: true'
  * @run main/othervm -javaagent:IsModifiableClassAgent.jar IsModifiableClassApp
--- a/test/java/lang/instrument/ManifestTest.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/ManifestTest.sh	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -26,6 +26,7 @@
 # @summary JLI JAR manifest processing should ignore leading and trailing white space.
 # @author Daniel D. Daugherty
 #
+# @modules java.instrument
 # @run build ManifestTestApp ExampleForBootClassPath
 # @run shell/timeout=900 ManifestTest.sh
 #
--- a/test/java/lang/instrument/ManyMethodsBenchmarkAgent.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/ManyMethodsBenchmarkAgent.java	Thu May 07 09:11:49 2015 +0200
@@ -27,6 +27,9 @@
  * @summary Tests and benchmarks the JVMTI RedefineClasses when a
  *          single class (and its parent) contains many methods.
  *
+ * @modules java.compiler
+ *          java.instrument
+ *          jdk.compiler
  * @run build ManyMethodsBenchmarkApp ManyMethodsBenchmarkAgent
  * @run shell MakeJAR3.sh ManyMethodsBenchmarkAgent 'Can-Retransform-Classes: true'
  * @run main/othervm -javaagent:ManyMethodsBenchmarkAgent.jar ManyMethodsBenchmarkApp
--- a/test/java/lang/instrument/NativeMethodPrefixAgent.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/NativeMethodPrefixAgent.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, 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
@@ -27,6 +27,7 @@
  * @summary test setNativeMethodPrefix
  * @author Robert Field, Sun Microsystems
  *
+ * @modules java.base/jdk.internal.org.objectweb.asm
  * @run shell/timeout=240 MakeJAR2.sh NativeMethodPrefixAgent NativeMethodPrefixApp 'Can-Retransform-Classes: true' 'Can-Set-Native-Method-Prefix: true'
  * @run main/othervm -javaagent:NativeMethodPrefixAgent.jar NativeMethodPrefixApp
  */
--- a/test/java/lang/instrument/NoTransformerAddedTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/NoTransformerAddedTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -27,6 +27,7 @@
  * @summary make sure no transformers run when none are registered
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build NoTransformerAddedTest
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar NoTransformerAddedTest NoTransformerAddedTest
--- a/test/java/lang/instrument/NullGetObjectSizeTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/NullGetObjectSizeTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -27,6 +27,7 @@
  * @summary make sure getObjectSize(null) throws NullPointerException.
  * @author Robert Field as modified from the code of Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build NullGetObjectSizeTest
  * @run shell MakeJAR.sh basicAgent
  * @run main/othervm -javaagent:basicAgent.jar NullGetObjectSizeTest NullGetObjectSizeTest
--- a/test/java/lang/instrument/NullRedefineClassesTests.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/NullRedefineClassesTests.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -27,6 +27,7 @@
  * @summary make sure redefineClasses throws NullPointerException in the right places.
  * @author Robert Field as modified from the code of Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build NullRedefineClassesTests
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar NullRedefineClassesTests NullRedefineClassesTests
--- a/test/java/lang/instrument/NullTransformerAddTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/NullTransformerAddTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -27,6 +27,7 @@
  * @summary make sure addTransformer(null) throws what it should
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build NullTransformerAddTest
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar NullTransformerAddTest NullTransformerAddTest
--- a/test/java/lang/instrument/NullTransformerRemoveTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/NullTransformerRemoveTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -27,6 +27,7 @@
  * @summary make sure removeTransformer(null) throws NullPointerException
  * @author Robert Field as modified from the code of Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build NullTransformerRemoveTest
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar NullTransformerRemoveTest NullTransformerRemoveTest
--- a/test/java/lang/instrument/ParallelTransformerLoader.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/ParallelTransformerLoader.sh	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -26,6 +26,7 @@
 # @summary Test parallel class loading by parallel transformers.
 # @author Daniel D. Daugherty as modified from the code of Daryl Puryear @ Wily
 #
+# @modules java.instrument
 # @run shell MakeJAR3.sh ParallelTransformerLoaderAgent
 # @run build ParallelTransformerLoaderApp
 # @run shell/timeout=240 ParallelTransformerLoader.sh
--- a/test/java/lang/instrument/PremainClass/InheritAgent0010.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/PremainClass/InheritAgent0010.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary test config (0,0,1,0): declared 2-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
+ * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent0010
  * @run main/othervm -javaagent:InheritAgent0010.jar DummyMain
  */
--- a/test/java/lang/instrument/PremainClass/InheritAgent0011.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/PremainClass/InheritAgent0011.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary test config (0,0,1,1): declared 2-arg and declared 1-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
+ * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent0011
  * @run main/othervm -javaagent:InheritAgent0011.jar DummyMain
  */
--- a/test/java/lang/instrument/PremainClass/InheritAgent0110.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/PremainClass/InheritAgent0110.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary test config (0,1,1,0): inherited 1-arg and declared 2-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
+ * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent0110
  * @run main/othervm -javaagent:InheritAgent0110.jar DummyMain
  */
--- a/test/java/lang/instrument/PremainClass/InheritAgent0111.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/PremainClass/InheritAgent0111.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary test config (0,1,1,1): inherited 1-arg, declared 2-arg and declared 1-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
+ * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent0111
  * @run main/othervm -javaagent:InheritAgent0111.jar DummyMain
  */
--- a/test/java/lang/instrument/PremainClass/InheritAgent1000.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/PremainClass/InheritAgent1000.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary test config (1,0,0,0): inherited 2-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
+ * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent1000
  * @run main/othervm -javaagent:InheritAgent1000.jar DummyMain
  */
--- a/test/java/lang/instrument/PremainClass/InheritAgent1001.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/PremainClass/InheritAgent1001.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary test config (1,0,0,1): inherited 2-arg, and declared 1-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
+ * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent1001
  * @run main/othervm -javaagent:InheritAgent1001.jar DummyMain
  */
--- a/test/java/lang/instrument/PremainClass/InheritAgent1010.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/PremainClass/InheritAgent1010.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary test config (1,0,1,0): inherited 2-arg, and declared 2-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
+ * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent1010
  * @run main/othervm -javaagent:InheritAgent1010.jar DummyMain
  */
--- a/test/java/lang/instrument/PremainClass/InheritAgent1011.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/PremainClass/InheritAgent1011.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary test config (1,0,1,1): inherited 2-arg, declared 2-arg and declared 1-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
+ * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent1011
  * @run main/othervm -javaagent:InheritAgent1011.jar DummyMain
  */
--- a/test/java/lang/instrument/PremainClass/InheritAgent1100.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/PremainClass/InheritAgent1100.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary test config (1,1,0,0): inherited 2-arg and inherited 1-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
+ * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent1100
  * @run main/othervm -javaagent:InheritAgent1100.jar DummyMain
  */
--- a/test/java/lang/instrument/PremainClass/InheritAgent1101.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/PremainClass/InheritAgent1101.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary test config (1,1,0,1): inherited 2-arg, inherited 1-arg, and declared 1-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
+ * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent1101
  * @run main/othervm -javaagent:InheritAgent1101.jar DummyMain
  */
--- a/test/java/lang/instrument/PremainClass/InheritAgent1110.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/PremainClass/InheritAgent1110.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary test config (1,1,1,0): inherited 2-arg, inherited 1-arg, and declared 2-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
+ * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent1110
  * @run main/othervm -javaagent:InheritAgent1110.jar DummyMain
  */
--- a/test/java/lang/instrument/PremainClass/InheritAgent1111.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/PremainClass/InheritAgent1111.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary test config (1,1,1,1): inherited 2-arg, inherited 1-arg, declared 2-arg and declared 1-arg in agent class
  * @author Daniel D. Daugherty, Sun Microsystems
  *
+ * @modules java.instrument
  * @run shell ../MakeJAR3.sh InheritAgent1111
  * @run main/othervm -javaagent:InheritAgent1111.jar DummyMain
  */
--- a/test/java/lang/instrument/PremainClass/NoPremainAgentTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/PremainClass/NoPremainAgentTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, 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
@@ -30,6 +30,7 @@
  * @bug 6289149
  * @summary test when the agent's class is missing the premain() function.
  * @library /lib/testlibrary
+ * @modules java.management
  * @run build jdk.testlibrary.* DummyMain
  * @run shell ../MakeJAR3.sh NoPremainAgent
  * @run main NoPremainAgentTest
--- a/test/java/lang/instrument/PremainClass/PremainClassTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/PremainClass/PremainClassTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, 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
@@ -30,6 +30,7 @@
  * @bug 5055293
  * @summary Test non ascii characters in the Premain-Class attribute.
  * @library /lib/testlibrary
+ * @modules java.management
  * @run build jdk.testlibrary.* DummyMain
  * @run main PremainClassTest
  */
--- a/test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, 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
@@ -30,6 +30,7 @@
  * @bug 6289149
  * @summary test when the agent's class has a zero arg premain() function.
  * @library /lib/testlibrary
+ * @modules java.management
  * @run build jdk.testlibrary.* DummyMain
  * @run shell ../MakeJAR3.sh ZeroArgPremainAgent
  * @run main ZeroArgPremainAgentTest
--- a/test/java/lang/instrument/RedefineBigClass.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/RedefineBigClass.sh	Thu May 07 09:11:49 2015 +0200
@@ -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 @@
 # @summary Redefine a big class.
 # @author Daniel D. Daugherty
 #
+# @modules java.instrument
 # @run shell MakeJAR3.sh RedefineBigClassAgent 'Can-Redefine-Classes: true'
 # @run build BigClass RedefineBigClassApp NMTHelper
 # @run shell/timeout=600 RedefineBigClass.sh
--- a/test/java/lang/instrument/RedefineClassWithNativeMethod.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/RedefineClassWithNativeMethod.sh	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -26,6 +26,7 @@
 # @summary Redefine a class with a native method.
 # @author Daniel D. Daugherty as modified from the test submitted by clovis@par.univie.ac.at
 #
+# @modules java.instrument
 # @run shell MakeJAR3.sh RedefineClassWithNativeMethodAgent 'Can-Redefine-Classes: true'
 # @run build RedefineClassWithNativeMethodApp
 # @run shell RedefineClassWithNativeMethod.sh
--- a/test/java/lang/instrument/RedefineClassesDisabledTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/RedefineClassesDisabledTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 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
@@ -27,6 +27,7 @@
  * @summary test that redefineClasses and isRedefineClassesSupported behave correctly when redefine is not enabled
  * @author Robert Field, Sun Microsystems -- as modified from the work of Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build RedefineClassesDisabledTest
  * @run shell RedefineSetUp.sh
  * @run shell MakeJAR.sh basicAgent
--- a/test/java/lang/instrument/RedefineClassesTests.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/RedefineClassesTests.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, 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
@@ -27,6 +27,7 @@
  * @summary insure redefine is supported. exercise a class, then redefine it and do it again
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build RedefineClassesTests
  * @run shell RedefineSetUp.sh
  * @run shell MakeJAR.sh redefineAgent
--- a/test/java/lang/instrument/RedefineMethodAddInvoke.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/RedefineMethodAddInvoke.sh	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -26,6 +26,7 @@
 # @summary Reflexive invocation of newly added methods broken.
 # @author Daniel D. Daugherty
 #
+# @modules java.instrument
 # @run shell MakeJAR3.sh RedefineMethodAddInvokeAgent 'Can-Redefine-Classes: true'
 # @run build RedefineMethodAddInvokeApp
 # @run shell RedefineMethodAddInvoke.sh
--- a/test/java/lang/instrument/RedefineMethodDelInvoke.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/RedefineMethodDelInvoke.sh	Thu May 07 09:11:49 2015 +0200
@@ -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 @@
 # @author Daniel D. Daugherty
 # @author Serguei Spitsyn
 #
+# @modules java.instrument
 # @run shell MakeJAR3.sh RedefineMethodDelInvokeAgent 'Can-Redefine-Classes: true'
 # @run build RedefineMethodDelInvokeApp
 # @run shell RedefineMethodDelInvoke.sh
--- a/test/java/lang/instrument/RedefineMethodInBacktrace.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/RedefineMethodInBacktrace.sh	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 # @summary Redefine a class with a method stored in a backtrace.
 # @author Stefan Karlsson
 #
+# @modules java.instrument
 # @run shell MakeJAR3.sh RedefineMethodInBacktraceAgent 'Can-Redefine-Classes: true'
 # @run build RedefineMethodInBacktraceTarget RedefineMethodInBacktraceApp
 # @run shell RedefineMethodInBacktrace.sh
--- a/test/java/lang/instrument/RedefineMethodWithAnnotations.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/RedefineMethodWithAnnotations.sh	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 # @summary Method annotations are incorrectly set when redefining classes.
 # @author Stefan Karlsson
 #
+# @modules java.instrument
 # @run shell MakeJAR3.sh RedefineMethodWithAnnotationsAgent 'Can-Redefine-Classes: true'
 # @run build RedefineMethodWithAnnotationsTarget RedefineMethodWithAnnotationsApp RedefineMethodWithAnnotationsAnnotations
 # @run shell RedefineMethodWithAnnotations.sh
--- a/test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
 #   verify that the right methods are called.
 # @author Daniel D. Daugherty
 #
+# @modules java.instrument
 # @run shell MakeJAR3.sh RedefineSubclassWithTwoInterfacesAgent 'Can-Redefine-Classes: true'
 # @run build RedefineSubclassWithTwoInterfacesApp
 # @run shell RedefineSubclassWithTwoInterfaces.sh
--- a/test/java/lang/instrument/RemoveAbsentTransformerTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/RemoveAbsentTransformerTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -27,6 +27,7 @@
  * @summary remove an transformer that was never added
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build RemoveAbsentTransformerTest
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar RemoveAbsentTransformerTest RemoveAbsentTransformerTest
--- a/test/java/lang/instrument/RemoveTransformerTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/RemoveTransformerTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -27,6 +27,7 @@
  * @summary simple remove of a transformer that was added
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build RemoveTransformerTest
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar RemoveTransformerTest RemoveTransformerTest
--- a/test/java/lang/instrument/RetransformAgent.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/RetransformAgent.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, 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
@@ -27,6 +27,7 @@
  * @summary test retransformClasses
  * @author Robert Field, Sun Microsystems
  *
+ * @modules java.base/jdk.internal.org.objectweb.asm
  * @run shell/timeout=240 MakeJAR2.sh RetransformAgent RetransformApp 'Can-Retransform-Classes: true'
  * @run main/othervm -javaagent:RetransformAgent.jar RetransformApp
  */
--- a/test/java/lang/instrument/RetransformBigClass.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/RetransformBigClass.sh	Thu May 07 09:11:49 2015 +0200
@@ -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 @@
 # @summary Retransform a big class.
 # @author Daniel D. Daugherty
 #
+# @modules java.instrument
 # @run shell MakeJAR4.sh RetransformBigClassAgent SimpleIdentityTransformer 'Can-Retransform-Classes: true'
 # @run build BigClass RetransformBigClassApp NMTHelper
 # @run shell/timeout=600 RetransformBigClass.sh
--- a/test/java/lang/instrument/SingleTransformerTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/SingleTransformerTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, 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
@@ -27,6 +27,7 @@
  * @summary simple test with one transformer (makes sure it gets called)
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build SingleTransformerTest
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar SingleTransformerTest SingleTransformerTest
--- a/test/java/lang/instrument/StressGetObjectSizeTest.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/StressGetObjectSizeTest.sh	Thu May 07 09:11:49 2015 +0200
@@ -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,7 @@
 # @summary stress getObjectSize() API
 # @author Daniel D. Daugherty as modified from the code of fischman@google.com
 #
+# @modules java.instrument
 # @run build StressGetObjectSizeApp
 # @run shell MakeJAR.sh basicAgent
 # @run shell StressGetObjectSizeTest.sh
--- a/test/java/lang/instrument/TransformMethodTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/TransformMethodTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -27,6 +27,7 @@
  * @summary test transformer add/remove pairs in sequence
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build TransformMethodTest
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar TransformMethodTest TransformMethodTest
--- a/test/java/lang/instrument/TransformerManagementThreadAddTests.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/TransformerManagementThreadAddTests.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, 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
@@ -27,6 +27,7 @@
  * @summary multi-thread test to exercise sync and contention for adds to transformer registry
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build TransformerManagementThreadAddTests
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar TransformerManagementThreadAddTests TransformerManagementThreadAddTests
--- a/test/java/lang/instrument/TransformerManagementThreadRemoveTests.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/TransformerManagementThreadRemoveTests.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, 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
@@ -27,6 +27,7 @@
  * @summary multi-thread test to exercise sync and contention for removes to transformer registry
  * @author Gabriel Adauto, Wily Technology
  *
+ * @modules java.instrument
  * @run build TransformerManagementThreadRemoveTests
  * @run shell MakeJAR.sh redefineAgent
  * @run main/othervm -javaagent:redefineAgent.jar TransformerManagementThreadRemoveTests TransformerManagementThreadRemoveTests
--- a/test/java/lang/instrument/VerifyLocalVariableTableOnRetransformTest.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/VerifyLocalVariableTableOnRetransformTest.sh	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -29,6 +29,7 @@
 # transform() on a retransform operation.
 # @author Daniel D. Daugherty
 #
+# @modules java.instrument
 # @run build VerifyLocalVariableTableOnRetransformTest
 # @run compile -g DummyClassWithLVT.java
 # @run shell MakeJAR.sh retransformAgent
--- a/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.sh	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -26,6 +26,7 @@
 # @summary Unit tests for appendToBootstrapClassLoaderSearch and
 #   appendToSystemClasLoaderSearch methods.
 #
+# @modules java.instrument
 # @run shell/timeout=240 CircularityErrorTest.sh
 
 if [ "${TESTSRC}" = "" ]
--- a/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -26,6 +26,7 @@
 # @summary Unit tests for appendToBootstrapClassLoaderSearch and
 #   appendToSystemClasLoaderSearch methods.
 #
+# @modules java.instrument
 # @build ClassUnloadTest
 # @run shell ClassUnloadTest.sh
 
--- a/test/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh	Thu May 07 09:11:49 2015 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2005, 2008, 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
@@ -29,6 +29,7 @@
 # @summary Unit tests for appendToBootstrapClassLoaderSearch and
 #   appendToSystemClasLoaderSearch methods.
 #
+# @modules java.instrument
 # @build Agent AgentSupport BootSupport BasicTest PrematureLoadTest DynamicTest
 # @run shell/timeout=240 run_tests.sh
 
--- a/test/java/lang/management/BufferPoolMXBean/Basic.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/BufferPoolMXBean/Basic.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /* @test
  * @bug 6606598 7024172
  * @summary Unit test for java.lang.management.BufferPoolMXBean
+ * @modules java.management
  * @run main/othervm Basic
  * @key randomness
  */
--- a/test/java/lang/management/ClassLoadingMXBean/LoadCounts.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ClassLoadingMXBean/LoadCounts.java	Thu May 07 09:11:49 2015 +0200
@@ -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 @@
  *                             ClassLoadingMXBean.getTotalLoadedClassCount()
  *                             ClassLoadingMXBean.getUnloadedClassCount()
  * @author  Alexei Guibadoulline
+ * @modules java.management
  * @run main/othervm LoadCounts
  */
 
--- a/test/java/lang/management/CompilationMXBean/Basic.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/CompilationMXBean/Basic.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2012, 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 5011189 8004928
  * @summary Unit test for java.lang.management.CompilationMXBean
  *
+ * @modules java.management
  * @run main/othervm -Xcomp -Xbatch Basic
  */
 import java.lang.management.*;
--- a/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 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
@@ -29,6 +29,7 @@
  *          the input CompositeData is invalid.
  * @author  Mandy Chung
  *
+ * @modules java.management/sun.management
  * @compile OpenTypeConverter.java
  * @build MemoryNotifInfoCompositeData
  * @run main MemoryNotifInfoCompositeData
--- a/test/java/lang/management/CompositeData/MemoryUsageCompositeData.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/CompositeData/MemoryUsageCompositeData.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 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
@@ -28,6 +28,7 @@
  *          or throw exception if the input CompositeData is invalid.
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @build MemoryUsageCompositeData
  * @run main MemoryUsageCompositeData
  */
--- a/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2005, 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
@@ -29,6 +29,7 @@
  *          the input CompositeData is invalid.
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @compile OpenTypeConverter.java
  * @build ThreadInfoCompositeData
  * @run main ThreadInfoCompositeData
--- a/test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2013 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     6396794
  * @summary Check that LastGcInfo contents are reasonable
  * @author  Eamonn McManus
+ * @modules java.management
+ *          jdk.management
  * @run     main/othervm -XX:-ExplicitGCInvokesConcurrent GcInfoCompositeType
  */
 // Passing "-XX:-ExplicitGCInvokesConcurrent" to force System.gc()
--- a/test/java/lang/management/MXBean/MXBeanBehavior.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/MXBean/MXBeanBehavior.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,8 @@
  * @summary Check that java.lang.management MXBeans have the same behavior
  *          as user MXBeans
  * @author  Eamonn McManus
+ * @modules java.management
+ *          jdk.management
  * @run     main/othervm MXBeanBehavior
  */
 
--- a/test/java/lang/management/ManagementFactory/GetObjectName.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ManagementFactory/GetObjectName.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 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 @@
  * @summary Test if getObjectName handles properly when called by
  *          multiple threads simultaneously. Run in othervm mode to
  *          make sure the object name is not initialized to begin with.
+ * @modules java.management
  * @run main/othervm GetObjectName
  */
 
--- a/test/java/lang/management/ManagementFactory/GetPlatformMXBeans.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ManagementFactory/GetPlatformMXBeans.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, 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
@@ -28,6 +28,7 @@
  *          methods and PlatformManagedObject.getObjectName()
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @run main GetPlatformMXBeans
  */
 
--- a/test/java/lang/management/ManagementFactory/GetPlatformManagementInterfaces.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ManagementFactory/GetPlatformManagementInterfaces.java	Thu May 07 09:11:49 2015 +0200
@@ -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 @@
  *          ManagementFactory.getPlatformManagementInterfaces() method
  * @author  Frederic Parain
  *
+ * @modules java.management
  * @run main GetPlatformManagementInterfaces
  */
 
--- a/test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Test that all the platform MXBeans are wrapped in StandardMBean so
  *          an MBeanServer which does not have support for MXBeans can be used.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
+ *          jdk.management
  * @run clean MBeanServerMXBeanUnsupportedTest
  * @run build MBeanServerMXBeanUnsupportedTest
  * @run main/othervm MBeanServerMXBeanUnsupportedTest
--- a/test/java/lang/management/ManagementFactory/MXBeanException.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ManagementFactory/MXBeanException.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2005, 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
@@ -29,6 +29,7 @@
  *
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @build MXBeanException
  * @run main MXBeanException
  */
--- a/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2010, 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
@@ -25,6 +25,7 @@
  * @test
  * @bug     5024531
  * @summary Basic Test for ManagementFactory.newPlatformMXBean().
+ * @modules java.management
  * @run main/othervm MXBeanProxyTest
  * @author  Mandy Chung
  */
--- a/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -26,6 +26,7 @@
  * @bug     4947536
  * @summary Basic unit test of ManagementFactory.getPlatformMBeanServer()
  * @author  Mandy Chung
+ * @modules java.management
  */
 
 import java.lang.management.*;
--- a/test/java/lang/management/ManagementFactory/ProxyExceptions.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ManagementFactory/ProxyExceptions.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 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
@@ -27,6 +27,8 @@
  * @summary Test type mapping of the platform MXBean proxy
  *          returned from Management.newPlatformMXBeanProxy().
  * @author  Mandy Chung
+ * @modules java.management
+ *          jdk.management
  */
 import java.lang.management.*;
 import javax.management.*;
--- a/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, 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
@@ -28,6 +28,8 @@
  *          returned from Management.newPlatformMXBeanProxy().
  * @author  Mandy Chung
  *
+ * @modules java.management
+ *          jdk.management
  * @compile ProxyTypeMapping.java
  * @run main/othervm -verbose:gc ProxyTypeMapping
  */
--- a/test/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, 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
@@ -29,6 +29,7 @@
  *
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @run main ThreadMXBeanProxy
  */
 
--- a/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, 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
@@ -28,6 +28,8 @@
  *          MBeanServer.
  * @author  Mandy Chung
  *
+ * @modules java.management
+ *          jdk.management
  * @compile ValidateOpenTypes.java
  * @run main/othervm -verbose:gc ValidateOpenTypes
  */
--- a/test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, 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
@@ -31,6 +31,7 @@
  * @author  Mandy Chung
  *
  * @library /lib/testlibrary/
+ * @modules java.management
  * @build jdk.testlibrary.* CollectionUsageThreshold MemoryUtil RunUtil
  * @requires vm.opt.ExplicitGCInvokesConcurrent == "false" | vm.opt.ExplicitGCInvokesConcurrent == "null"
  * @run main/timeout=300 CollectionUsageThreshold
--- a/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -27,6 +27,7 @@
  * @summary Make sure MemoryMXBean has two notification types.
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @run main GetMBeanInfo
  */
 
--- a/test/java/lang/management/MemoryMXBean/LowMemoryTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/MemoryMXBean/LowMemoryTest.java	Thu May 07 09:11:49 2015 +0200
@@ -31,6 +31,7 @@
  * @author  Mandy Chung
  *
  * @library /lib/testlibrary/
+ * @modules java.management
  * @build jdk.testlibrary.* LowMemoryTest MemoryUtil RunUtil
   * @run main/timeout=600 LowMemoryTest
  * @requires vm.opt.ExplicitGCInvokesConcurrent != "true"
--- a/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2014, 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     4982128
 # @summary Test low memory detection of non-heap memory pool
 # @requires vm.gc=="null"
+# @modules java.management
 # @run build LowMemoryTest2 MemoryUtil
 # @run shell/timeout=600 LowMemoryTest2.sh
 #
--- a/test/java/lang/management/MemoryMXBean/MemoryManagement.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/MemoryMXBean/MemoryManagement.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, 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
@@ -30,6 +30,7 @@
  *
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @build MemoryManagement MemoryUtil
  * @run main/othervm/timeout=600 -Xmn8m -XX:+IgnoreUnrecognizedVMOptions -XX:G1HeapRegionSize=1 -XX:-UseLargePages MemoryManagement
  */
--- a/test/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2014, 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
@@ -27,6 +27,7 @@
 # @summary Run MemoryManagement test with concurrent mark sweep GC
 # @author  Mandy Chung
 # @requires vm.gc=="ConcMarkSweep" | vm.gc=="null"
+# @modules java.management
 # @run build MemoryManagement
 # @run shell/timeout=600 MemoryManagementConcMarkSweepGC.sh
 #
--- a/test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2014, 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
@@ -27,6 +27,7 @@
 # @summary Run MemoryManagement test with parallel GC
 # @author  Mandy Chung
 # @requires vm.gc=="Parallel" | vm.gc=="null"
+# @modules java.management
 # @run build MemoryManagement
 # @run shell/timeout=600 MemoryManagementParallelGC.sh
 #
--- a/test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2014, 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
@@ -27,6 +27,7 @@
 # @summary Run MemoryManagement test with serial GC
 # @author  Mandy Chung
 # @requires vm.gc=="Serial" | vm.gc=="null"
+# @modules java.management
 # @run build MemoryManagement
 # @run shell/timeout=600 MemoryManagementSerialGC.sh
 #
--- a/test/java/lang/management/MemoryMXBean/MemoryTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/MemoryMXBean/MemoryTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 @@
  *          MemoryMXBean.getMemoryManager().
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @run main MemoryTest 2
  */
 
--- a/test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2014, 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
@@ -27,6 +27,7 @@
 # @summary 
 # @author  Mandy Chung
 # @requires vm.gc=="Parallel" | vm.gc=="null"
+# @modules java.management
 # @run compile MemoryTest.java
 # @run shell MemoryTestAllGC.sh
 #
--- a/test/java/lang/management/MemoryMXBean/Pending.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/MemoryMXBean/Pending.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, 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
@@ -24,6 +24,8 @@
 /*
  * @test
  * @bug     4530538
+ * @modules java.base/sun.misc
+ *          java.management
  * @summary Basic unit test of
  *          RuntimeMXBean.getObjectPendingFinalizationCount()
  *          1. GC and runFinalization() to get the current pending number
@@ -32,7 +34,6 @@
  *          4. GC and runFinalization() and the finalizable objects should
  *             be garbage collected.
  * @author  Alexei Guibadoulline and Mandy Chung
- *
  */
 
 import java.lang.management.*;
--- a/test/java/lang/management/MemoryMXBean/PendingAllGC.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/MemoryMXBean/PendingAllGC.sh	Thu May 07 09:11:49 2015 +0200
@@ -27,6 +27,7 @@
 # @summary 
 # @author  Mandy Chung
 # @requires vm.gc=="null"
+# @modules java.base/sun.misc
 # @run compile Pending.java
 # @run shell PendingAllGC.sh
 #
--- a/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -33,6 +33,7 @@
  * @author  Mandy Chung
  *
  * @library /lib/testlibrary/
+ * @modules java.management
  * @build jdk.testlibrary.* ResetPeakMemoryUsage MemoryUtil RunUtil
  * @run main ResetPeakMemoryUsage
  */
--- a/test/java/lang/management/MemoryPoolMXBean/ThresholdTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/MemoryPoolMXBean/ThresholdTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
  *          MemoryPoolMXBean.isCollectionThresholdExceeded().
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @run main/othervm ThresholdTest
  */
 
--- a/test/java/lang/management/OperatingSystemMXBean/PlatformMXBeanTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/OperatingSystemMXBean/PlatformMXBeanTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -28,6 +28,8 @@
  *          ManagementFactory.getPlatformMXBeans()
  * @author  Mandy Chung
  *
+ * @modules java.management
+ *          jdk.management
  * @run main PlatformMXBeanTest
  */
 
--- a/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2012, 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
@@ -27,6 +27,7 @@
 # @author   Mandy Chung
 # @bug      6336608 6367473 6511738
 #
+# @modules java.management
 # @run build GetSystemLoadAverage
 # @run shell/timeout=300 TestSystemLoadAvg.sh
 #
--- a/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,8 @@
  * @summary Test if proxy for PlatformLoggingMXBean is equivalent
  *          to proxy for LoggingMXBean
  *
+ * @modules java.management
+ *          jdk.management
  * @build LoggingMXBeanTest
  * @run main LoggingMXBeanTest
  */
--- a/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, 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
@@ -29,6 +29,8 @@
  *          This test performs similar testing as
  *          java/util/logging/LoggingMXBeanTest.
  *
+ * @modules java.management
+ *          jdk.management
  * @build PlatformLoggingMXBeanTest
  * @run main PlatformLoggingMXBeanTest
  */
--- a/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 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     4990512
  * @summary Basic Test for RuntimeMXBean.getSystemProperties().
  * @author  Mandy Chung
+ * @modules java.management
  */
 
 import java.lang.management.ManagementFactory;
--- a/test/java/lang/management/RuntimeMXBean/PropertiesTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/RuntimeMXBean/PropertiesTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -28,6 +28,7 @@
  *          properties contain another list of properties as the defaults.
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @run build PropertiesTest
  * @run main  PropertiesTest
  */
--- a/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2003, 2014, 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
@@ -26,6 +26,7 @@
 # @bug     4530538
 # @summary 
 # @author  Mandy Chung
+# @modules java.management
 # @run compile InputArgument.java
 # @run shell TestInputArgument.sh
 #
--- a/test/java/lang/management/RuntimeMXBean/UpTime.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/RuntimeMXBean/UpTime.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -26,6 +26,7 @@
  * @bug     4530538
  * @summary Basic unit test of RuntimeMXBean.getUptime()
  * @author  Alexei Guibadoulline
+ * @modules java.management
  */
 
 import java.lang.management.*;
--- a/test/java/lang/management/ThreadMXBean/AllThreadIds.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ThreadMXBean/AllThreadIds.java	Thu May 07 09:11:49 2015 +0200
@@ -27,6 +27,7 @@
  * @summary Basic unit test of ThreadMXBean.getAllThreadIds()
  * @author  Alexei Guibadoulline and Mandy Chung
  *
+ * @modules java.management
  * @run main/othervm AllThreadIds
  */
 
--- a/test/java/lang/management/ThreadMXBean/DisableTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ThreadMXBean/DisableTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, 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
@@ -27,6 +27,7 @@
  * @summary The capability is disabled regardless of number of times
  *          it was enabled.
  * @author  Mandy Chung
+ * @modules java.management
  */
 
 import java.lang.management.ThreadMXBean;
--- a/test/java/lang/management/ThreadMXBean/EnableTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ThreadMXBean/EnableTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, 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
@@ -29,6 +29,7 @@
  *          and ThreadMXBean.setThreadCpuTimeEnabled().
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @run main EnableTest
  */
 
--- a/test/java/lang/management/ThreadMXBean/FindDeadlocks.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ThreadMXBean/FindDeadlocks.java	Thu May 07 09:11:49 2015 +0200
@@ -31,6 +31,7 @@
  *          - ThreadMXBean.findMonitorDeadlockedThreads()
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @build MonitorDeadlock
  * @build SynchronizerDeadlock
  * @build ThreadDump
--- a/test/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, 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 @@
  *          - ThreadMXBean.findMonitorDeadlockedThreads()
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @build MonitorDeadlock
  * @build ThreadDump
  * @run main/othervm FindMonitorDeadlock
--- a/test/java/lang/management/ThreadMXBean/InvalidThreadID.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ThreadMXBean/InvalidThreadID.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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 @@
  *          if id <= 0 and returns -1 if the thread doesn't exist.
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @run main InvalidThreadID
  */
 
--- a/test/java/lang/management/ThreadMXBean/LockedMonitors.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ThreadMXBean/LockedMonitors.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -34,6 +34,7 @@
  *
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @build Barrier
  * @build LockingThread
  * @build ThreadDump
--- a/test/java/lang/management/ThreadMXBean/LockedSynchronizers.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ThreadMXBean/LockedSynchronizers.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -30,6 +30,7 @@
  *
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @build Barrier
  * @build SynchronizerLockingThread
  * @build ThreadDump
--- a/test/java/lang/management/ThreadMXBean/Locks.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ThreadMXBean/Locks.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, 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
@@ -30,6 +30,7 @@
  * @author  Jaroslav Bachorik
  *
  * @library /lib/testlibrary
+ * @modules java.management
  * @build jdk.testlibrary.*
  * @run main/othervm Locks
  */
--- a/test/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java	Thu May 07 09:11:49 2015 +0200
@@ -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 @@
  *          and getThreadInfo of customized JSR-166 synchronizers.
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @build Barrier
  * @build ThreadDump
  * @run main/othervm MyOwnSynchronizer
--- a/test/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -29,6 +29,7 @@
  * @author  Mandy Chung
  * @author  Jaroslav Bachorik
  *
+ * @modules java.management
  * @build ResetPeakThreadCount
  * @build ThreadDump
  * @run main/othervm ResetPeakThreadCount
--- a/test/java/lang/management/ThreadMXBean/SharedSynchronizer.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ThreadMXBean/SharedSynchronizer.java	Thu May 07 09:11:49 2015 +0200
@@ -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 @@
  *          in shared mode which has no owner when a thread is parked.
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @run main/othervm SharedSynchronizer
  */
 
--- a/test/java/lang/management/ThreadMXBean/SynchronizationStatistics.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ThreadMXBean/SynchronizationStatistics.java	Thu May 07 09:11:49 2015 +0200
@@ -29,6 +29,7 @@
  * @author  Mandy Chung
  * @author  Jaroslav Bachorik
  *
+ * @modules java.management
  * @run main/othervm SynchronizationStatistics
  */
 
--- a/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary Basic unit test of ThreadInfo.getBlockedCount()
  * @author  Alexei Guibadoulline and Mandy Chung
  * @author  Jaroslav Bachorik
+ * @modules java.management
  * @run main ThreadBlockedCount
  */
 
--- a/test/java/lang/management/ThreadMXBean/ThreadCounts.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ThreadMXBean/ThreadCounts.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -30,6 +30,7 @@
  *                             mbean.getDaemonThreadCount()
  * @author  Alexei Guibadoulline
  *
+ * @modules java.management
  * @run main ThreadCounts
  */
 
--- a/test/java/lang/management/ThreadMXBean/ThreadCpuTime.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ThreadMXBean/ThreadCpuTime.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -27,6 +27,7 @@
  * @summary Basic test of ThreadMXBean.getThreadCpuTime and
  *          getCurrentThreadCpuTime.
  * @author  Mandy Chung
+ * @modules java.management
  */
 
 import java.lang.management.*;
--- a/test/java/lang/management/ThreadMXBean/ThreadDaemonTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ThreadMXBean/ThreadDaemonTest.java	Thu May 07 09:11:49 2015 +0200
@@ -31,6 +31,7 @@
  * @bug     6588467
  * @summary Basic test of ThreadInfo.isDaemon
  * @author  Jeremy Manson
+ * @modules java.management
  */
 public class ThreadDaemonTest {
 
--- a/test/java/lang/management/ThreadMXBean/ThreadInfoArray.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ThreadMXBean/ThreadInfoArray.java	Thu May 07 09:11:49 2015 +0200
@@ -30,6 +30,7 @@
  * @author  Mandy Chung
  * @author  Jaroslav Bachorik
  *
+ * @modules java.management
  * @build ThreadInfoArray
  * @run main ThreadInfoArray
  */
--- a/test/java/lang/management/ThreadMXBean/ThreadLists.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ThreadMXBean/ThreadLists.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 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 5047639
  * @summary Check that the "java-level" APIs provide a consistent view of
  *          the thread list
+ * @modules java.management
  */
 import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadMXBean;
--- a/test/java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java	Thu May 07 09:11:49 2015 +0200
@@ -32,6 +32,7 @@
  *
  * @library ../../Thread
  * @library /lib/testlibrary
+ * @modules java.management
  * @build jdk.testlibrary.*
  * @build ThreadMXBeanStateTest ThreadStateController
  * @run main ThreadMXBeanStateTest
--- a/test/java/lang/management/ThreadMXBean/ThreadStackTrace.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ThreadMXBean/ThreadStackTrace.java	Thu May 07 09:11:49 2015 +0200
@@ -28,6 +28,7 @@
  *          ThreadInfo.getThreadState()
  * @author  Mandy Chung
  *
+ * @modules java.management
  * @run build Utils
  * @run main ThreadStackTrace
  */
--- a/test/java/lang/management/ThreadMXBean/ThreadUserTime.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/java/lang/management/ThreadMXBean/ThreadUserTime.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 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
@@ -27,6 +27,7 @@
  * @summary Basic test of ThreadMXBean.getThreadUserTime and
  *          getCurrentThreadUserTime.
  * @author  Mandy Chung
+ * @modules java.management
  */
 
 import java.lang.management.*;
--- a/test/javax/management/ImplementationVersion/ImplVersionTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/ImplementationVersion/ImplVersionTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2006, 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
@@ -29,6 +29,7 @@
  * is run with a security manager and the test codebase has the java permission
  * to read the "java.runtime.version" system property.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean ImplVersionTest ImplVersionCommand
  * @run build ImplVersionTest ImplVersionCommand ImplVersionReader
  * @run main ImplVersionTest
@@ -76,7 +77,6 @@
                 checkVersion = false;
             String command =
                 javaHome + File.separator + "bin" + File.separator + "java " +
-                " -Xbootclasspath/p:" + bootClassPath +
                 " -classpath " + testClasses +
                 " -Djava.security.manager -Djava.security.policy==" + testSrc +
                 File.separator + "policy -Dtest.classes=" + testClasses +
--- a/test/javax/management/Introspector/AnnotationSecurityTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/Introspector/AnnotationSecurityTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Test that having a security manager doesn't trigger a
  *          NotCompliantMBeanException
  * @author Daniel Fuchs, Yves Joan
+ * @modules java.desktop
+ *          java.management
  * @run clean AnnotationSecurityTest Described UnDescribed DescribedMBean
  *            UnDescribedMBean SqeDescriptorKey DescribedMX DescribedMXBean
  * @run build AnnotationSecurityTest Described UnDescribed DescribedMBean
--- a/test/javax/management/Introspector/AnnotationTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/Introspector/AnnotationTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, 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
@@ -27,6 +27,7 @@
  * @summary Test that annotations in Standard MBean interfaces
  * correctly produce Descriptor entries
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean AnnotationTest
  * @run build AnnotationTest
  * @run main AnnotationTest
--- a/test/javax/management/Introspector/ChangingNotifsTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/Introspector/ChangingNotifsTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary Check that Standard MBeans can change their MBeanNotificationInfo[]
  * and MXBeans cannot
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean ChangingNotifsTest
  * @run build ChangingNotifsTest
  * @run main ChangingNotifsTest
--- a/test/javax/management/Introspector/ClassLeakTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/Introspector/ClassLeakTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 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
@@ -26,12 +26,15 @@
  * @bug 4909536
  * @summary Ensure that the Introspector does not retain refs to classes
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean ClassLeakTest
  * @run build ClassLeakTest
  * @run main ClassLeakTest
  */
 
 import java.lang.ref.WeakReference;
+import java.io.File;
+import java.nio.file.Paths;
 import java.net.*;
 import java.util.*;
 
@@ -44,17 +47,16 @@
                            "Standard MBean does not retain a reference to " +
                            "the MBean's class");
 
-        ClassLoader myClassLoader = ClassLeakTest.class.getClassLoader();
-        if (!(myClassLoader instanceof URLClassLoader)) {
-            System.out.println("TEST INVALID: test's class loader is not " +
-                               "a URLClassLoader");
-            System.exit(1);
+
+        String[] cpaths = System.getProperty("test.classes", ".")
+                                .split(File.pathSeparator);
+        URL[] urls = new URL[cpaths.length];
+        for (int i=0; i < cpaths.length; i++) {
+            urls[i] = Paths.get(cpaths[i]).toUri().toURL();
         }
 
-        URLClassLoader myURLClassLoader = (URLClassLoader) myClassLoader;
-        URL[] urls = myURLClassLoader.getURLs();
         PrivateMLet mlet = new PrivateMLet(urls, null, false);
-        Class shadowClass = mlet.loadClass(TestMBean.class.getName());
+        Class<?> shadowClass = mlet.loadClass(TestMBean.class.getName());
         if (shadowClass == TestMBean.class) {
             System.out.println("TEST INVALID: MLet got original " +
                                "TestMBean not shadow");
--- a/test/javax/management/Introspector/DuplicateGetterTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/Introspector/DuplicateGetterTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 Test that an MBean interface can inherit two methods with
  * the same signature from two unrelated parent interfaces
  * @author Eamonn McManus
+ * @modules java.management
  */
 
 import java.util.*;
--- a/test/javax/management/Introspector/FeatureOrderTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/Introspector/FeatureOrderTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test that attributes and operations appear in the same order
  * in MBeanInfo as they did in the Standard MBean or MXBean Interface.
  * @author Eamonn McManus
+ * @modules java.management
  */
 
 /*
--- a/test/javax/management/Introspector/GetMBeanInfoExceptionTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/Introspector/GetMBeanInfoExceptionTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary Test that the exception thrown by DynamicMBean.getMBeanInfo()
  *          keeps the init cause.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean GetMBeanInfoExceptionTest
  * @run build GetMBeanInfoExceptionTest
  * @run main GetMBeanInfoExceptionTest
--- a/test/javax/management/Introspector/IdenticalMBeanInfoTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/Introspector/IdenticalMBeanInfoTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary Check that MBeans with the same class have identical MBeanInfo
  * unless they are NotificationBroadcasters
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean IdenticalMBeanInfoTest
  * @run build IdenticalMBeanInfoTest
  * @run main IdenticalMBeanInfoTest
--- a/test/javax/management/Introspector/ImmutableNotificationInfoTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/Introspector/ImmutableNotificationInfoTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary Check that a StandardMBean has immutableInfo=true if it is
  * a NotificationBroadcasterSupport that doesn't override getNotificationInfo()
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean ImmutableNotificationInfoTest
  * @run build ImmutableNotificationInfoTest
  * @run main ImmutableNotificationInfoTest
--- a/test/javax/management/Introspector/InvokeGettersTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/Introspector/InvokeGettersTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 6317101
  * @summary Test that the jmx.invoke.getters system property works
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean InvokeGettersTest
  * @run build InvokeGettersTest
  * @run main InvokeGettersTest
--- a/test/javax/management/Introspector/IsMethodTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/Introspector/IsMethodTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 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
@@ -26,6 +26,7 @@
  * @bug 4947001 4954369 4954409 4954410
  * @summary Test that "Boolean isX()" and "int isX()" define operations
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean IsMethodTest
  * @run build IsMethodTest
  * @run main IsMethodTest
--- a/test/javax/management/Introspector/NotAnMBeanTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/Introspector/NotAnMBeanTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 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
@@ -26,6 +26,7 @@
  * @bug 4914805
  * @summary Ensure that the right exception is thrown for illegal MBeans
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean NotAnMBeanTest
  * @run build NotAnMBeanTest
  * @run main NotAnMBeanTest
--- a/test/javax/management/Introspector/NotCompliantCauseTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/Introspector/NotCompliantCauseTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test that NotCompliantMBeanException has a cause in case of
  *          type mapping problems.
  * @author Daniel Fuchs, Alexander Shusherov
+ * @modules java.management
  * @run clean NotCompliantCauseTest
  * @run build NotCompliantCauseTest
  * @run main NotCompliantCauseTest
--- a/test/javax/management/Introspector/SetWrongTypeAttributeTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/Introspector/SetWrongTypeAttributeTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary Check that setting the wrong type of an attribute in a Standard
  * MBean or MXBean causes InvalidAttributeValueException
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean SetWrongTypeAttributeTest
  * @run build SetWrongTypeAttributeTest
  * @run main SetWrongTypeAttributeTest
--- a/test/javax/management/Introspector/UnregisterMBeanExceptionTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/Introspector/UnregisterMBeanExceptionTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -28,6 +28,7 @@
  *          the supplied MBean although DynamicMBean.getMBeanInfo() throws
  *          a runtime exception.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean UnregisterMBeanExceptionTest
  * @run build UnregisterMBeanExceptionTest
  * @run main UnregisterMBeanExceptionTest
--- a/test/javax/management/MBeanInfo/EqualExceptionTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/MBeanInfo/EqualExceptionTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 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 5071110
  * @summary Test whether an null descriptor will cause an NullPointerException.
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean EqualExceptionTest
  * @run build EqualExceptionTest
  * @run main EqualExceptionTest
--- a/test/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -36,6 +36,7 @@
  * @bug 8023954
  * @summary Test that MBean*Info.equals do not throw NPE
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean MBeanInfoEqualsNPETest
  * @run build MBeanInfoEqualsNPETest
  * @run main MBeanInfoEqualsNPETest
--- a/test/javax/management/MBeanInfo/MBeanInfoEqualsTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/MBeanInfo/MBeanInfoEqualsTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 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
@@ -26,6 +26,7 @@
  * @bug 4719923
  * @summary Test that MBeanInfo.equals works even for mutable subclasses
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean MBeanInfoEqualsTest
  * @run build MBeanInfoEqualsTest
  * @run main MBeanInfoEqualsTest
--- a/test/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -35,6 +35,7 @@
  * @bug 8023669
  * @summary Test that hashCode()throws NullPointerException
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean MBeanInfoHashCodeNPETest
  * @run build MBeanInfoHashCodeNPETest
  * @run main MBeanInfoHashCodeNPETest
--- a/test/javax/management/MBeanInfo/NotificationInfoTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/MBeanInfo/NotificationInfoTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary Test that JMX classes use fully-qualified class names
  * in MBeanNotificationInfo
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean NotificationInfoTest
  * @run build NotificationInfoTest
  * @run main NotificationInfoTest
--- a/test/javax/management/MBeanInfo/NullInfoArraysTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/MBeanInfo/NullInfoArraysTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 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
@@ -27,6 +27,7 @@
  * @summary Test that an MBeanInfo works even if it is deserialized from
  * an implementation where its array fields can be null.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean NullInfoArraysTest
  * @run build NullInfoArraysTest
  * @run main NullInfoArraysTest
--- a/test/javax/management/MBeanInfo/SerializationTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/MBeanInfo/SerializationTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 6288100
  * @summary Test the new serialization/deserialization methods.
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean SerializationTest
  * @run build SerializationTest
  * @run main SerializationTest
--- a/test/javax/management/MBeanInfo/SerializationTest1.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/MBeanInfo/SerializationTest1.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, 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 6783290
  * @summary Test correct reading of an empty Descriptor.
  * @author Jaroslav Bachorik
+ * @modules java.management
  * @run clean SerializationTest1
  * @run build SerializationTest1
  * @run main SerializationTest1
--- a/test/javax/management/MBeanInfo/TooManyFooTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/MBeanInfo/TooManyFooTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test that a method inherited from two different interfaces
  *          appears only once in MBeanInfo.
  * @author dfuchs
+ * @modules java.management
  * @run clean TooManyFooTest
  * @run build TooManyFooTest
  * @run main TooManyFooTest
--- a/test/javax/management/MBeanServer/AttributeListTypeSafeTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/MBeanServer/AttributeListTypeSafeTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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,7 @@
  * @bug 6336968
  * @summary Test adding non-Attribute values to an AttributeList.
  * @author Eamonn McManus
+ * @modules java.management
  */
 
 import java.util.Collections;
--- a/test/javax/management/MBeanServer/MBeanExceptionTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/MBeanServer/MBeanExceptionTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -28,6 +28,7 @@
  * RuntimeMBeanException and (for Standard MBeans) that checked exceptions
  * are wrapped in MBeanException
  * @author Eamonn McManus
+ * @modules java.management
  * @compile MBeanExceptionTest.java
  * @run main MBeanExceptionTest
  */
--- a/test/javax/management/MBeanServer/MBeanFallbackTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/MBeanServer/MBeanFallbackTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 @@
  *          It needs to be a separate class because the "jdk.jmx.mbeans.allowNonPublic"
  *          system property must be set before c.s.j.m.MBeanAnalyzer has been loaded.
  * @author Jaroslav Bachorik
+ * @modules java.management
  * @run clean MBeanFallbackTest
  * @run build MBeanFallbackTest
  * @run main/othervm -Djdk.jmx.mbeans.allowNonPublic=true MBeanFallbackTest
--- a/test/javax/management/MBeanServer/MBeanServerInvocationHandlerExceptionTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/MBeanServer/MBeanServerInvocationHandlerExceptionTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 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 5092515
  * @summary Test how to unwrap a user specific exception
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean MBeanServerInvocationHandlerExceptionTest
  * @run build MBeanServerInvocationHandlerExceptionTest
  * @run main MBeanServerInvocationHandlerExceptionTest
--- a/test/javax/management/MBeanServer/MBeanServerNotificationTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/MBeanServer/MBeanServerNotificationTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary Checks that MBeanServerNotification.toString contains the
  *          MBean name.
  * @author Daniel Fuchs
+ * @modules java.management/com.sun.jmx.mbeanserver
  * @compile MBeanServerNotificationTest.java
  * @run main MBeanServerNotificationTest
  */
--- a/test/javax/management/MBeanServer/MBeanTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/MBeanServer/MBeanTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -31,6 +31,7 @@
  * @bug 8010285
  * @summary General MBean test.
  * @author Jaroslav Bachorik
+ * @modules java.management
  * @run clean MBeanTest
  * @run build MBeanTest
  * @run main MBeanTest
--- a/test/javax/management/MBeanServer/NewMBeanListenerTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/MBeanServer/NewMBeanListenerTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 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 4757273
  * @summary Test that registered notification is sent early enough
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean NewMBeanListenerTest
  * @run build NewMBeanListenerTest
  * @run main NewMBeanListenerTest
--- a/test/javax/management/MBeanServer/NotifDeadlockTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/MBeanServer/NotifDeadlockTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 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
@@ -26,6 +26,7 @@
  * @bug 4757273
  * @summary Test deadlock in MBeanServerDelegate listeners
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean NotifDeadlockTest
  * @run build NotifDeadlockTest
  * @run main NotifDeadlockTest
--- a/test/javax/management/MBeanServer/OldMBeanServerTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/MBeanServer/OldMBeanServerTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -97,6 +97,7 @@
  * @bug 5072268
  * @summary Test that nothing assumes a post-1.2 MBeanServer
  * @author Eamonn McManus
+ * @modules java.management
  * @run main/othervm -ea OldMBeanServerTest
  */
 
--- a/test/javax/management/MBeanServer/PostExceptionTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/MBeanServer/PostExceptionTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary Check behaviour of MBeanServer when postRegister and postDeregister
  *          throw exceptions.
  * @author Daniel Fuchs
+ * @modules java.management
  * @compile PostExceptionTest.java
  * @run main PostExceptionTest
  */
--- a/test/javax/management/MBeanServer/PostRegisterDeadlockTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/MBeanServer/PostRegisterDeadlockTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 6417044
  * @summary Test deadlock in MBeanRegistration.postRegister method
  * @author Eamonn McManus, Daniel Fuchs
+ * @modules java.management
  * @run clean PostRegisterDeadlockTest
  * @run build PostRegisterDeadlockTest
  * @run main PostRegisterDeadlockTest
--- a/test/javax/management/MBeanServer/PostRegisterDeadlockTest2.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/MBeanServer/PostRegisterDeadlockTest2.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 6417044
  * @summary Test that a failing MBean registration does not lead to a deadlock
  * @author Eamonn McManus
+ * @modules java.management
  * @run main PostRegisterDeadlockTest2
  */
 
--- a/test/javax/management/MBeanServer/PreDeregisterDeadlockTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/MBeanServer/PreDeregisterDeadlockTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 6318664
  * @summary Test deadlock in MBeanRegistration.preDeregister method
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean PreDeregisterDeadlockTest
  * @run build PreDeregisterDeadlockTest
  * @run main PreDeregisterDeadlockTest
--- a/test/javax/management/MBeanServer/PreRegisterTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/MBeanServer/PreRegisterTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 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
@@ -26,6 +26,7 @@
  * @bug 4911846
  * @summary Test that MBeanRegistration can change caller ObjectName
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean PreRegisterTest
  * @run build PreRegisterTest
  * @run main PreRegisterTest
--- a/test/javax/management/MBeanServerFactory/ReleaseMBeanServerTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/MBeanServerFactory/ReleaseMBeanServerTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 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
@@ -27,6 +27,7 @@
  * @summary Test that the releaseMBeanServer(MBeanServer mbeanServer) method
  *          throws IllegalArgumentException as expected
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean ReleaseMBeanServerTest
  * @run build ReleaseMBeanServerTest
  * @run main ReleaseMBeanServerTest
--- a/test/javax/management/MustBeValidMBeanInfo/MustBeValidCommand.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/MustBeValidMBeanInfo/MustBeValidCommand.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 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 @@
  * IllegalArgumentException when attribute names, operation names, and
  * Java type names do not strictly follow the expected Java syntax.
  * @author Daniel Fuchs
+ * @modules java.management
  * @run clean MustBeValidCommand
  * @run build MustBeValidCommand
  * @run main MustBeValidCommand
--- a/test/javax/management/ObjectInstance/MBeanInfoFailTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/ObjectInstance/MBeanInfoFailTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 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 5001857
  * @summary Test queryNames() and queryMBeans() with a buggy DynamicMBean
  * @author Daniel Fuchs
+ * @modules java.management
  * @run clean MBeanInfoFailTest
  * @run build MBeanInfoFailTest
  * @run main MBeanInfoFailTest
--- a/test/javax/management/ObjectInstance/ObjectInstanceNullTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/ObjectInstance/ObjectInstanceNullTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 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 5015663
  * @summary Test ObjectInstance(name,null).hashCode() and .equals()
  * @author Daniel Fuchs
+ * @modules java.management
  * @run clean ObjectInstanceNullTest
  * @run build ObjectInstanceNullTest
  * @run main ObjectInstanceNullTest
--- a/test/javax/management/ObjectInstance/ToStringMethodTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/ObjectInstance/ToStringMethodTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 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 5080083
  * @summary Test new added method "toString"
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean ToStringMethodTest
  * @run build ToStringMethodTest
  * @run main ToStringMethodTest
--- a/test/javax/management/ObjectName/ApplyWildcardTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/ObjectName/ApplyWildcardTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary Test the ObjectName.apply(ObjectName) method
  *          with wildcards in the key properties value part.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean ApplyWildcardTest
  * @run build ApplyWildcardTest
  * @run main ApplyWildcardTest
--- a/test/javax/management/ObjectName/ComparatorTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/ObjectName/ComparatorTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 5036680
  * @summary Test the ObjectName.compareTo() method.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean ComparatorTest
  * @run build ComparatorTest
  * @run main ComparatorTest
--- a/test/javax/management/ObjectName/DelegateNameWildcardNameTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/ObjectName/DelegateNameWildcardNameTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary Test that MBeanServerDelegate.DELEGATE_NAME and ObjectName.WILDCARD
  *          public constants have been initialized properly.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean DelegateNameWildcardNameTest
  * @run build DelegateNameWildcardNameTest
  * @run main DelegateNameWildcardNameTest
--- a/test/javax/management/ObjectName/NullEmptyKeyValueTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/ObjectName/NullEmptyKeyValueTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 6229396
  * @summary Test null/empty key/values in ObjectName constructors.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean NullEmptyKeyValueTest
  * @run build NullEmptyKeyValueTest
  * @run main NullEmptyKeyValueTest
--- a/test/javax/management/ObjectName/ObjectNameGetInstanceTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/ObjectName/ObjectNameGetInstanceTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 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
@@ -26,6 +26,7 @@
  * @bug 4894801
  * @summary Test that ObjectName.getInstance(ObjectName) preserves key order
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean ObjectNameGetInstanceTest
  * @run build ObjectNameGetInstanceTest
  * @run main ObjectNameGetInstanceTest
--- a/test/javax/management/ObjectName/RepositoryWildcardTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/ObjectName/RepositoryWildcardTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary Test if the repository supports correctly the use of
  *          wildcards in the ObjectName key properties value part.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean RepositoryWildcardTest
  * @run build RepositoryWildcardTest
  * @run main RepositoryWildcardTest
--- a/test/javax/management/ObjectName/SerialCompatTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/ObjectName/SerialCompatTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 6211220 6616825
  * @summary Test that jmx.serial.form=1.0 works for ObjectName
  * @author Eamonn McManus, Daniel Fuchs
+ * @modules java.management
  * @run clean SerialCompatTest
  * @run build SerialCompatTest
  * @run main/othervm -Djdk.jmx.mbeans.allowNonPublic=true -Djmx.serial.form=1.0 SerialCompatTest
--- a/test/javax/management/ObjectName/ValueWildcardTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/ObjectName/ValueWildcardTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 4716807
  * @summary Test wildcards in ObjectName key properties value part.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean ValueWildcardTest
  * @run build ValueWildcardTest
  * @run main ValueWildcardTest
--- a/test/javax/management/descriptor/DefaultDescriptorTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/descriptor/DefaultDescriptorTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 6204469
  * @summary Test that MBean*Info can be constructed with default descriptor
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean DefaultDescriptorTest
  * @run build DefaultDescriptorTest
  * @run main DefaultDescriptorTest
--- a/test/javax/management/descriptor/DescriptorTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/descriptor/DescriptorTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2005, 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 6204469 6273765
  * @summary Test various aspects of the Descriptor interface
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean DescriptorTest
  * @run build DescriptorTest
  * @run main DescriptorTest
--- a/test/javax/management/descriptor/EqualsHashCodeTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/descriptor/EqualsHashCodeTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 6255956
  * @summary Test equals and hashCode for descriptors
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean EqualsHashCodeTest
  * @run build EqualsHashCodeTest
  * @run main EqualsHashCodeTest
--- a/test/javax/management/descriptor/ImmutableArrayFieldTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/descriptor/ImmutableArrayFieldTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary Test that immutability of ImmutableDescriptor cannot be
  * compromised by modifying field values that are arrays.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean ImmutableArrayFieldTest
  * @run build ImmutableArrayFieldTest
  * @run main ImmutableArrayFieldTest
--- a/test/javax/management/descriptor/ImmutableDescriptorSerialTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/descriptor/ImmutableDescriptorSerialTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 6204469
  * @summary Test ImmutableDescriptor serialization.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean ImmutableDescriptorSerialTest
  * @run build ImmutableDescriptorSerialTest
  * @run main ImmutableDescriptorSerialTest
--- a/test/javax/management/descriptor/ImmutableDescriptorSetFieldsTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/descriptor/ImmutableDescriptorSetFieldsTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -28,6 +28,7 @@
  * null name in it and calling setFields with a field names array with an
  * empty name in it throw the expected exceptions.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean ImmutableDescriptorSetFieldsTest
  * @run build ImmutableDescriptorSetFieldsTest
  * @run main ImmutableDescriptorSetFieldsTest
--- a/test/javax/management/descriptor/MBeanInfoInteropTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/descriptor/MBeanInfoInteropTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2007, 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 6204469
  * @summary Check that descriptors have not broken serial interop.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean MBeanInfoInteropTest SerializedInfo
  * @run build MBeanInfoInteropTest SerializedInfo
  * @run main MBeanInfoInteropTest SerializedInfo
--- a/test/javax/management/descriptor/UnionTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/descriptor/UnionTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 6273752
  * @summary Test ImmutableDescriptor.union
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean UnionTest
  * @run build UnionTest
  * @run main UnionTest
--- a/test/javax/management/generified/GenericTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/generified/GenericTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2005, 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 4847959 6191402
  * @summary Test newly-generified APIs
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean GenericTest
  * @run build GenericTest
  * @run main GenericTest
--- a/test/javax/management/generified/ListTypeCheckTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/generified/ListTypeCheckTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 6250772
  * @summary Test that *List objects are checked after asList is called.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean ListTypeCheckTest
  * @run build ListTypeCheckTest
  * @run main ListTypeCheckTest
--- a/test/javax/management/loading/ArrayClassTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/loading/ArrayClassTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 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
@@ -27,6 +27,7 @@
  * @summary Test that array classes can be found in signatures always
  * and can be deserialized by the deprecated MBeanServer.deserialize method
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean ArrayClassTest
  * @run build ArrayClassTest
  * @run main ArrayClassTest
@@ -35,6 +36,7 @@
 import java.io.*;
 import java.lang.reflect.*;
 import java.net.*;
+import java.nio.file.Paths;
 import javax.management.*;
 import javax.management.loading.*;
 
@@ -42,15 +44,16 @@
     public static void main(String[] args) throws Exception {
         MBeanServer mbs = MBeanServerFactory.createMBeanServer();
 
-        /* If this test isn't loaded by a URLClassLoader we will get
-           a ClassCastException here, which is good because it means
-           this test isn't valid.  */
-        URLClassLoader testLoader =
-            (URLClassLoader) ArrayClassTest.class.getClassLoader();
+        String[] cpaths = System.getProperty("test.classes", ".")
+                                .split(File.pathSeparator);
+        URL[] urls = new URL[cpaths.length];
+        for (int i=0; i < cpaths.length; i++) {
+            urls[i] = Paths.get(cpaths[i]).toUri().toURL();
+        }
 
         // Create an MLet that can load the same class names but
         // will produce different results.
-        ClassLoader loader = new SpyLoader(testLoader.getURLs());
+        ClassLoader loader = new SpyLoader(urls);
         ObjectName loaderName = new ObjectName("test:type=SpyLoader");
         mbs.registerMBean(loader, loaderName);
 
--- a/test/javax/management/loading/DocumentRootTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/loading/DocumentRootTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test parsing error when the mlet file is
  *          located in the web server's document root.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean DocumentRootTest
  * @run build DocumentRootTest
  * @run main DocumentRootTest
--- a/test/javax/management/loading/GetMBeansFromURLTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/loading/GetMBeansFromURLTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 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
@@ -28,6 +28,7 @@
  *          given MLet instance throws a ServiceNotFoundException exception
  *          with a non null cause.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean GetMBeansFromURLTest
  * @run build GetMBeansFromURLTest
  * @run main GetMBeansFromURLTest
--- a/test/javax/management/loading/LibraryLoader/LibraryLoaderTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/loading/LibraryLoader/LibraryLoaderTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013 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
@@ -27,6 +27,7 @@
  * @summary Test that the same native library coming from the same jar file can
  * be loaded twice by two different MLets on the same JVM without conflict.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean LibraryLoaderTest
  * @run build LibraryLoaderTest
  * @run main/othervm LibraryLoaderTest
--- a/test/javax/management/loading/MLetCLR/MLetCommand.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/loading/MLetCLR/MLetCommand.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 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 @@
  * for the test codebase as it is executed by the MLet code using
  * doPrivileged.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean MLetCommand
  * @run build MLetCommand
  * @run main/othervm/policy=policy MLetCommand
--- a/test/javax/management/loading/MLetContentTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/loading/MLetContentTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 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 4796780
  * @summary The class MLetContentTest becomes public
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean MLetContentTest
  * @run build MLetContentTest
  * @run main MLetContentTest
--- a/test/javax/management/loading/MLetInternalsTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/loading/MLetInternalsTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 @@
  * @bug 8058089
  * @summary Tests various internal functions provided by MLet for correctness
  * @author Jaroslav Bachorik
+ * @modules java.management
  * @run testng MLetInternalsTest
  */
 public class MLetInternalsTest {
--- a/test/javax/management/loading/ParserInfiniteLoopTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/loading/ParserInfiniteLoopTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -29,6 +29,7 @@
  * terminated with the corresponding '>' and an opening '<' for
  * the subsequent tag is encountered.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean ParserInfiniteLoopTest
  * @run build ParserInfiniteLoopTest
  * @run main/othervm/timeout=5 ParserInfiniteLoopTest mlet1.html
--- a/test/javax/management/loading/SystemClassLoaderTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/loading/SystemClassLoaderTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 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
@@ -27,6 +27,7 @@
  * @summary Test that a class can load MBeans from its class loader
  * (at least if it is the system class loader)
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean SystemClassLoaderTest
  * @run build SystemClassLoaderTest
  * @run main SystemClassLoaderTest
--- a/test/javax/management/modelmbean/AddAttributeChangeNotificationListenerTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/modelmbean/AddAttributeChangeNotificationListenerTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -30,6 +30,7 @@
  * no other attributes.
  * @author Yves Joan
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean AddAttributeChangeNotificationListenerTest
  * @run build AddAttributeChangeNotificationListenerTest
  * @run main AddAttributeChangeNotificationListenerTest
--- a/test/javax/management/modelmbean/DescriptorSupportSerialTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/modelmbean/DescriptorSupportSerialTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 6332962
  * @summary Test that DescriptorSupport does not serialize targetObject
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean DescriptorSupportSerialTest
  * @run build DescriptorSupportSerialTest
  * @run main DescriptorSupportSerialTest
--- a/test/javax/management/modelmbean/DescriptorSupportTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/modelmbean/DescriptorSupportTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, 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
@@ -26,6 +26,7 @@
  * @bug 4883712 4869006 4894856 5016685
  * @summary Test that DescriptorSupport correctly validates fields
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean DescriptorSupportTest
  * @run build DescriptorSupportTest
  * @run main DescriptorSupportTest
--- a/test/javax/management/modelmbean/DescriptorSupportXMLTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/modelmbean/DescriptorSupportXMLTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 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
@@ -27,6 +27,7 @@
  * @summary Test that DescriptorSupport.toXMLString() can be used to
  * reconstruct an equivalent DescriptorSupport
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean DescriptorSupportXMLTest
  * @run build DescriptorSupportXMLTest
  * @run main DescriptorSupportXMLTest
--- a/test/javax/management/modelmbean/ExoticTargetTypeTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/modelmbean/ExoticTargetTypeTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 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
@@ -27,6 +27,7 @@
  * @summary Test that a custom ModelMBean implementation can have custom
  * targetType values in its ModelMBeanOperationInfo descriptors.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean ExoticTargetTypeTest
  * @run build ExoticTargetTypeTest
  * @run main ExoticTargetTypeTest
--- a/test/javax/management/modelmbean/InfoSupportTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/modelmbean/InfoSupportTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 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
@@ -29,6 +29,7 @@
  * that getDescriptors("mbean") works, and that default values for
  * MBean descriptors are correctly assigned.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean InfoSupportTest
  * @run build InfoSupportTest
  * @run main InfoSupportTest
--- a/test/javax/management/modelmbean/LoggingExceptionTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/modelmbean/LoggingExceptionTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -29,6 +29,7 @@
  * when traces enabled and no attributes.
  * @author Luis-Miguel Alventosa
  * @author Paul Cheeseman
+ * @modules java.management
  */
 
 import java.util.logging.ConsoleHandler;
--- a/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary Test that  ModelMBeanInfoSupport.getDescriptors(null) also
  *          returns the MBean's descriptor.
  * @author Eamonn McManus, Daniel Fuchs
+ * @modules java.management
  * @run clean GetAllDescriptorsTest
  * @run build GetAllDescriptorsTest
  * @run main/othervm/policy=policy  GetAllDescriptorsTest
--- a/test/javax/management/modelmbean/OnUnregisterTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/modelmbean/OnUnregisterTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary Check that OnUnregister is an allowed value for persistPolicy
  * in ModelMBeanAttributeInfo
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean OnUnregisterTest
  * @run build OnUnregisterTest
  * @run main OnUnregisterTest
--- a/test/javax/management/modelmbean/RequiredModelMBeanGetAttributeTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/modelmbean/RequiredModelMBeanGetAttributeTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -36,6 +36,7 @@
  * - the declared name can be loaded by the value's class loader and
  *   produces a class to which the value can be assigned.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean RequiredModelMBeanGetAttributeTest
  * @run build RequiredModelMBeanGetAttributeTest
  * @run main RequiredModelMBeanGetAttributeTest
--- a/test/javax/management/modelmbean/RequiredModelMBeanMethodTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/modelmbean/RequiredModelMBeanMethodTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 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 @@
  * from the RequiredModelMBean class itself if they are not in the
  * ModelMBeanInfo
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean RequiredModelMBeanMethodTest
  * @run build RequiredModelMBeanMethodTest
  * @run main RequiredModelMBeanMethodTest
--- a/test/javax/management/modelmbean/RequiredModelMBeanSetAttributeTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/modelmbean/RequiredModelMBeanSetAttributeTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -28,6 +28,7 @@
  * MBeanException wrapping a ServiceNotFoundException is thrown is setAttribute
  * called but no setMethod field has been provided.
  * @author Jean-Francois Denise
+ * @modules java.management
  * @run clean RequiredModelMBeanSetAttributeTest
  * @run build RequiredModelMBeanSetAttributeTest
  * @run main RequiredModelMBeanSetAttributeTest
--- a/test/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 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 @@
  * IllegalArgumentException when attribute names, operation names, and
  * Java type names do not strictly follow the expected Java syntax.
  * @author Eamonn McManus, Daniel Fuchs
+ * @modules java.management
  * @run clean SimpleModelMBeanCommand
  * @run build SimpleModelMBeanCommand
  * @run main/othervm/policy=policy  SimpleModelMBeanCommand
--- a/test/javax/management/modelmbean/UnserializableTargetObjectTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/modelmbean/UnserializableTargetObjectTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary Test that a RequiredModelMBean operation can have a targetObject
  * that is not serializable
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean UnserializableTargetObjectTest
  * @run build UnserializableTargetObjectTest
  * @run main UnserializableTargetObjectTest
--- a/test/javax/management/monitor/AttributeArbitraryDataTypeTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/monitor/AttributeArbitraryDataTypeTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,8 @@
  * @summary Test that the counter/gauge/string monitors
  *          support attributes of arbitrary data types.
  * @author Luis-Miguel Alventosa
+ * @modules java.desktop
+ *          java.management
  * @run clean AttributeArbitraryDataTypeTest
  * @run build AttributeArbitraryDataTypeTest
  * @run main AttributeArbitraryDataTypeTest
--- a/test/javax/management/monitor/CounterMonitorDeadlockTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/monitor/CounterMonitorDeadlockTest.java	Thu May 07 09:11:49 2015 +0200
@@ -27,6 +27,7 @@
  * @summary Test that no locks are held when a monitor attribute is sampled
  * or notif delivered.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean CounterMonitorDeadlockTest
  * @run build CounterMonitorDeadlockTest
  * @run main CounterMonitorDeadlockTest 1
--- a/test/javax/management/monitor/CounterMonitorInitThresholdTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/monitor/CounterMonitorInitThresholdTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -28,6 +28,7 @@
  *          objects added before the counter monitor is started as well as by
  *          the observed objects which are added once the monitor is started.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean CounterMonitorInitThresholdTest
  * @run build CounterMonitorInitThresholdTest
  * @run main CounterMonitorInitThresholdTest
--- a/test/javax/management/monitor/CounterMonitorTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/monitor/CounterMonitorTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2014, 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
@@ -27,6 +27,7 @@
  * @summary Test that the counter monitor, when running in difference mode,
  *          emits a notification every time the threshold is exceeded.
  * @author Luis-Miguel Alventosa, Shanliang JIANG
+ * @modules java.management
  * @run clean CounterMonitorTest
  * @run build CounterMonitorTest
  * @run main CounterMonitorTest
--- a/test/javax/management/monitor/CounterMonitorThresholdTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/monitor/CounterMonitorThresholdTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -26,6 +26,7 @@
  * @bug 6229368 8025207
  * @summary Wrong threshold value in CounterMonitor with offset and modulus.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean CounterMonitorThresholdTest
  * @run build CounterMonitorThresholdTest
  * @run main CounterMonitorThresholdTest
--- a/test/javax/management/monitor/DerivedGaugeMonitorTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/monitor/DerivedGaugeMonitorTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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,7 @@
  * @bug 6683213
  * @summary Test that the initial derived gauge is (Integer)0
  * @author Daniel Fuchs
+ * @modules java.management
  * @run clean DerivedGaugeMonitorTest
  * @run build DerivedGaugeMonitorTest
  * @run main DerivedGaugeMonitorTest
--- a/test/javax/management/monitor/GaugeMonitorDeadlockTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/monitor/GaugeMonitorDeadlockTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, 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
@@ -27,6 +27,7 @@
  * @summary Test that no locks are held when a monitor attribute is sampled
  * or notif delivered.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean GaugeMonitorDeadlockTest
  * @run build GaugeMonitorDeadlockTest
  * @run main GaugeMonitorDeadlockTest 1
--- a/test/javax/management/monitor/MultiMonitorTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/monitor/MultiMonitorTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 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 4984057
  * @summary Test that monitors can sample a large number of attributes
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean MultiMonitorTest
  * @run build MultiMonitorTest
  * @run main MultiMonitorTest
--- a/test/javax/management/monitor/NonComparableAttributeValueTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/monitor/NonComparableAttributeValueTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -28,6 +28,7 @@
  *          jmx.monitor.error.type notification when the attribute
  *          being monitored returns a non comparable value.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean NonComparableAttributeValueTest
  * @run build NonComparableAttributeValueTest
  * @run main NonComparableAttributeValueTest
--- a/test/javax/management/monitor/NullAttributeValueTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/monitor/NullAttributeValueTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -29,6 +29,7 @@
  *          being monitored returns a null value.
  * @author Luis-Miguel Alventosa
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean NullAttributeValueTest
  * @run build NullAttributeValueTest
  * @run main NullAttributeValueTest
--- a/test/javax/management/monitor/ReflectionExceptionTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/monitor/ReflectionExceptionTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary Test that the jmx.monitor.error.runtime monitor notification
  *          is emitted when getAttribute throws ReflectionException.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean ReflectionExceptionTest MBeanServerBuilderImpl
  *            MBeanServerForwarderInvocationHandler
  * @run build ReflectionExceptionTest MBeanServerBuilderImpl
--- a/test/javax/management/monitor/RuntimeExceptionTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/monitor/RuntimeExceptionTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary Test that the jmx.monitor.error.runtime monitor notification
  *          is emitted when getAttribute throws RuntimeException.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean RuntimeExceptionTest MBeanServerBuilderImpl
  *            MBeanServerForwarderInvocationHandler
  * @run build RuntimeExceptionTest MBeanServerBuilderImpl
--- a/test/javax/management/monitor/StartStopTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/monitor/StartStopTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -28,6 +28,7 @@
  *          monitors are started and stopped in a loop.
  * @author Luis-Miguel Alventosa
  * @library /lib/testlibrary
+ * @modules java.management
  * @build jdk.testlibrary.*
  * @run clean StartStopTest
  * @run build StartStopTest
--- a/test/javax/management/monitor/StringMonitorDeadlockTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/monitor/StringMonitorDeadlockTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary Test that no locks are held when a monitor attribute is sampled
  * or notif delivered.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean StringMonitorDeadlockTest
  * @run build StringMonitorDeadlockTest
  * @run main StringMonitorDeadlockTest 1
--- a/test/javax/management/monitor/ThreadPoolAccTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/monitor/ThreadPoolAccTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary Test that each thread in the thread pool runs
  *          in the context of the monitor.start() caller.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean ThreadPoolAccTest
  * @run build ThreadPoolAccTest
  * @run main ThreadPoolAccTest
--- a/test/javax/management/monitor/ThreadPoolTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/monitor/ThreadPoolTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, 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
@@ -27,6 +27,7 @@
  * @summary Test that all monitors will be well started when sharing
  * a single thread pool.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean ThreadPoolTest
  * @run build ThreadPoolTest
  * @run main/othervm/timeout=300 ThreadPoolTest 1
--- a/test/javax/management/mxbean/AmbiguousConstructorTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/mxbean/AmbiguousConstructorTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, 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,8 @@
  * @bug 6175517 6278707
  * @summary Test that ambiguous ConstructorProperties annotations are detected.
  * @author Eamonn McManus
+ * @modules java.desktop
+ *          java.management
  * @run clean AmbiguousConstructorTest
  * @run build AmbiguousConstructorTest
  * @run main AmbiguousConstructorTest
--- a/test/javax/management/mxbean/ComparatorExceptionTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/mxbean/ComparatorExceptionTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 6601652
  * @summary Test exception when SortedMap or SortedSet has non-null Comparator
  * @author Eamonn McManus
+ * @modules java.management
  */
 
 import java.util.SortedMap;
--- a/test/javax/management/mxbean/ExceptionDiagnosisTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/mxbean/ExceptionDiagnosisTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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,8 @@
  * @bug 6713777
  * @summary Test that exception messages include all relevant information
  * @author Eamonn McManus
+ * @modules java.desktop
+ *          java.management
  */
 
 import java.beans.ConstructorProperties;
--- a/test/javax/management/mxbean/GenericArrayTypeTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/mxbean/GenericArrayTypeTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, 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 6292705
  * @summary Test support for arrays in parameterized types.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean GenericArrayTypeTest
  * @run build GenericArrayTypeTest
  * @run main GenericArrayTypeTest
--- a/test/javax/management/mxbean/GenericTypeTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/mxbean/GenericTypeTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 6376416 6406447
  * @summary Test use of generic types in MXBeans (mostly illegal).
  * @author Eamonn McManus
+ * @modules java.management
  * @run main GenericTypeTest
  */
 
--- a/test/javax/management/mxbean/InvalidMXBeanRegistrationTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/mxbean/InvalidMXBeanRegistrationTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary Ensure the registration of an invalid MXBean
  *          throws NotCompliantMBeanException.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean InvalidMXBeanRegistrationTest
  * @run build InvalidMXBeanRegistrationTest
  * @run main InvalidMXBeanRegistrationTest
--- a/test/javax/management/mxbean/LeakTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/mxbean/LeakTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2008, 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
@@ -25,6 +25,8 @@
  * @bug 6482247
  * @summary Test that creating MXBeans does not introduce memory leaks.
  * @author Eamonn McManus
+ * @modules java.desktop
+ *          java.management
  * @run build LeakTest RandomMXBeanTest
  * @run main LeakTest
  */
@@ -38,12 +40,14 @@
  * This test can be applied to any jtreg test, not just the MXBean tests.
  */
 
+import java.io.File;
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.nio.file.Paths;
 
 public class LeakTest {
     /* Ideally we would include MXBeanTest in the list of tests, since it
@@ -95,11 +99,15 @@
 
     private static WeakReference<ClassLoader>
             testShadow(Class<?> originalTestClass) throws Exception {
-        URLClassLoader originalLoader =
-                (URLClassLoader) originalTestClass.getClassLoader();
-        URL[] urls = originalLoader.getURLs();
+        String[] cpaths = System.getProperty("test.classes", ".")
+                                .split(File.pathSeparator);
+        URL[] urls = new URL[cpaths.length];
+        for (int i=0; i < cpaths.length; i++) {
+            urls[i] = Paths.get(cpaths[i]).toUri().toURL();
+        }
+
         URLClassLoader shadowLoader =
-                new ShadowClassLoader(urls, originalLoader.getParent());
+                new ShadowClassLoader(urls, originalTestClass.getClassLoader().getParent());
         System.out.println("Shadow loader is " + shadowLoader);
         String className = originalTestClass.getName();
         Class<?> testClass = Class.forName(className, false, shadowLoader);
--- a/test/javax/management/mxbean/MBeanOperationInfoTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/mxbean/MBeanOperationInfoTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2008, 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,7 @@
  * @bug 6359948
  * @summary Check that MXBean operations have the expected ReturnType in MBeanOperationInfo
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean MBeanOperationInfoTest
  * @run build MBeanOperationInfoTest
  * @run main MBeanOperationInfoTest
--- a/test/javax/management/mxbean/MXBeanAnnotationTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/mxbean/MXBeanAnnotationTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 6316491
  * @summary Check that the MXBean annotation works as advertised
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean MXBeanAnnotationTest
  * @run build MXBeanAnnotationTest
  * @run main MXBeanAnnotationTest
--- a/test/javax/management/mxbean/MXBeanFallbackTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/mxbean/MXBeanFallbackTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 @@
  *          It needs to be a separate class because the "jdk.jmx.mbeans.allowNonPublic"
  *          system property must be set before c.s.j.m.MBeanAnalyzer has been loaded.
  * @author Jaroslav Bachorik
+ * @modules java.management
  * @run clean MXBeanFallbackTest
  * @run build MXBeanFallbackTest
  * @run main/othervm -Djdk.jmx.mbeans.allowNonPublic=true MXBeanFallbackTest
--- a/test/javax/management/mxbean/MXBeanFlagTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/mxbean/MXBeanFlagTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 6335337
  * @summary Test correctness of mxbean flag in descriptor.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean MXBeanFlagTest
  * @run build MXBeanFlagTest
  * @run main MXBeanFlagTest
--- a/test/javax/management/mxbean/MXBeanPreRegisterTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/mxbean/MXBeanPreRegisterTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary Ensure that preRegister etc are called, but not when wrapped
  * by the class StandardMBean
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean MXBeanPreRegisterTest
  * @run build MXBeanPreRegisterTest
  * @run main MXBeanPreRegisterTest
--- a/test/javax/management/mxbean/MXBeanRefTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/mxbean/MXBeanRefTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 6296433 6283873
  * @summary Test that inter-MXBean references work as expected.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean MXBeanRefTest
  * @run build MXBeanRefTest
  * @run main MXBeanRefTest
--- a/test/javax/management/mxbean/MXBeanTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/mxbean/MXBeanTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,8 @@
  * @summary General MXBean test.
  * @author Eamonn McManus
  * @author Jaroslav Bachorik
+ * @modules java.desktop
+ *          java.management
  * @run clean MXBeanTest MerlinMXBean TigerMXBean
  * @run build MXBeanTest MerlinMXBean TigerMXBean
  * @run main MXBeanTest
--- a/test/javax/management/mxbean/MiscTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/mxbean/MiscTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -28,6 +28,7 @@
  *          interfaceClassName, openType, originalType, StandardMBean,
  *          StandardEmitterMBean.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean MiscTest
  * @run build MiscTest
  * @run main MiscTest
--- a/test/javax/management/mxbean/OperationImpactTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/mxbean/OperationImpactTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 6320104
  * @summary Check that MXBean operations have impact UNKNOWN.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean OperationImpactTest
  * @run build OperationImpactTest
  * @run main OperationImpactTest
--- a/test/javax/management/mxbean/OverloadTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/mxbean/OverloadTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 6175517
  * @summary Test that MXBean interfaces can contain overloaded methods
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean OverloadTest
  * @run build OverloadTest
  * @run main OverloadTest
--- a/test/javax/management/mxbean/PreRegisterNameTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/mxbean/PreRegisterNameTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 6448042
  * @summary Test that MXBeans can define their own names in preRegister
  * @author Eamonn McManus
+ * @modules java.management
  */
 
 import java.lang.management.ManagementFactory;
--- a/test/javax/management/mxbean/PropertyNamesTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/mxbean/PropertyNamesTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, 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,8 @@
  * @bug 6175517
  * @summary Test the PropertyNames annotation with MXBeans
  * @author Eamonn McManus
+ * @modules java.desktop
+ *          java.management
  * @run clean PropertyNamesTest
  * @run build PropertyNamesTest
  * @run main PropertyNamesTest
--- a/test/javax/management/mxbean/SameObjectTwoNamesTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/mxbean/SameObjectTwoNamesTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * names produces an exception
  * @author Alexander Shusherov
  * @author Eamonn McManus
+ * @modules java.management
  * @run main SameObjectTwoNamesTest
  * @run main/othervm -Djmx.mxbean.multiname=true SameObjectTwoNamesTest
  */
--- a/test/javax/management/mxbean/StandardMBeanOverrideTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/mxbean/StandardMBeanOverrideTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -29,6 +29,7 @@
  *          getMBeanInfo and getNotificationInfo in StandardMBean and
  *          StandardEmitterMBean.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean StandardMBeanOverrideTest
  * @run build StandardMBeanOverrideTest
  * @run main StandardMBeanOverrideTest
--- a/test/javax/management/mxbean/ThreadMXBeanTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/mxbean/ThreadMXBeanTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, 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 6305746
  * @summary Test that the null values returned by the ThreadMXBean work.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean ThreadMXBeanTest
  * @run build ThreadMXBeanTest
  * @run main ThreadMXBeanTest
--- a/test/javax/management/mxbean/TypeNameTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/mxbean/TypeNameTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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,7 @@
  * @bug 6757225 6763051
  * @summary Test that type names in MXBeans match their spec.
  * @author Eamonn McManus
+ * @modules java.management
  */
 
 import java.lang.reflect.Field;
--- a/test/javax/management/notification/BroadcasterSupportDeadlockTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/notification/BroadcasterSupportDeadlockTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2005, 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
@@ -27,6 +27,7 @@
  * @summary Test that NotificationBroadcasterSupport can be subclassed
  * and used with synchronized(this) without causing deadlock
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean BroadcasterSupportDeadlockTest
  * @run build BroadcasterSupportDeadlockTest
  * @run main BroadcasterSupportDeadlockTest
--- a/test/javax/management/notification/FilterExceptionTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/notification/FilterExceptionTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 6244855 6244863
  * @summary Exception thrown by NotificationFilter should be ignored
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean FilterExceptionTest
  * @run build FilterExceptionTest
  * @run main FilterExceptionTest
--- a/test/javax/management/notification/NotifExecutorTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/notification/NotifExecutorTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 4661545
  * @summary Tests to use an executor to send notifications.
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean NotifExecutorTest
  * @run build NotifExecutorTest
  * @run main NotifExecutorTest
--- a/test/javax/management/notification/NotifInfoTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/notification/NotifInfoTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 4506105 6303698
  * @summary NotificationBroadcasterSupport should have a ctor with MBeanNotificationInfo[]
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean NotifInfoTest
  * @run build NotifInfoTest
  * @run main NotifInfoTest
--- a/test/javax/management/openmbean/ArrayTypeTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/openmbean/ArrayTypeTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 5045358
  * @summary Test that Open MBeans support arrays of primitive types.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean ArrayTypeTest
  * @run build ArrayTypeTest
  * @run main ArrayTypeTest
--- a/test/javax/management/openmbean/BadConstraintTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/openmbean/BadConstraintTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary Test that Open MBean attributes and parameters cannot have
  * illegal constraints like min greater than max
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean BadConstraintTest
  * @run build BadConstraintTest
  * @run main BadConstraintTest
--- a/test/javax/management/openmbean/CompositeDataStringTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/openmbean/CompositeDataStringTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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,7 @@
  * @bug 6610174
  * @summary Test that CompositeDataSupport.toString() represents arrays correctly
  * @author Eamonn McManus
+ * @modules java.management
  */
 
 import javax.management.openmbean.ArrayType;
--- a/test/javax/management/openmbean/ConstraintTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/openmbean/ConstraintTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 6204469
  * @summary Test that Open MBean attributes and parameters check constraints
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean ConstraintTest
  * @run build ConstraintTest
  * @run main ConstraintTest
--- a/test/javax/management/openmbean/EqualsTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/openmbean/EqualsTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 5072174
  * @summary Test CompositeDataSupport.equals with ArrayType
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean EqualsTest
  * @run build EqualsTest
  * @run main EqualsTest
--- a/test/javax/management/openmbean/IsValueTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/openmbean/IsValueTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 5072004
  * @summary Test new rules for isValue
  * @author Eamonn McManus
+ * @modules java.management
  */
 
 import javax.management.openmbean.*;
--- a/test/javax/management/openmbean/NullConstructorParamsTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/openmbean/NullConstructorParamsTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 6434298
  * @summary Test IAE is thrown when typeName or description parameter is null for TabularType and CompositeType constructors
  * @author Joel FERAUD
+ * @modules java.management
  */
 
 import javax.management.openmbean.*;
--- a/test/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -41,6 +41,7 @@
  * @bug 8023529
  * @summary Test that OpenMBean*Info.equals do not throw NPE
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean OpenMBeanInfoEqualsNPETest
  * @run build OpenMBeanInfoEqualsNPETest
  * @run main OpenMBeanInfoEqualsNPETest
--- a/test/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -40,6 +40,7 @@
  * @bug 8023529
  * @summary Test that OpenMBean*Info.hashCode do not throw NPE
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean OpenMBeanInfoHashCodeNPETest
  * @run build OpenMBeanInfoHashCodeNPETest
  * @run main OpenMBeanInfoHashCodeNPETest
--- a/test/javax/management/openmbean/OpenTypeDescriptorTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/openmbean/OpenTypeDescriptorTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -28,6 +28,7 @@
  * @summary Test that Open*MBeanInfo classes include "openType" in descriptor
  *          and also test serial compatibility with Java 5.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean OpenTypeDescriptorTest
  * @run build OpenTypeDescriptorTest
  * @run main OpenTypeDescriptorTest
--- a/test/javax/management/openmbean/TabularDataOrderTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/openmbean/TabularDataOrderTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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,7 @@
  * @bug 6334663
  * @summary Test that TabularDataSupport preserves the order elements were added
  * @author Eamonn McManus
+ * @modules java.management
  */
 
 import java.io.ByteArrayInputStream;
--- a/test/javax/management/proxy/JMXProxyFallbackTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/proxy/JMXProxyFallbackTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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,7 @@
  *          It needs to be a separate class because the "jdk.jmx.mbeans.allowNonPublic"
  *          system property must be set before c.s.j.m.MBeanAnalyzer has been loaded.
  * @author Jaroslav Bachorik
+ * @modules java.management
  * @run clean JMXProxyFallbackTest
  * @run build JMXProxyFallbackTest
  * @run main/othervm -Djdk.jmx.mbeans.allowNonPublic=true JMXProxyFallbackTest
--- a/test/javax/management/proxy/JMXProxyTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/proxy/JMXProxyTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 @@
  * @summary Tests that javax.management.JMX creates proxies only for the
  *          compliant MBeans/MXBeans
  * @author Jaroslav Bachorik
+ * @modules java.management
  * @run clean JMXProxyTest
  * @run build JMXProxyTest
  * @run main JMXProxyTest
--- a/test/javax/management/proxy/NotificationEmitterProxy.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/proxy/NotificationEmitterProxy.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @summary Test that we can create proxies which are NotificationEmitters.
  * @bug 6411747
  * @author Daniel Fuchs
+ * @modules java.management
  * @run clean NotificationEmitterProxy
  * @run build NotificationEmitterProxy
  * @run main NotificationEmitterProxy
--- a/test/javax/management/proxy/ProxyObjectMethodsTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/proxy/ProxyObjectMethodsTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2005, 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 6177524
  * @summary Test how to execute the 3 Object methods by a Proxy.
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean ProxyObjectMethodsTest
  * @run build ProxyObjectMethodsTest
  * @run main ProxyObjectMethodsTest
--- a/test/javax/management/query/CustomQueryTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/query/CustomQueryTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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,7 @@
  * @bug 6692027
  * @summary Check that custom subclasses of QueryEval can be serialized.
  * @author Eamonn McManus
+ * @modules java.management
  */
 
 import java.io.ByteArrayInputStream;
--- a/test/javax/management/query/InstanceOfExpTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/query/InstanceOfExpTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 5072174 6335848
  * @summary test the new method javax.management.Query.isInstanceOf("className")
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean InstanceOfExpTest
  * @run build InstanceOfExpTest
  * @run main InstanceOfExpTest
--- a/test/javax/management/query/QueryExpStringTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/query/QueryExpStringTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, 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
@@ -26,6 +26,7 @@
  * @bug 4886011
  * @summary Test that QueryExp.toString() is reversible
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean QueryExpStringTest
  * @run build QueryExpStringTest
  * @run main QueryExpStringTest
--- a/test/javax/management/query/QueryMatchTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/query/QueryMatchTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 6266438
  * @summary Query.match code for character sequences like [a-z] is wrong.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean QueryMatchTest
  * @run build QueryMatchTest
  * @run main QueryMatchTest
--- a/test/javax/management/query/QuerySubstringTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/query/QuerySubstringTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -27,6 +27,7 @@
  * @summary Query.{initial,any,final}SubString fail if the
  *          matching constraint string contains wildcards.
  * @author Luis-Miguel Alventosa
+ * @modules java.management
  * @run clean QuerySubstringTest
  * @run build QuerySubstringTest
  * @run main QuerySubstringTest
--- a/test/javax/management/relation/NonArrayListTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/relation/NonArrayListTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 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
@@ -26,6 +26,7 @@
  * @bug 4848474
  * @summary Test that relation service doesn't require List params to be ArrayList
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean NonArrayListTest
  * @run build NonArrayListTest
  * @run main NonArrayListTest
--- a/test/javax/management/relation/RelationNotificationSeqNoTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/relation/RelationNotificationSeqNoTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, 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 6701459
  * @summary Test sequence numbers in RelationService notifications.
  * @author Eamonn McManus
+ * @modules java.management
  */
 
 /*
--- a/test/javax/management/relation/RelationNotificationSourceTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/relation/RelationNotificationSourceTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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 4892674
  * @summary Test that RelationNotification can be constructed with ObjectName.
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean RelationNotificationSourceTest
  * @run build RelationNotificationSourceTest
  * @run main RelationNotificationSourceTest
--- a/test/javax/management/relation/RelationTypeTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/relation/RelationTypeTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 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
@@ -26,6 +26,7 @@
  * @bug 4716675
  * @summary Test that relation type checking uses isInstanceOf
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean RelationTypeTest
  * @run build RelationTypeTest
  * @run main RelationTypeTest
--- a/test/javax/management/remote/mandatory/URLTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/remote/mandatory/URLTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2012, 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 5057532
  * @summary Tests that host names are parsed correctly in URLs
  * @author Eamonn McManus
+ * @modules java.management
  * @run clean URLTest
  * @run build URLTest
  * @run main URLTest
--- a/test/javax/management/remote/mandatory/connection/AddressableTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/remote/mandatory/connection/AddressableTest.java	Thu May 07 09:11:49 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, 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 6238815
  * @summary test the new interface Addressable
  * @author Shanliang JIANG
+ * @modules java.management
  * @run clean AddressableTest
  * @run build AddressableTest
  * @run main AddressableTest
--- a/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java	Wed May 06 16:00:15 2015 -0700
+++ b/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java	Thu May 07 09:11:49 2015 +0200
@@ -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
@@ -26,6 +26,7 @@
  * @bug 4940957 8025205
  * @summary Tests behaviour when connections break
  * @author Eamonn McManus
+ * @modules java.management