# HG changeset patch # User ykantser # Date 1430907198 -7200 # Wed May 06 12:13:18 2015 +0200 # Node ID a3afc81ea059d03f579bd391bf36ababd94b2ef5 # Parent 51f5501a54a62aceed6342e7ea3a9a3c67f3885d 8078896: Add @modules as needed to the jdk_svc tests Reviewed-by: alanb, mchung diff --git a/test/TEST.ROOT b/test/TEST.ROOT --- a/test/TEST.ROOT +++ b/test/TEST.ROOT @@ -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 diff --git a/test/com/sun/jdi/AcceptTimeout.java b/test/com/sun/jdi/AcceptTimeout.java --- a/test/com/sun/jdi/AcceptTimeout.java +++ b/test/com/sun/jdi/AcceptTimeout.java @@ -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; diff --git a/test/com/sun/jdi/AccessSpecifierTest.java b/test/com/sun/jdi/AccessSpecifierTest.java --- a/test/com/sun/jdi/AccessSpecifierTest.java +++ b/test/com/sun/jdi/AccessSpecifierTest.java @@ -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 diff --git a/test/com/sun/jdi/AfterThreadDeathTest.java b/test/com/sun/jdi/AfterThreadDeathTest.java --- a/test/com/sun/jdi/AfterThreadDeathTest.java +++ b/test/com/sun/jdi/AfterThreadDeathTest.java @@ -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 diff --git a/test/com/sun/jdi/AllLineLocations.java b/test/com/sun/jdi/AllLineLocations.java --- a/test/com/sun/jdi/AllLineLocations.java +++ b/test/com/sun/jdi/AllLineLocations.java @@ -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 diff --git a/test/com/sun/jdi/ArrayRangeTest.java b/test/com/sun/jdi/ArrayRangeTest.java --- a/test/com/sun/jdi/ArrayRangeTest.java +++ b/test/com/sun/jdi/ArrayRangeTest.java @@ -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 diff --git a/test/com/sun/jdi/BacktraceFieldTest.java b/test/com/sun/jdi/BacktraceFieldTest.java --- a/test/com/sun/jdi/BacktraceFieldTest.java +++ b/test/com/sun/jdi/BacktraceFieldTest.java @@ -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 diff --git a/test/com/sun/jdi/BadHandshakeTest.java b/test/com/sun/jdi/BadHandshakeTest.java --- a/test/com/sun/jdi/BadHandshakeTest.java +++ b/test/com/sun/jdi/BadHandshakeTest.java @@ -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 */ diff --git a/test/com/sun/jdi/BreakpointTest.java b/test/com/sun/jdi/BreakpointTest.java --- a/test/com/sun/jdi/BreakpointTest.java +++ b/test/com/sun/jdi/BreakpointTest.java @@ -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; diff --git a/test/com/sun/jdi/ClassLoaderClassesTest.java b/test/com/sun/jdi/ClassLoaderClassesTest.java --- a/test/com/sun/jdi/ClassLoaderClassesTest.java +++ b/test/com/sun/jdi/ClassLoaderClassesTest.java @@ -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 diff --git a/test/com/sun/jdi/ClassesByName.java b/test/com/sun/jdi/ClassesByName.java --- a/test/com/sun/jdi/ClassesByName.java +++ b/test/com/sun/jdi/ClassesByName.java @@ -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 diff --git a/test/com/sun/jdi/ClassesByName2Test.java b/test/com/sun/jdi/ClassesByName2Test.java --- a/test/com/sun/jdi/ClassesByName2Test.java +++ b/test/com/sun/jdi/ClassesByName2Test.java @@ -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 diff --git a/test/com/sun/jdi/CompatibleConnectors.java b/test/com/sun/jdi/CompatibleConnectors.java --- a/test/com/sun/jdi/CompatibleConnectors.java +++ b/test/com/sun/jdi/CompatibleConnectors.java @@ -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.*; diff --git a/test/com/sun/jdi/ConnectedVMs.java b/test/com/sun/jdi/ConnectedVMs.java --- a/test/com/sun/jdi/ConnectedVMs.java +++ b/test/com/sun/jdi/ConnectedVMs.java @@ -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 diff --git a/test/com/sun/jdi/ConstantPoolInfo.java b/test/com/sun/jdi/ConstantPoolInfo.java --- a/test/com/sun/jdi/ConstantPoolInfo.java +++ b/test/com/sun/jdi/ConstantPoolInfo.java @@ -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 diff --git a/test/com/sun/jdi/CountEvent.java b/test/com/sun/jdi/CountEvent.java --- a/test/com/sun/jdi/CountEvent.java +++ b/test/com/sun/jdi/CountEvent.java @@ -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 diff --git a/test/com/sun/jdi/CountFilterTest.java b/test/com/sun/jdi/CountFilterTest.java --- a/test/com/sun/jdi/CountFilterTest.java +++ b/test/com/sun/jdi/CountFilterTest.java @@ -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 diff --git a/test/com/sun/jdi/DebuggerThreadTest.java b/test/com/sun/jdi/DebuggerThreadTest.java --- a/test/com/sun/jdi/DebuggerThreadTest.java +++ b/test/com/sun/jdi/DebuggerThreadTest.java @@ -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 diff --git a/test/com/sun/jdi/DeleteAllBkptsTest.java b/test/com/sun/jdi/DeleteAllBkptsTest.java --- a/test/com/sun/jdi/DeleteAllBkptsTest.java +++ b/test/com/sun/jdi/DeleteAllBkptsTest.java @@ -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 diff --git a/test/com/sun/jdi/DeleteEventRequestsTest.java b/test/com/sun/jdi/DeleteEventRequestsTest.java --- a/test/com/sun/jdi/DeleteEventRequestsTest.java +++ b/test/com/sun/jdi/DeleteEventRequestsTest.java @@ -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 diff --git a/test/com/sun/jdi/DoubleAgentTest.java b/test/com/sun/jdi/DoubleAgentTest.java --- a/test/com/sun/jdi/DoubleAgentTest.java +++ b/test/com/sun/jdi/DoubleAgentTest.java @@ -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 diff --git a/test/com/sun/jdi/EarlyReturnNegativeTest.java b/test/com/sun/jdi/EarlyReturnNegativeTest.java --- a/test/com/sun/jdi/EarlyReturnNegativeTest.java +++ b/test/com/sun/jdi/EarlyReturnNegativeTest.java @@ -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 diff --git a/test/com/sun/jdi/EarlyReturnTest.java b/test/com/sun/jdi/EarlyReturnTest.java --- a/test/com/sun/jdi/EarlyReturnTest.java +++ b/test/com/sun/jdi/EarlyReturnTest.java @@ -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 diff --git a/test/com/sun/jdi/EnumTest.java b/test/com/sun/jdi/EnumTest.java --- a/test/com/sun/jdi/EnumTest.java +++ b/test/com/sun/jdi/EnumTest.java @@ -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 diff --git a/test/com/sun/jdi/EventQueueDisconnectTest.java b/test/com/sun/jdi/EventQueueDisconnectTest.java --- a/test/com/sun/jdi/EventQueueDisconnectTest.java +++ b/test/com/sun/jdi/EventQueueDisconnectTest.java @@ -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 diff --git a/test/com/sun/jdi/ExceptionEvents.java b/test/com/sun/jdi/ExceptionEvents.java --- a/test/com/sun/jdi/ExceptionEvents.java +++ b/test/com/sun/jdi/ExceptionEvents.java @@ -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 * diff --git a/test/com/sun/jdi/ExclusiveBind.java b/test/com/sun/jdi/ExclusiveBind.java --- a/test/com/sun/jdi/ExclusiveBind.java +++ b/test/com/sun/jdi/ExclusiveBind.java @@ -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 */ diff --git a/test/com/sun/jdi/ExpiredRequestDeletionTest.java b/test/com/sun/jdi/ExpiredRequestDeletionTest.java --- a/test/com/sun/jdi/ExpiredRequestDeletionTest.java +++ b/test/com/sun/jdi/ExpiredRequestDeletionTest.java @@ -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 diff --git a/test/com/sun/jdi/FieldWatchpoints.java b/test/com/sun/jdi/FieldWatchpoints.java --- a/test/com/sun/jdi/FieldWatchpoints.java +++ b/test/com/sun/jdi/FieldWatchpoints.java @@ -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 diff --git a/test/com/sun/jdi/FilterMatch.java b/test/com/sun/jdi/FilterMatch.java --- a/test/com/sun/jdi/FilterMatch.java +++ b/test/com/sun/jdi/FilterMatch.java @@ -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 diff --git a/test/com/sun/jdi/FilterNoMatch.java b/test/com/sun/jdi/FilterNoMatch.java --- a/test/com/sun/jdi/FilterNoMatch.java +++ b/test/com/sun/jdi/FilterNoMatch.java @@ -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 diff --git a/test/com/sun/jdi/FinalLocalsTest.java b/test/com/sun/jdi/FinalLocalsTest.java --- a/test/com/sun/jdi/FinalLocalsTest.java +++ b/test/com/sun/jdi/FinalLocalsTest.java @@ -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 diff --git a/test/com/sun/jdi/FinalizerTest.java b/test/com/sun/jdi/FinalizerTest.java --- a/test/com/sun/jdi/FinalizerTest.java +++ b/test/com/sun/jdi/FinalizerTest.java @@ -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 * diff --git a/test/com/sun/jdi/FramesTest.java b/test/com/sun/jdi/FramesTest.java --- a/test/com/sun/jdi/FramesTest.java +++ b/test/com/sun/jdi/FramesTest.java @@ -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 diff --git a/test/com/sun/jdi/GenericsTest.java b/test/com/sun/jdi/GenericsTest.java --- a/test/com/sun/jdi/GenericsTest.java +++ b/test/com/sun/jdi/GenericsTest.java @@ -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 diff --git a/test/com/sun/jdi/GetLocalVariables2Test.java b/test/com/sun/jdi/GetLocalVariables2Test.java --- a/test/com/sun/jdi/GetLocalVariables2Test.java +++ b/test/com/sun/jdi/GetLocalVariables2Test.java @@ -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 diff --git a/test/com/sun/jdi/GetUninitializedStringValue.java b/test/com/sun/jdi/GetUninitializedStringValue.java --- a/test/com/sun/jdi/GetUninitializedStringValue.java +++ b/test/com/sun/jdi/GetUninitializedStringValue.java @@ -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 diff --git a/test/com/sun/jdi/HomeTest.java b/test/com/sun/jdi/HomeTest.java --- a/test/com/sun/jdi/HomeTest.java +++ b/test/com/sun/jdi/HomeTest.java @@ -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 diff --git a/test/com/sun/jdi/InstanceFilter.java b/test/com/sun/jdi/InstanceFilter.java --- a/test/com/sun/jdi/InstanceFilter.java +++ b/test/com/sun/jdi/InstanceFilter.java @@ -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/Jim Holmlund * + * @modules jdk.jdi * @run build TestScaffold VMConnection TargetAdapter TargetListener * @run compile -g InstanceFilter.java * @run driver InstanceFilter diff --git a/test/com/sun/jdi/InstancesTest.java b/test/com/sun/jdi/InstancesTest.java --- a/test/com/sun/jdi/InstancesTest.java +++ b/test/com/sun/jdi/InstancesTest.java @@ -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 diff --git a/test/com/sun/jdi/InterfaceMethodsTest.java b/test/com/sun/jdi/InterfaceMethodsTest.java --- a/test/com/sun/jdi/InterfaceMethodsTest.java +++ b/test/com/sun/jdi/InterfaceMethodsTest.java @@ -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 diff --git a/test/com/sun/jdi/InterruptHangTest.java b/test/com/sun/jdi/InterruptHangTest.java --- a/test/com/sun/jdi/InterruptHangTest.java +++ b/test/com/sun/jdi/InterruptHangTest.java @@ -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 diff --git a/test/com/sun/jdi/InvokeHangTest.java b/test/com/sun/jdi/InvokeHangTest.java --- a/test/com/sun/jdi/InvokeHangTest.java +++ b/test/com/sun/jdi/InvokeHangTest.java @@ -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 diff --git a/test/com/sun/jdi/InvokeTest.java b/test/com/sun/jdi/InvokeTest.java --- a/test/com/sun/jdi/InvokeTest.java +++ b/test/com/sun/jdi/InvokeTest.java @@ -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 diff --git a/test/com/sun/jdi/JITDebug.sh b/test/com/sun/jdi/JITDebug.sh --- a/test/com/sun/jdi/JITDebug.sh +++ b/test/com/sun/jdi/JITDebug.sh @@ -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 diff --git a/test/com/sun/jdi/Java_gTest.java b/test/com/sun/jdi/Java_gTest.java --- a/test/com/sun/jdi/Java_gTest.java +++ b/test/com/sun/jdi/Java_gTest.java @@ -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 diff --git a/test/com/sun/jdi/LambdaBreakpointTest.java b/test/com/sun/jdi/LambdaBreakpointTest.java --- a/test/com/sun/jdi/LambdaBreakpointTest.java +++ b/test/com/sun/jdi/LambdaBreakpointTest.java @@ -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) { diff --git a/test/com/sun/jdi/LambdaStepTest.java b/test/com/sun/jdi/LambdaStepTest.java --- a/test/com/sun/jdi/LambdaStepTest.java +++ b/test/com/sun/jdi/LambdaStepTest.java @@ -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 diff --git a/test/com/sun/jdi/LaunchCommandLine.java b/test/com/sun/jdi/LaunchCommandLine.java --- a/test/com/sun/jdi/LaunchCommandLine.java +++ b/test/com/sun/jdi/LaunchCommandLine.java @@ -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 diff --git a/test/com/sun/jdi/LineNumberInfo.java b/test/com/sun/jdi/LineNumberInfo.java --- a/test/com/sun/jdi/LineNumberInfo.java +++ b/test/com/sun/jdi/LineNumberInfo.java @@ -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 * diff --git a/test/com/sun/jdi/LineNumberOnBraceTest.java b/test/com/sun/jdi/LineNumberOnBraceTest.java --- a/test/com/sun/jdi/LineNumberOnBraceTest.java +++ b/test/com/sun/jdi/LineNumberOnBraceTest.java @@ -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){ diff --git a/test/com/sun/jdi/ListenAddress.java b/test/com/sun/jdi/ListenAddress.java --- a/test/com/sun/jdi/ListenAddress.java +++ b/test/com/sun/jdi/ListenAddress.java @@ -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; diff --git a/test/com/sun/jdi/LocalVariableEqual.java b/test/com/sun/jdi/LocalVariableEqual.java --- a/test/com/sun/jdi/LocalVariableEqual.java +++ b/test/com/sun/jdi/LocalVariableEqual.java @@ -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 diff --git a/test/com/sun/jdi/LocationTest.java b/test/com/sun/jdi/LocationTest.java --- a/test/com/sun/jdi/LocationTest.java +++ b/test/com/sun/jdi/LocationTest.java @@ -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 diff --git a/test/com/sun/jdi/MethodEntryExitEvents.java b/test/com/sun/jdi/MethodEntryExitEvents.java --- a/test/com/sun/jdi/MethodEntryExitEvents.java +++ b/test/com/sun/jdi/MethodEntryExitEvents.java @@ -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 diff --git a/test/com/sun/jdi/MethodExitReturnValuesTest.java b/test/com/sun/jdi/MethodExitReturnValuesTest.java --- a/test/com/sun/jdi/MethodExitReturnValuesTest.java +++ b/test/com/sun/jdi/MethodExitReturnValuesTest.java @@ -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 diff --git a/test/com/sun/jdi/MixedSuspendTest.sh b/test/com/sun/jdi/MixedSuspendTest.sh --- a/test/com/sun/jdi/MixedSuspendTest.sh +++ b/test/com/sun/jdi/MixedSuspendTest.sh @@ -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 diff --git a/test/com/sun/jdi/ModificationWatchpoints.java b/test/com/sun/jdi/ModificationWatchpoints.java --- a/test/com/sun/jdi/ModificationWatchpoints.java +++ b/test/com/sun/jdi/ModificationWatchpoints.java @@ -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 diff --git a/test/com/sun/jdi/MonitorEventTest.java b/test/com/sun/jdi/MonitorEventTest.java --- a/test/com/sun/jdi/MonitorEventTest.java +++ b/test/com/sun/jdi/MonitorEventTest.java @@ -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 diff --git a/test/com/sun/jdi/MonitorFrameInfo.java b/test/com/sun/jdi/MonitorFrameInfo.java --- a/test/com/sun/jdi/MonitorFrameInfo.java +++ b/test/com/sun/jdi/MonitorFrameInfo.java @@ -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 diff --git a/test/com/sun/jdi/MultiBreakpointsTest.java b/test/com/sun/jdi/MultiBreakpointsTest.java --- a/test/com/sun/jdi/MultiBreakpointsTest.java +++ b/test/com/sun/jdi/MultiBreakpointsTest.java @@ -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 diff --git a/test/com/sun/jdi/NativeInstanceFilter.java b/test/com/sun/jdi/NativeInstanceFilter.java --- a/test/com/sun/jdi/NativeInstanceFilter.java +++ b/test/com/sun/jdi/NativeInstanceFilter.java @@ -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 diff --git a/test/com/sun/jdi/NewInstanceTest.java b/test/com/sun/jdi/NewInstanceTest.java --- a/test/com/sun/jdi/NewInstanceTest.java +++ b/test/com/sun/jdi/NewInstanceTest.java @@ -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 diff --git a/test/com/sun/jdi/NoLaunchOptionTest.java b/test/com/sun/jdi/NoLaunchOptionTest.java --- a/test/com/sun/jdi/NoLaunchOptionTest.java +++ b/test/com/sun/jdi/NoLaunchOptionTest.java @@ -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 diff --git a/test/com/sun/jdi/NoLocInfoTest.java b/test/com/sun/jdi/NoLocInfoTest.java --- a/test/com/sun/jdi/NoLocInfoTest.java +++ b/test/com/sun/jdi/NoLocInfoTest.java @@ -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 diff --git a/test/com/sun/jdi/NullThreadGroupNameTest.java b/test/com/sun/jdi/NullThreadGroupNameTest.java --- a/test/com/sun/jdi/NullThreadGroupNameTest.java +++ b/test/com/sun/jdi/NullThreadGroupNameTest.java @@ -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 */ diff --git a/test/com/sun/jdi/OnThrowTest.java b/test/com/sun/jdi/OnThrowTest.java --- a/test/com/sun/jdi/OnThrowTest.java +++ b/test/com/sun/jdi/OnThrowTest.java @@ -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 diff --git a/test/com/sun/jdi/OptionTest.java b/test/com/sun/jdi/OptionTest.java --- a/test/com/sun/jdi/OptionTest.java +++ b/test/com/sun/jdi/OptionTest.java @@ -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 diff --git a/test/com/sun/jdi/PopAndInvokeTest.java b/test/com/sun/jdi/PopAndInvokeTest.java --- a/test/com/sun/jdi/PopAndInvokeTest.java +++ b/test/com/sun/jdi/PopAndInvokeTest.java @@ -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 * diff --git a/test/com/sun/jdi/PopAndStepTest.java b/test/com/sun/jdi/PopAndStepTest.java --- a/test/com/sun/jdi/PopAndStepTest.java +++ b/test/com/sun/jdi/PopAndStepTest.java @@ -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); diff --git a/test/com/sun/jdi/PopAsynchronousTest.java b/test/com/sun/jdi/PopAsynchronousTest.java --- a/test/com/sun/jdi/PopAsynchronousTest.java +++ b/test/com/sun/jdi/PopAsynchronousTest.java @@ -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 diff --git a/test/com/sun/jdi/PopSynchronousTest.java b/test/com/sun/jdi/PopSynchronousTest.java --- a/test/com/sun/jdi/PopSynchronousTest.java +++ b/test/com/sun/jdi/PopSynchronousTest.java @@ -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 diff --git a/test/com/sun/jdi/ProcessAttachTest.java b/test/com/sun/jdi/ProcessAttachTest.java --- a/test/com/sun/jdi/ProcessAttachTest.java +++ b/test/com/sun/jdi/ProcessAttachTest.java @@ -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 */ diff --git a/test/com/sun/jdi/RedefineCrossEvent.java b/test/com/sun/jdi/RedefineCrossEvent.java --- a/test/com/sun/jdi/RedefineCrossEvent.java +++ b/test/com/sun/jdi/RedefineCrossEvent.java @@ -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 diff --git a/test/com/sun/jdi/RedefineCrossStart.java b/test/com/sun/jdi/RedefineCrossStart.java --- a/test/com/sun/jdi/RedefineCrossStart.java +++ b/test/com/sun/jdi/RedefineCrossStart.java @@ -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 diff --git a/test/com/sun/jdi/ReferrersTest.java b/test/com/sun/jdi/ReferrersTest.java --- a/test/com/sun/jdi/ReferrersTest.java +++ b/test/com/sun/jdi/ReferrersTest.java @@ -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 diff --git a/test/com/sun/jdi/RepStep.java b/test/com/sun/jdi/RepStep.java --- a/test/com/sun/jdi/RepStep.java +++ b/test/com/sun/jdi/RepStep.java @@ -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 * diff --git a/test/com/sun/jdi/RequestReflectionTest.java b/test/com/sun/jdi/RequestReflectionTest.java --- a/test/com/sun/jdi/RequestReflectionTest.java +++ b/test/com/sun/jdi/RequestReflectionTest.java @@ -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 diff --git a/test/com/sun/jdi/ResumeOneThreadTest.java b/test/com/sun/jdi/ResumeOneThreadTest.java --- a/test/com/sun/jdi/ResumeOneThreadTest.java +++ b/test/com/sun/jdi/ResumeOneThreadTest.java @@ -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 diff --git a/test/com/sun/jdi/RunToExit.java b/test/com/sun/jdi/RunToExit.java --- a/test/com/sun/jdi/RunToExit.java +++ b/test/com/sun/jdi/RunToExit.java @@ -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 */ diff --git a/test/com/sun/jdi/SDENullTest.java b/test/com/sun/jdi/SDENullTest.java --- a/test/com/sun/jdi/SDENullTest.java +++ b/test/com/sun/jdi/SDENullTest.java @@ -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 diff --git a/test/com/sun/jdi/SimulResumerTest.java b/test/com/sun/jdi/SimulResumerTest.java --- a/test/com/sun/jdi/SimulResumerTest.java +++ b/test/com/sun/jdi/SimulResumerTest.java @@ -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 diff --git a/test/com/sun/jdi/SourceNameFilterTest.java b/test/com/sun/jdi/SourceNameFilterTest.java --- a/test/com/sun/jdi/SourceNameFilterTest.java +++ b/test/com/sun/jdi/SourceNameFilterTest.java @@ -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 diff --git a/test/com/sun/jdi/StepTest.java b/test/com/sun/jdi/StepTest.java --- a/test/com/sun/jdi/StepTest.java +++ b/test/com/sun/jdi/StepTest.java @@ -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 diff --git a/test/com/sun/jdi/SuspendNoFlagTest.java b/test/com/sun/jdi/SuspendNoFlagTest.java --- a/test/com/sun/jdi/SuspendNoFlagTest.java +++ b/test/com/sun/jdi/SuspendNoFlagTest.java @@ -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 diff --git a/test/com/sun/jdi/SuspendThreadTest.java b/test/com/sun/jdi/SuspendThreadTest.java --- a/test/com/sun/jdi/SuspendThreadTest.java +++ b/test/com/sun/jdi/SuspendThreadTest.java @@ -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 diff --git a/test/com/sun/jdi/TemplateTest.java b/test/com/sun/jdi/TemplateTest.java --- a/test/com/sun/jdi/TemplateTest.java +++ b/test/com/sun/jdi/TemplateTest.java @@ -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 * + * @modules jdk.jdi * @run build TestScaffold VMConnection TargetListener TargetAdapter * @run compile -g TemplateTest.java * @run driver TemplateTest diff --git a/test/com/sun/jdi/ThreadGroupTest.java b/test/com/sun/jdi/ThreadGroupTest.java --- a/test/com/sun/jdi/ThreadGroupTest.java +++ b/test/com/sun/jdi/ThreadGroupTest.java @@ -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 diff --git a/test/com/sun/jdi/TwoThreadsTest.java b/test/com/sun/jdi/TwoThreadsTest.java --- a/test/com/sun/jdi/TwoThreadsTest.java +++ b/test/com/sun/jdi/TwoThreadsTest.java @@ -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 diff --git a/test/com/sun/jdi/UTF8Test.java b/test/com/sun/jdi/UTF8Test.java --- a/test/com/sun/jdi/UTF8Test.java +++ b/test/com/sun/jdi/UTF8Test.java @@ -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 diff --git a/test/com/sun/jdi/UnpreparedByName.java b/test/com/sun/jdi/UnpreparedByName.java --- a/test/com/sun/jdi/UnpreparedByName.java +++ b/test/com/sun/jdi/UnpreparedByName.java @@ -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 diff --git a/test/com/sun/jdi/UnpreparedClasses.java b/test/com/sun/jdi/UnpreparedClasses.java --- a/test/com/sun/jdi/UnpreparedClasses.java +++ b/test/com/sun/jdi/UnpreparedClasses.java @@ -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 diff --git a/test/com/sun/jdi/VMDeathLastTest.java b/test/com/sun/jdi/VMDeathLastTest.java --- a/test/com/sun/jdi/VMDeathLastTest.java +++ b/test/com/sun/jdi/VMDeathLastTest.java @@ -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 diff --git a/test/com/sun/jdi/VMDeathRequestTest.java b/test/com/sun/jdi/VMDeathRequestTest.java --- a/test/com/sun/jdi/VMDeathRequestTest.java +++ b/test/com/sun/jdi/VMDeathRequestTest.java @@ -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 diff --git a/test/com/sun/jdi/VarargsTest.java b/test/com/sun/jdi/VarargsTest.java --- a/test/com/sun/jdi/VarargsTest.java +++ b/test/com/sun/jdi/VarargsTest.java @@ -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 diff --git a/test/com/sun/jdi/Vars.java b/test/com/sun/jdi/Vars.java --- a/test/com/sun/jdi/Vars.java +++ b/test/com/sun/jdi/Vars.java @@ -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 diff --git a/test/com/sun/jdi/VisibleMethods.java b/test/com/sun/jdi/VisibleMethods.java --- a/test/com/sun/jdi/VisibleMethods.java +++ b/test/com/sun/jdi/VisibleMethods.java @@ -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 diff --git a/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java b/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java --- a/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java +++ b/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java @@ -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 */ diff --git a/test/com/sun/jdi/connect/spi/GeneratedConnectors.java b/test/com/sun/jdi/connect/spi/GeneratedConnectors.java --- a/test/com/sun/jdi/connect/spi/GeneratedConnectors.java +++ b/test/com/sun/jdi/connect/spi/GeneratedConnectors.java @@ -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 */ diff --git a/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh b/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh --- a/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh +++ b/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh @@ -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 diff --git a/test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java b/test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java --- a/test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java +++ b/test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java @@ -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); diff --git a/test/com/sun/jdi/redefine/RedefineTest.java b/test/com/sun/jdi/redefine/RedefineTest.java --- a/test/com/sun/jdi/redefine/RedefineTest.java +++ b/test/com/sun/jdi/redefine/RedefineTest.java @@ -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 diff --git a/test/com/sun/jdi/redefineMethod/RedefineTest.java b/test/com/sun/jdi/redefineMethod/RedefineTest.java --- a/test/com/sun/jdi/redefineMethod/RedefineTest.java +++ b/test/com/sun/jdi/redefineMethod/RedefineTest.java @@ -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 diff --git a/test/com/sun/jdi/sde/FilterMangleTest.java b/test/com/sun/jdi/sde/FilterMangleTest.java --- a/test/com/sun/jdi/sde/FilterMangleTest.java +++ b/test/com/sun/jdi/sde/FilterMangleTest.java @@ -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 diff --git a/test/com/sun/jdi/sde/MangleStepTest.java b/test/com/sun/jdi/sde/MangleStepTest.java --- a/test/com/sun/jdi/sde/MangleStepTest.java +++ b/test/com/sun/jdi/sde/MangleStepTest.java @@ -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 diff --git a/test/com/sun/jdi/sde/MangleTest.java b/test/com/sun/jdi/sde/MangleTest.java --- a/test/com/sun/jdi/sde/MangleTest.java +++ b/test/com/sun/jdi/sde/MangleTest.java @@ -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 diff --git a/test/com/sun/jdi/sde/SourceDebugExtensionTest.java b/test/com/sun/jdi/sde/SourceDebugExtensionTest.java --- a/test/com/sun/jdi/sde/SourceDebugExtensionTest.java +++ b/test/com/sun/jdi/sde/SourceDebugExtensionTest.java @@ -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 diff --git a/test/com/sun/jdi/sde/TemperatureTableTest.java b/test/com/sun/jdi/sde/TemperatureTableTest.java --- a/test/com/sun/jdi/sde/TemperatureTableTest.java +++ b/test/com/sun/jdi/sde/TemperatureTableTest.java @@ -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 diff --git a/test/com/sun/jmx/remote/CCAdminReconnectTest.java b/test/com/sun/jmx/remote/CCAdminReconnectTest.java --- a/test/com/sun/jmx/remote/CCAdminReconnectTest.java +++ b/test/com/sun/jmx/remote/CCAdminReconnectTest.java @@ -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 diff --git a/test/com/sun/jmx/remote/NotificationMarshalVersions/TestSerializationMismatch.java b/test/com/sun/jmx/remote/NotificationMarshalVersions/TestSerializationMismatch.java --- a/test/com/sun/jmx/remote/NotificationMarshalVersions/TestSerializationMismatch.java +++ b/test/com/sun/jmx/remote/NotificationMarshalVersions/TestSerializationMismatch.java @@ -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 * diff --git a/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanDoubleInvocationTest.java b/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanDoubleInvocationTest.java --- a/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanDoubleInvocationTest.java +++ b/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanDoubleInvocationTest.java @@ -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 */ diff --git a/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanInvocationTest.java b/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanInvocationTest.java --- a/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanInvocationTest.java +++ b/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanInvocationTest.java @@ -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 */ diff --git a/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanPermissionsTest.java b/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanPermissionsTest.java --- a/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanPermissionsTest.java +++ b/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanPermissionsTest.java @@ -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 */ diff --git a/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanTest.java b/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanTest.java --- a/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanTest.java +++ b/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanTest.java @@ -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 */ diff --git a/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationContentTest.java b/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationContentTest.java --- a/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationContentTest.java +++ b/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationContentTest.java @@ -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 */ diff --git a/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationTest.java b/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationTest.java --- a/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationTest.java +++ b/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationTest.java @@ -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 */ diff --git a/test/com/sun/management/GarbageCollectorMXBean/LastGCInfo.java b/test/com/sun/management/GarbageCollectorMXBean/LastGCInfo.java --- a/test/com/sun/management/GarbageCollectorMXBean/LastGCInfo.java +++ b/test/com/sun/management/GarbageCollectorMXBean/LastGCInfo.java @@ -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() diff --git a/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java b/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java --- a/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java +++ b/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java @@ -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 */ diff --git a/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh b/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh --- a/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh +++ b/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh @@ -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 diff --git a/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticOptions.java b/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticOptions.java --- a/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticOptions.java +++ b/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticOptions.java @@ -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 */ diff --git a/test/com/sun/management/HotSpotDiagnosticMXBean/GetDoubleVMOption.java b/test/com/sun/management/HotSpotDiagnosticMXBean/GetDoubleVMOption.java --- a/test/com/sun/management/HotSpotDiagnosticMXBean/GetDoubleVMOption.java +++ b/test/com/sun/management/HotSpotDiagnosticMXBean/GetDoubleVMOption.java @@ -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 */ diff --git a/test/com/sun/management/HotSpotDiagnosticMXBean/GetVMOption.java b/test/com/sun/management/HotSpotDiagnosticMXBean/GetVMOption.java --- a/test/com/sun/management/HotSpotDiagnosticMXBean/GetVMOption.java +++ b/test/com/sun/management/HotSpotDiagnosticMXBean/GetVMOption.java @@ -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 */ diff --git a/test/com/sun/management/HotSpotDiagnosticMXBean/SetAllVMOptions.java b/test/com/sun/management/HotSpotDiagnosticMXBean/SetAllVMOptions.java --- a/test/com/sun/management/HotSpotDiagnosticMXBean/SetAllVMOptions.java +++ b/test/com/sun/management/HotSpotDiagnosticMXBean/SetAllVMOptions.java @@ -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 */ diff --git a/test/com/sun/management/HotSpotDiagnosticMXBean/SetVMOption.java b/test/com/sun/management/HotSpotDiagnosticMXBean/SetVMOption.java --- a/test/com/sun/management/HotSpotDiagnosticMXBean/SetVMOption.java +++ b/test/com/sun/management/HotSpotDiagnosticMXBean/SetVMOption.java @@ -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 */ diff --git a/test/com/sun/management/OperatingSystemMXBean/GetCommittedVirtualMemorySize.java b/test/com/sun/management/OperatingSystemMXBean/GetCommittedVirtualMemorySize.java --- a/test/com/sun/management/OperatingSystemMXBean/GetCommittedVirtualMemorySize.java +++ b/test/com/sun/management/OperatingSystemMXBean/GetCommittedVirtualMemorySize.java @@ -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 */ /* diff --git a/test/com/sun/management/OperatingSystemMXBean/GetFreePhysicalMemorySize.java b/test/com/sun/management/OperatingSystemMXBean/GetFreePhysicalMemorySize.java --- a/test/com/sun/management/OperatingSystemMXBean/GetFreePhysicalMemorySize.java +++ b/test/com/sun/management/OperatingSystemMXBean/GetFreePhysicalMemorySize.java @@ -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 */ /* diff --git a/test/com/sun/management/OperatingSystemMXBean/GetFreeSwapSpaceSize.java b/test/com/sun/management/OperatingSystemMXBean/GetFreeSwapSpaceSize.java --- a/test/com/sun/management/OperatingSystemMXBean/GetFreeSwapSpaceSize.java +++ b/test/com/sun/management/OperatingSystemMXBean/GetFreeSwapSpaceSize.java @@ -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 */ /* diff --git a/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java b/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java --- a/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java +++ b/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java @@ -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 */ diff --git a/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuTime.java b/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuTime.java --- a/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuTime.java +++ b/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuTime.java @@ -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 */ /* diff --git a/test/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java b/test/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java --- a/test/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java +++ b/test/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java @@ -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 */ diff --git a/test/com/sun/management/OperatingSystemMXBean/GetTotalPhysicalMemorySize.java b/test/com/sun/management/OperatingSystemMXBean/GetTotalPhysicalMemorySize.java --- a/test/com/sun/management/OperatingSystemMXBean/GetTotalPhysicalMemorySize.java +++ b/test/com/sun/management/OperatingSystemMXBean/GetTotalPhysicalMemorySize.java @@ -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 */ /* diff --git a/test/com/sun/management/OperatingSystemMXBean/MemoryStatusOverflow.java b/test/com/sun/management/OperatingSystemMXBean/MemoryStatusOverflow.java --- a/test/com/sun/management/OperatingSystemMXBean/MemoryStatusOverflow.java +++ b/test/com/sun/management/OperatingSystemMXBean/MemoryStatusOverflow.java @@ -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 */ diff --git a/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.java b/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.java --- a/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.java +++ b/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.java @@ -27,6 +27,7 @@ * @summary Basic unit test of OperatingSystemMXBean.getTotalSwapSpaceSize() * * @library /lib/testlibrary + * @modules jdk.management * @build TestTotalSwap jdk.testlibrary.* * @run main TestTotalSwap * diff --git a/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java b/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java --- a/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java +++ b/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java @@ -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.*; diff --git a/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java b/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java --- a/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java +++ b/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java @@ -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.*; diff --git a/test/com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java b/test/com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java --- a/test/com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java +++ b/test/com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java @@ -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.*; diff --git a/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh b/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh --- a/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh +++ b/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh @@ -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 # diff --git a/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh b/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh --- a/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh +++ b/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh @@ -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 # diff --git a/test/com/sun/tools/attach/BasicTests.java b/test/com/sun/tools/attach/BasicTests.java --- a/test/com/sun/tools/attach/BasicTests.java +++ b/test/com/sun/tools/attach/BasicTests.java @@ -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 * diff --git a/test/com/sun/tools/attach/PermissionTest.java b/test/com/sun/tools/attach/PermissionTest.java --- a/test/com/sun/tools/attach/PermissionTest.java +++ b/test/com/sun/tools/attach/PermissionTest.java @@ -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 * diff --git a/test/com/sun/tools/attach/ProviderTest.java b/test/com/sun/tools/attach/ProviderTest.java --- a/test/com/sun/tools/attach/ProviderTest.java +++ b/test/com/sun/tools/attach/ProviderTest.java @@ -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 * diff --git a/test/com/sun/tools/attach/StartManagementAgent.java b/test/com/sun/tools/attach/StartManagementAgent.java --- a/test/com/sun/tools/attach/StartManagementAgent.java +++ b/test/com/sun/tools/attach/StartManagementAgent.java @@ -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 */ diff --git a/test/com/sun/tools/attach/TempDirTest.java b/test/com/sun/tools/attach/TempDirTest.java --- a/test/com/sun/tools/attach/TempDirTest.java +++ b/test/com/sun/tools/attach/TempDirTest.java @@ -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 */ diff --git a/test/demo/jvmti/minst/MinstTest.java b/test/demo/jvmti/minst/MinstTest.java --- a/test/demo/jvmti/minst/MinstTest.java +++ b/test/demo/jvmti/minst/MinstTest.java @@ -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 */ diff --git a/test/java/lang/instrument/AddTransformerTest.java b/test/java/lang/instrument/AddTransformerTest.java --- a/test/java/lang/instrument/AddTransformerTest.java +++ b/test/java/lang/instrument/AddTransformerTest.java @@ -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 diff --git a/test/java/lang/instrument/AppendToBootstrapClassPathTest.java b/test/java/lang/instrument/AppendToBootstrapClassPathTest.java --- a/test/java/lang/instrument/AppendToBootstrapClassPathTest.java +++ b/test/java/lang/instrument/AppendToBootstrapClassPathTest.java @@ -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 diff --git a/test/java/lang/instrument/AppendToClassPathTest.java b/test/java/lang/instrument/AppendToClassPathTest.java --- a/test/java/lang/instrument/AppendToClassPathTest.java +++ b/test/java/lang/instrument/AppendToClassPathTest.java @@ -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 diff --git a/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh b/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh --- a/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh +++ b/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh @@ -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}" = "" ] diff --git a/test/java/lang/instrument/DaemonThread/TestDaemonThread.java b/test/java/lang/instrument/DaemonThread/TestDaemonThread.java --- a/test/java/lang/instrument/DaemonThread/TestDaemonThread.java +++ b/test/java/lang/instrument/DaemonThread/TestDaemonThread.java @@ -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 diff --git a/test/java/lang/instrument/FromShutdownHook.java b/test/java/lang/instrument/FromShutdownHook.java --- a/test/java/lang/instrument/FromShutdownHook.java +++ b/test/java/lang/instrument/FromShutdownHook.java @@ -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 diff --git a/test/java/lang/instrument/GetAllLoadedClassesTest.java b/test/java/lang/instrument/GetAllLoadedClassesTest.java --- a/test/java/lang/instrument/GetAllLoadedClassesTest.java +++ b/test/java/lang/instrument/GetAllLoadedClassesTest.java @@ -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 diff --git a/test/java/lang/instrument/GetInitiatedClassesTest.java b/test/java/lang/instrument/GetInitiatedClassesTest.java --- a/test/java/lang/instrument/GetInitiatedClassesTest.java +++ b/test/java/lang/instrument/GetInitiatedClassesTest.java @@ -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 diff --git a/test/java/lang/instrument/GetObjectSizeTest.java b/test/java/lang/instrument/GetObjectSizeTest.java --- a/test/java/lang/instrument/GetObjectSizeTest.java +++ b/test/java/lang/instrument/GetObjectSizeTest.java @@ -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 diff --git a/test/java/lang/instrument/IsModifiableClassAgent.java b/test/java/lang/instrument/IsModifiableClassAgent.java --- a/test/java/lang/instrument/IsModifiableClassAgent.java +++ b/test/java/lang/instrument/IsModifiableClassAgent.java @@ -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 diff --git a/test/java/lang/instrument/ManifestTest.sh b/test/java/lang/instrument/ManifestTest.sh --- a/test/java/lang/instrument/ManifestTest.sh +++ b/test/java/lang/instrument/ManifestTest.sh @@ -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 # diff --git a/test/java/lang/instrument/ManyMethodsBenchmarkAgent.java b/test/java/lang/instrument/ManyMethodsBenchmarkAgent.java --- a/test/java/lang/instrument/ManyMethodsBenchmarkAgent.java +++ b/test/java/lang/instrument/ManyMethodsBenchmarkAgent.java @@ -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 diff --git a/test/java/lang/instrument/NativeMethodPrefixAgent.java b/test/java/lang/instrument/NativeMethodPrefixAgent.java --- a/test/java/lang/instrument/NativeMethodPrefixAgent.java +++ b/test/java/lang/instrument/NativeMethodPrefixAgent.java @@ -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 */ diff --git a/test/java/lang/instrument/NoTransformerAddedTest.java b/test/java/lang/instrument/NoTransformerAddedTest.java --- a/test/java/lang/instrument/NoTransformerAddedTest.java +++ b/test/java/lang/instrument/NoTransformerAddedTest.java @@ -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 diff --git a/test/java/lang/instrument/NullGetObjectSizeTest.java b/test/java/lang/instrument/NullGetObjectSizeTest.java --- a/test/java/lang/instrument/NullGetObjectSizeTest.java +++ b/test/java/lang/instrument/NullGetObjectSizeTest.java @@ -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 diff --git a/test/java/lang/instrument/NullRedefineClassesTests.java b/test/java/lang/instrument/NullRedefineClassesTests.java --- a/test/java/lang/instrument/NullRedefineClassesTests.java +++ b/test/java/lang/instrument/NullRedefineClassesTests.java @@ -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 diff --git a/test/java/lang/instrument/NullTransformerAddTest.java b/test/java/lang/instrument/NullTransformerAddTest.java --- a/test/java/lang/instrument/NullTransformerAddTest.java +++ b/test/java/lang/instrument/NullTransformerAddTest.java @@ -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 diff --git a/test/java/lang/instrument/NullTransformerRemoveTest.java b/test/java/lang/instrument/NullTransformerRemoveTest.java --- a/test/java/lang/instrument/NullTransformerRemoveTest.java +++ b/test/java/lang/instrument/NullTransformerRemoveTest.java @@ -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 diff --git a/test/java/lang/instrument/ParallelTransformerLoader.sh b/test/java/lang/instrument/ParallelTransformerLoader.sh --- a/test/java/lang/instrument/ParallelTransformerLoader.sh +++ b/test/java/lang/instrument/ParallelTransformerLoader.sh @@ -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 diff --git a/test/java/lang/instrument/PremainClass/InheritAgent0010.java b/test/java/lang/instrument/PremainClass/InheritAgent0010.java --- a/test/java/lang/instrument/PremainClass/InheritAgent0010.java +++ b/test/java/lang/instrument/PremainClass/InheritAgent0010.java @@ -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 */ diff --git a/test/java/lang/instrument/PremainClass/InheritAgent0011.java b/test/java/lang/instrument/PremainClass/InheritAgent0011.java --- a/test/java/lang/instrument/PremainClass/InheritAgent0011.java +++ b/test/java/lang/instrument/PremainClass/InheritAgent0011.java @@ -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 */ diff --git a/test/java/lang/instrument/PremainClass/InheritAgent0110.java b/test/java/lang/instrument/PremainClass/InheritAgent0110.java --- a/test/java/lang/instrument/PremainClass/InheritAgent0110.java +++ b/test/java/lang/instrument/PremainClass/InheritAgent0110.java @@ -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 */ diff --git a/test/java/lang/instrument/PremainClass/InheritAgent0111.java b/test/java/lang/instrument/PremainClass/InheritAgent0111.java --- a/test/java/lang/instrument/PremainClass/InheritAgent0111.java +++ b/test/java/lang/instrument/PremainClass/InheritAgent0111.java @@ -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 */ diff --git a/test/java/lang/instrument/PremainClass/InheritAgent1000.java b/test/java/lang/instrument/PremainClass/InheritAgent1000.java --- a/test/java/lang/instrument/PremainClass/InheritAgent1000.java +++ b/test/java/lang/instrument/PremainClass/InheritAgent1000.java @@ -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 */ diff --git a/test/java/lang/instrument/PremainClass/InheritAgent1001.java b/test/java/lang/instrument/PremainClass/InheritAgent1001.java --- a/test/java/lang/instrument/PremainClass/InheritAgent1001.java +++ b/test/java/lang/instrument/PremainClass/InheritAgent1001.java @@ -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 */ diff --git a/test/java/lang/instrument/PremainClass/InheritAgent1010.java b/test/java/lang/instrument/PremainClass/InheritAgent1010.java --- a/test/java/lang/instrument/PremainClass/InheritAgent1010.java +++ b/test/java/lang/instrument/PremainClass/InheritAgent1010.java @@ -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 */ diff --git a/test/java/lang/instrument/PremainClass/InheritAgent1011.java b/test/java/lang/instrument/PremainClass/InheritAgent1011.java --- a/test/java/lang/instrument/PremainClass/InheritAgent1011.java +++ b/test/java/lang/instrument/PremainClass/InheritAgent1011.java @@ -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 */ diff --git a/test/java/lang/instrument/PremainClass/InheritAgent1100.java b/test/java/lang/instrument/PremainClass/InheritAgent1100.java --- a/test/java/lang/instrument/PremainClass/InheritAgent1100.java +++ b/test/java/lang/instrument/PremainClass/InheritAgent1100.java @@ -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 */ diff --git a/test/java/lang/instrument/PremainClass/InheritAgent1101.java b/test/java/lang/instrument/PremainClass/InheritAgent1101.java --- a/test/java/lang/instrument/PremainClass/InheritAgent1101.java +++ b/test/java/lang/instrument/PremainClass/InheritAgent1101.java @@ -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 */ diff --git a/test/java/lang/instrument/PremainClass/InheritAgent1110.java b/test/java/lang/instrument/PremainClass/InheritAgent1110.java --- a/test/java/lang/instrument/PremainClass/InheritAgent1110.java +++ b/test/java/lang/instrument/PremainClass/InheritAgent1110.java @@ -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 */ diff --git a/test/java/lang/instrument/PremainClass/InheritAgent1111.java b/test/java/lang/instrument/PremainClass/InheritAgent1111.java --- a/test/java/lang/instrument/PremainClass/InheritAgent1111.java +++ b/test/java/lang/instrument/PremainClass/InheritAgent1111.java @@ -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 */ diff --git a/test/java/lang/instrument/PremainClass/NoPremainAgentTest.java b/test/java/lang/instrument/PremainClass/NoPremainAgentTest.java --- a/test/java/lang/instrument/PremainClass/NoPremainAgentTest.java +++ b/test/java/lang/instrument/PremainClass/NoPremainAgentTest.java @@ -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 diff --git a/test/java/lang/instrument/PremainClass/PremainClassTest.java b/test/java/lang/instrument/PremainClass/PremainClassTest.java --- a/test/java/lang/instrument/PremainClass/PremainClassTest.java +++ b/test/java/lang/instrument/PremainClass/PremainClassTest.java @@ -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 */ diff --git a/test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java b/test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java --- a/test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java +++ b/test/java/lang/instrument/PremainClass/ZeroArgPremainAgentTest.java @@ -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 diff --git a/test/java/lang/instrument/RedefineBigClass.sh b/test/java/lang/instrument/RedefineBigClass.sh --- a/test/java/lang/instrument/RedefineBigClass.sh +++ b/test/java/lang/instrument/RedefineBigClass.sh @@ -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 diff --git a/test/java/lang/instrument/RedefineClassWithNativeMethod.sh b/test/java/lang/instrument/RedefineClassWithNativeMethod.sh --- a/test/java/lang/instrument/RedefineClassWithNativeMethod.sh +++ b/test/java/lang/instrument/RedefineClassWithNativeMethod.sh @@ -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 diff --git a/test/java/lang/instrument/RedefineClassesDisabledTest.java b/test/java/lang/instrument/RedefineClassesDisabledTest.java --- a/test/java/lang/instrument/RedefineClassesDisabledTest.java +++ b/test/java/lang/instrument/RedefineClassesDisabledTest.java @@ -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 diff --git a/test/java/lang/instrument/RedefineClassesTests.java b/test/java/lang/instrument/RedefineClassesTests.java --- a/test/java/lang/instrument/RedefineClassesTests.java +++ b/test/java/lang/instrument/RedefineClassesTests.java @@ -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 diff --git a/test/java/lang/instrument/RedefineMethodAddInvoke.sh b/test/java/lang/instrument/RedefineMethodAddInvoke.sh --- a/test/java/lang/instrument/RedefineMethodAddInvoke.sh +++ b/test/java/lang/instrument/RedefineMethodAddInvoke.sh @@ -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 diff --git a/test/java/lang/instrument/RedefineMethodDelInvoke.sh b/test/java/lang/instrument/RedefineMethodDelInvoke.sh --- a/test/java/lang/instrument/RedefineMethodDelInvoke.sh +++ b/test/java/lang/instrument/RedefineMethodDelInvoke.sh @@ -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 diff --git a/test/java/lang/instrument/RedefineMethodInBacktrace.sh b/test/java/lang/instrument/RedefineMethodInBacktrace.sh --- a/test/java/lang/instrument/RedefineMethodInBacktrace.sh +++ b/test/java/lang/instrument/RedefineMethodInBacktrace.sh @@ -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 diff --git a/test/java/lang/instrument/RedefineMethodInBacktraceApp.java b/test/java/lang/instrument/RedefineMethodInBacktraceApp.java --- a/test/java/lang/instrument/RedefineMethodInBacktraceApp.java +++ b/test/java/lang/instrument/RedefineMethodInBacktraceApp.java @@ -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,7 +31,8 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.concurrent.CountDownLatch; -import sun.management.ManagementFactoryHelper; +import javax.management.MBeanServer; +import javax.management.ObjectName; /** * When an exception is thrown, the JVM collects just enough information @@ -92,11 +93,13 @@ System.out.println(ti); } + MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); + ObjectName name = new ObjectName("com.sun.management:type=DiagnosticCommand"); String[] threadPrintArgs = {}; Object[] dcmdArgs = {threadPrintArgs}; String[] signature = {String[].class.getName()}; - DiagnosticCommandMBean dcmd = ManagementFactoryHelper.getDiagnosticCommandMBean(); - System.out.println(dcmd.invoke("threadPrint", dcmdArgs, signature)); + Object result = mbs.invoke(name, "threadPrint", dcmdArgs, signature); + System.out.println(result); // release the thread stop.countDown(); diff --git a/test/java/lang/instrument/RedefineMethodWithAnnotations.sh b/test/java/lang/instrument/RedefineMethodWithAnnotations.sh --- a/test/java/lang/instrument/RedefineMethodWithAnnotations.sh +++ b/test/java/lang/instrument/RedefineMethodWithAnnotations.sh @@ -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 diff --git a/test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh b/test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh --- a/test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh +++ b/test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh @@ -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 diff --git a/test/java/lang/instrument/RemoveAbsentTransformerTest.java b/test/java/lang/instrument/RemoveAbsentTransformerTest.java --- a/test/java/lang/instrument/RemoveAbsentTransformerTest.java +++ b/test/java/lang/instrument/RemoveAbsentTransformerTest.java @@ -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 diff --git a/test/java/lang/instrument/RemoveTransformerTest.java b/test/java/lang/instrument/RemoveTransformerTest.java --- a/test/java/lang/instrument/RemoveTransformerTest.java +++ b/test/java/lang/instrument/RemoveTransformerTest.java @@ -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 diff --git a/test/java/lang/instrument/RetransformAgent.java b/test/java/lang/instrument/RetransformAgent.java --- a/test/java/lang/instrument/RetransformAgent.java +++ b/test/java/lang/instrument/RetransformAgent.java @@ -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 */ diff --git a/test/java/lang/instrument/RetransformBigClass.sh b/test/java/lang/instrument/RetransformBigClass.sh --- a/test/java/lang/instrument/RetransformBigClass.sh +++ b/test/java/lang/instrument/RetransformBigClass.sh @@ -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 diff --git a/test/java/lang/instrument/SingleTransformerTest.java b/test/java/lang/instrument/SingleTransformerTest.java --- a/test/java/lang/instrument/SingleTransformerTest.java +++ b/test/java/lang/instrument/SingleTransformerTest.java @@ -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 diff --git a/test/java/lang/instrument/StressGetObjectSizeTest.sh b/test/java/lang/instrument/StressGetObjectSizeTest.sh --- a/test/java/lang/instrument/StressGetObjectSizeTest.sh +++ b/test/java/lang/instrument/StressGetObjectSizeTest.sh @@ -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 diff --git a/test/java/lang/instrument/TransformMethodTest.java b/test/java/lang/instrument/TransformMethodTest.java --- a/test/java/lang/instrument/TransformMethodTest.java +++ b/test/java/lang/instrument/TransformMethodTest.java @@ -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 diff --git a/test/java/lang/instrument/TransformerManagementThreadAddTests.java b/test/java/lang/instrument/TransformerManagementThreadAddTests.java --- a/test/java/lang/instrument/TransformerManagementThreadAddTests.java +++ b/test/java/lang/instrument/TransformerManagementThreadAddTests.java @@ -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 diff --git a/test/java/lang/instrument/TransformerManagementThreadRemoveTests.java b/test/java/lang/instrument/TransformerManagementThreadRemoveTests.java --- a/test/java/lang/instrument/TransformerManagementThreadRemoveTests.java +++ b/test/java/lang/instrument/TransformerManagementThreadRemoveTests.java @@ -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 diff --git a/test/java/lang/instrument/VerifyLocalVariableTableOnRetransformTest.sh b/test/java/lang/instrument/VerifyLocalVariableTableOnRetransformTest.sh --- a/test/java/lang/instrument/VerifyLocalVariableTableOnRetransformTest.sh +++ b/test/java/lang/instrument/VerifyLocalVariableTableOnRetransformTest.sh @@ -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 diff --git a/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.sh b/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.sh --- a/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.sh +++ b/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.sh @@ -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}" = "" ] diff --git a/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh b/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh --- a/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh +++ b/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh @@ -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 diff --git a/test/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh b/test/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh --- a/test/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh +++ b/test/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh @@ -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 diff --git a/test/java/lang/management/BufferPoolMXBean/Basic.java b/test/java/lang/management/BufferPoolMXBean/Basic.java --- a/test/java/lang/management/BufferPoolMXBean/Basic.java +++ b/test/java/lang/management/BufferPoolMXBean/Basic.java @@ -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 */ diff --git a/test/java/lang/management/ClassLoadingMXBean/LoadCounts.java b/test/java/lang/management/ClassLoadingMXBean/LoadCounts.java --- a/test/java/lang/management/ClassLoadingMXBean/LoadCounts.java +++ b/test/java/lang/management/ClassLoadingMXBean/LoadCounts.java @@ -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 */ diff --git a/test/java/lang/management/CompilationMXBean/Basic.java b/test/java/lang/management/CompilationMXBean/Basic.java --- a/test/java/lang/management/CompilationMXBean/Basic.java +++ b/test/java/lang/management/CompilationMXBean/Basic.java @@ -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.*; diff --git a/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java b/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java --- a/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java +++ b/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java @@ -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 diff --git a/test/java/lang/management/CompositeData/MemoryUsageCompositeData.java b/test/java/lang/management/CompositeData/MemoryUsageCompositeData.java --- a/test/java/lang/management/CompositeData/MemoryUsageCompositeData.java +++ b/test/java/lang/management/CompositeData/MemoryUsageCompositeData.java @@ -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 */ diff --git a/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java b/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java --- a/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java +++ b/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java @@ -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 diff --git a/test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java b/test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java --- a/test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java +++ b/test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java @@ -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() diff --git a/test/java/lang/management/MXBean/MXBeanBehavior.java b/test/java/lang/management/MXBean/MXBeanBehavior.java --- a/test/java/lang/management/MXBean/MXBeanBehavior.java +++ b/test/java/lang/management/MXBean/MXBeanBehavior.java @@ -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 */ diff --git a/test/java/lang/management/ManagementFactory/GetObjectName.java b/test/java/lang/management/ManagementFactory/GetObjectName.java --- a/test/java/lang/management/ManagementFactory/GetObjectName.java +++ b/test/java/lang/management/ManagementFactory/GetObjectName.java @@ -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 */ diff --git a/test/java/lang/management/ManagementFactory/GetPlatformMXBeans.java b/test/java/lang/management/ManagementFactory/GetPlatformMXBeans.java --- a/test/java/lang/management/ManagementFactory/GetPlatformMXBeans.java +++ b/test/java/lang/management/ManagementFactory/GetPlatformMXBeans.java @@ -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 */ diff --git a/test/java/lang/management/ManagementFactory/GetPlatformManagementInterfaces.java b/test/java/lang/management/ManagementFactory/GetPlatformManagementInterfaces.java --- a/test/java/lang/management/ManagementFactory/GetPlatformManagementInterfaces.java +++ b/test/java/lang/management/ManagementFactory/GetPlatformManagementInterfaces.java @@ -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 */ diff --git a/test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java b/test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java --- a/test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java +++ b/test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java @@ -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 diff --git a/test/java/lang/management/ManagementFactory/MXBeanException.java b/test/java/lang/management/ManagementFactory/MXBeanException.java --- a/test/java/lang/management/ManagementFactory/MXBeanException.java +++ b/test/java/lang/management/ManagementFactory/MXBeanException.java @@ -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 */ diff --git a/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java b/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java --- a/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java +++ b/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java @@ -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 */ diff --git a/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java b/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java --- a/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java +++ b/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java @@ -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.*; diff --git a/test/java/lang/management/ManagementFactory/ProxyExceptions.java b/test/java/lang/management/ManagementFactory/ProxyExceptions.java --- a/test/java/lang/management/ManagementFactory/ProxyExceptions.java +++ b/test/java/lang/management/ManagementFactory/ProxyExceptions.java @@ -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.*; diff --git a/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java b/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java --- a/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java +++ b/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java @@ -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 */ diff --git a/test/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java b/test/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java --- a/test/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java +++ b/test/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java @@ -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 */ diff --git a/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java b/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java --- a/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java +++ b/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java @@ -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 */ diff --git a/test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java b/test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java --- a/test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java +++ b/test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java @@ -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 diff --git a/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java b/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java --- a/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java +++ b/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java @@ -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 */ diff --git a/test/java/lang/management/MemoryMXBean/LowMemoryTest.java b/test/java/lang/management/MemoryMXBean/LowMemoryTest.java --- a/test/java/lang/management/MemoryMXBean/LowMemoryTest.java +++ b/test/java/lang/management/MemoryMXBean/LowMemoryTest.java @@ -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" diff --git a/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh b/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh --- a/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh +++ b/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh @@ -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 # diff --git a/test/java/lang/management/MemoryMXBean/MemoryManagement.java b/test/java/lang/management/MemoryMXBean/MemoryManagement.java --- a/test/java/lang/management/MemoryMXBean/MemoryManagement.java +++ b/test/java/lang/management/MemoryMXBean/MemoryManagement.java @@ -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 */ diff --git a/test/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh b/test/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh --- a/test/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh +++ b/test/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh @@ -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 # diff --git a/test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh b/test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh --- a/test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh +++ b/test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh @@ -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 # diff --git a/test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh b/test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh --- a/test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh +++ b/test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh @@ -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 # diff --git a/test/java/lang/management/MemoryMXBean/MemoryTest.java b/test/java/lang/management/MemoryMXBean/MemoryTest.java --- a/test/java/lang/management/MemoryMXBean/MemoryTest.java +++ b/test/java/lang/management/MemoryMXBean/MemoryTest.java @@ -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 */ diff --git a/test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh b/test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh --- a/test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh +++ b/test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh @@ -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 # diff --git a/test/java/lang/management/MemoryMXBean/Pending.java b/test/java/lang/management/MemoryMXBean/Pending.java --- a/test/java/lang/management/MemoryMXBean/Pending.java +++ b/test/java/lang/management/MemoryMXBean/Pending.java @@ -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.*; diff --git a/test/java/lang/management/MemoryMXBean/PendingAllGC.sh b/test/java/lang/management/MemoryMXBean/PendingAllGC.sh --- a/test/java/lang/management/MemoryMXBean/PendingAllGC.sh +++ b/test/java/lang/management/MemoryMXBean/PendingAllGC.sh @@ -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 # diff --git a/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java b/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java --- a/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java +++ b/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java @@ -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 */ diff --git a/test/java/lang/management/MemoryPoolMXBean/ThresholdTest.java b/test/java/lang/management/MemoryPoolMXBean/ThresholdTest.java --- a/test/java/lang/management/MemoryPoolMXBean/ThresholdTest.java +++ b/test/java/lang/management/MemoryPoolMXBean/ThresholdTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved. * 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 */ diff --git a/test/java/lang/management/OperatingSystemMXBean/PlatformMXBeanTest.java b/test/java/lang/management/OperatingSystemMXBean/PlatformMXBeanTest.java --- a/test/java/lang/management/OperatingSystemMXBean/PlatformMXBeanTest.java +++ b/test/java/lang/management/OperatingSystemMXBean/PlatformMXBeanTest.java @@ -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 */ diff --git a/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh b/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh --- a/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh +++ b/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh @@ -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 # diff --git a/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java b/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java --- a/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java +++ b/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java @@ -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 */ diff --git a/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java b/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java --- a/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java +++ b/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java @@ -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 */ diff --git a/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java b/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java --- a/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java +++ b/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java @@ -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; diff --git a/test/java/lang/management/RuntimeMXBean/PropertiesTest.java b/test/java/lang/management/RuntimeMXBean/PropertiesTest.java --- a/test/java/lang/management/RuntimeMXBean/PropertiesTest.java +++ b/test/java/lang/management/RuntimeMXBean/PropertiesTest.java @@ -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 */ diff --git a/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh b/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh --- a/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh +++ b/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh @@ -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 # diff --git a/test/java/lang/management/RuntimeMXBean/UpTime.java b/test/java/lang/management/RuntimeMXBean/UpTime.java --- a/test/java/lang/management/RuntimeMXBean/UpTime.java +++ b/test/java/lang/management/RuntimeMXBean/UpTime.java @@ -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.*; diff --git a/test/java/lang/management/ThreadMXBean/AllThreadIds.java b/test/java/lang/management/ThreadMXBean/AllThreadIds.java --- a/test/java/lang/management/ThreadMXBean/AllThreadIds.java +++ b/test/java/lang/management/ThreadMXBean/AllThreadIds.java @@ -27,6 +27,7 @@ * @summary Basic unit test of ThreadMXBean.getAllThreadIds() * @author Alexei Guibadoulline and Mandy Chung * + * @modules java.management * @run main/othervm AllThreadIds */ diff --git a/test/java/lang/management/ThreadMXBean/DisableTest.java b/test/java/lang/management/ThreadMXBean/DisableTest.java --- a/test/java/lang/management/ThreadMXBean/DisableTest.java +++ b/test/java/lang/management/ThreadMXBean/DisableTest.java @@ -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; diff --git a/test/java/lang/management/ThreadMXBean/EnableTest.java b/test/java/lang/management/ThreadMXBean/EnableTest.java --- a/test/java/lang/management/ThreadMXBean/EnableTest.java +++ b/test/java/lang/management/ThreadMXBean/EnableTest.java @@ -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 */ diff --git a/test/java/lang/management/ThreadMXBean/FindDeadlocks.java b/test/java/lang/management/ThreadMXBean/FindDeadlocks.java --- a/test/java/lang/management/ThreadMXBean/FindDeadlocks.java +++ b/test/java/lang/management/ThreadMXBean/FindDeadlocks.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,6 +30,7 @@ * - ThreadMXBean.findMonitorDeadlockedThreads() * @author Mandy Chung * + * @modules java.management * @build MonitorDeadlock * @build SynchronizerDeadlock * @build ThreadDump diff --git a/test/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java b/test/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java --- a/test/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java +++ b/test/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java @@ -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 diff --git a/test/java/lang/management/ThreadMXBean/InvalidThreadID.java b/test/java/lang/management/ThreadMXBean/InvalidThreadID.java --- a/test/java/lang/management/ThreadMXBean/InvalidThreadID.java +++ b/test/java/lang/management/ThreadMXBean/InvalidThreadID.java @@ -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 */ diff --git a/test/java/lang/management/ThreadMXBean/LockedMonitors.java b/test/java/lang/management/ThreadMXBean/LockedMonitors.java --- a/test/java/lang/management/ThreadMXBean/LockedMonitors.java +++ b/test/java/lang/management/ThreadMXBean/LockedMonitors.java @@ -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 diff --git a/test/java/lang/management/ThreadMXBean/LockedSynchronizers.java b/test/java/lang/management/ThreadMXBean/LockedSynchronizers.java --- a/test/java/lang/management/ThreadMXBean/LockedSynchronizers.java +++ b/test/java/lang/management/ThreadMXBean/LockedSynchronizers.java @@ -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 diff --git a/test/java/lang/management/ThreadMXBean/Locks.java b/test/java/lang/management/ThreadMXBean/Locks.java --- a/test/java/lang/management/ThreadMXBean/Locks.java +++ b/test/java/lang/management/ThreadMXBean/Locks.java @@ -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 */ diff --git a/test/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java b/test/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java --- a/test/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java +++ b/test/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java @@ -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 diff --git a/test/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java b/test/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java --- a/test/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java +++ b/test/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java @@ -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 diff --git a/test/java/lang/management/ThreadMXBean/SharedSynchronizer.java b/test/java/lang/management/ThreadMXBean/SharedSynchronizer.java --- a/test/java/lang/management/ThreadMXBean/SharedSynchronizer.java +++ b/test/java/lang/management/ThreadMXBean/SharedSynchronizer.java @@ -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 */ diff --git a/test/java/lang/management/ThreadMXBean/SynchronizationStatistics.java b/test/java/lang/management/ThreadMXBean/SynchronizationStatistics.java --- a/test/java/lang/management/ThreadMXBean/SynchronizationStatistics.java +++ b/test/java/lang/management/ThreadMXBean/SynchronizationStatistics.java @@ -29,6 +29,7 @@ * @author Mandy Chung * @author Jaroslav Bachorik * + * @modules java.management * @run main/othervm SynchronizationStatistics */ diff --git a/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java b/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java --- a/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java +++ b/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java @@ -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 */ diff --git a/test/java/lang/management/ThreadMXBean/ThreadCounts.java b/test/java/lang/management/ThreadMXBean/ThreadCounts.java --- a/test/java/lang/management/ThreadMXBean/ThreadCounts.java +++ b/test/java/lang/management/ThreadMXBean/ThreadCounts.java @@ -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 */ diff --git a/test/java/lang/management/ThreadMXBean/ThreadCpuTime.java b/test/java/lang/management/ThreadMXBean/ThreadCpuTime.java --- a/test/java/lang/management/ThreadMXBean/ThreadCpuTime.java +++ b/test/java/lang/management/ThreadMXBean/ThreadCpuTime.java @@ -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.*; diff --git a/test/java/lang/management/ThreadMXBean/ThreadDaemonTest.java b/test/java/lang/management/ThreadMXBean/ThreadDaemonTest.java --- a/test/java/lang/management/ThreadMXBean/ThreadDaemonTest.java +++ b/test/java/lang/management/ThreadMXBean/ThreadDaemonTest.java @@ -31,6 +31,7 @@ * @bug 6588467 * @summary Basic test of ThreadInfo.isDaemon * @author Jeremy Manson + * @modules java.management */ public class ThreadDaemonTest { diff --git a/test/java/lang/management/ThreadMXBean/ThreadInfoArray.java b/test/java/lang/management/ThreadMXBean/ThreadInfoArray.java --- a/test/java/lang/management/ThreadMXBean/ThreadInfoArray.java +++ b/test/java/lang/management/ThreadMXBean/ThreadInfoArray.java @@ -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 @@ * * @author Mandy Chung * + * @modules java.management * @build ThreadInfoArray * @run main ThreadInfoArray */ diff --git a/test/java/lang/management/ThreadMXBean/ThreadLists.java b/test/java/lang/management/ThreadMXBean/ThreadLists.java --- a/test/java/lang/management/ThreadMXBean/ThreadLists.java +++ b/test/java/lang/management/ThreadMXBean/ThreadLists.java @@ -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; diff --git a/test/java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java b/test/java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java --- a/test/java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java +++ b/test/java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java @@ -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 @@ -32,6 +32,7 @@ * * @library ../../Thread * @library /lib/testlibrary + * @modules java.management * @build jdk.testlibrary.* * @build ThreadMXBeanStateTest ThreadStateController * @run main ThreadMXBeanStateTest diff --git a/test/java/lang/management/ThreadMXBean/ThreadStackTrace.java b/test/java/lang/management/ThreadMXBean/ThreadStackTrace.java --- a/test/java/lang/management/ThreadMXBean/ThreadStackTrace.java +++ b/test/java/lang/management/ThreadMXBean/ThreadStackTrace.java @@ -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 @@ * ThreadInfo.getThreadState() * @author Mandy Chung * + * @modules java.management * @run build Semaphore Utils * @run main ThreadStackTrace */ diff --git a/test/java/lang/management/ThreadMXBean/ThreadUserTime.java b/test/java/lang/management/ThreadMXBean/ThreadUserTime.java --- a/test/java/lang/management/ThreadMXBean/ThreadUserTime.java +++ b/test/java/lang/management/ThreadMXBean/ThreadUserTime.java @@ -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.*; diff --git a/test/javax/management/ImplementationVersion/ImplVersionTest.java b/test/javax/management/ImplementationVersion/ImplVersionTest.java --- a/test/javax/management/ImplementationVersion/ImplVersionTest.java +++ b/test/javax/management/ImplementationVersion/ImplVersionTest.java @@ -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 + diff --git a/test/javax/management/Introspector/AnnotationSecurityTest.java b/test/javax/management/Introspector/AnnotationSecurityTest.java --- a/test/javax/management/Introspector/AnnotationSecurityTest.java +++ b/test/javax/management/Introspector/AnnotationSecurityTest.java @@ -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 diff --git a/test/javax/management/Introspector/AnnotationTest.java b/test/javax/management/Introspector/AnnotationTest.java --- a/test/javax/management/Introspector/AnnotationTest.java +++ b/test/javax/management/Introspector/AnnotationTest.java @@ -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 diff --git a/test/javax/management/Introspector/ChangingNotifsTest.java b/test/javax/management/Introspector/ChangingNotifsTest.java --- a/test/javax/management/Introspector/ChangingNotifsTest.java +++ b/test/javax/management/Introspector/ChangingNotifsTest.java @@ -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 diff --git a/test/javax/management/Introspector/ClassLeakTest.java b/test/javax/management/Introspector/ClassLeakTest.java --- a/test/javax/management/Introspector/ClassLeakTest.java +++ b/test/javax/management/Introspector/ClassLeakTest.java @@ -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"); diff --git a/test/javax/management/Introspector/DuplicateGetterTest.java b/test/javax/management/Introspector/DuplicateGetterTest.java --- a/test/javax/management/Introspector/DuplicateGetterTest.java +++ b/test/javax/management/Introspector/DuplicateGetterTest.java @@ -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.*; diff --git a/test/javax/management/Introspector/FeatureOrderTest.java b/test/javax/management/Introspector/FeatureOrderTest.java --- a/test/javax/management/Introspector/FeatureOrderTest.java +++ b/test/javax/management/Introspector/FeatureOrderTest.java @@ -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 */ /* diff --git a/test/javax/management/Introspector/GetMBeanInfoExceptionTest.java b/test/javax/management/Introspector/GetMBeanInfoExceptionTest.java --- a/test/javax/management/Introspector/GetMBeanInfoExceptionTest.java +++ b/test/javax/management/Introspector/GetMBeanInfoExceptionTest.java @@ -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 diff --git a/test/javax/management/Introspector/IdenticalMBeanInfoTest.java b/test/javax/management/Introspector/IdenticalMBeanInfoTest.java --- a/test/javax/management/Introspector/IdenticalMBeanInfoTest.java +++ b/test/javax/management/Introspector/IdenticalMBeanInfoTest.java @@ -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 diff --git a/test/javax/management/Introspector/ImmutableNotificationInfoTest.java b/test/javax/management/Introspector/ImmutableNotificationInfoTest.java --- a/test/javax/management/Introspector/ImmutableNotificationInfoTest.java +++ b/test/javax/management/Introspector/ImmutableNotificationInfoTest.java @@ -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 diff --git a/test/javax/management/Introspector/InvokeGettersTest.java b/test/javax/management/Introspector/InvokeGettersTest.java --- a/test/javax/management/Introspector/InvokeGettersTest.java +++ b/test/javax/management/Introspector/InvokeGettersTest.java @@ -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 diff --git a/test/javax/management/Introspector/IsMethodTest.java b/test/javax/management/Introspector/IsMethodTest.java --- a/test/javax/management/Introspector/IsMethodTest.java +++ b/test/javax/management/Introspector/IsMethodTest.java @@ -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 diff --git a/test/javax/management/Introspector/NotAnMBeanTest.java b/test/javax/management/Introspector/NotAnMBeanTest.java --- a/test/javax/management/Introspector/NotAnMBeanTest.java +++ b/test/javax/management/Introspector/NotAnMBeanTest.java @@ -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 diff --git a/test/javax/management/Introspector/NotCompliantCauseTest.java b/test/javax/management/Introspector/NotCompliantCauseTest.java --- a/test/javax/management/Introspector/NotCompliantCauseTest.java +++ b/test/javax/management/Introspector/NotCompliantCauseTest.java @@ -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 diff --git a/test/javax/management/Introspector/SetWrongTypeAttributeTest.java b/test/javax/management/Introspector/SetWrongTypeAttributeTest.java --- a/test/javax/management/Introspector/SetWrongTypeAttributeTest.java +++ b/test/javax/management/Introspector/SetWrongTypeAttributeTest.java @@ -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 diff --git a/test/javax/management/Introspector/UnregisterMBeanExceptionTest.java b/test/javax/management/Introspector/UnregisterMBeanExceptionTest.java --- a/test/javax/management/Introspector/UnregisterMBeanExceptionTest.java +++ b/test/javax/management/Introspector/UnregisterMBeanExceptionTest.java @@ -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 diff --git a/test/javax/management/MBeanInfo/EqualExceptionTest.java b/test/javax/management/MBeanInfo/EqualExceptionTest.java --- a/test/javax/management/MBeanInfo/EqualExceptionTest.java +++ b/test/javax/management/MBeanInfo/EqualExceptionTest.java @@ -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 diff --git a/test/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java b/test/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java --- a/test/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java +++ b/test/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java @@ -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 diff --git a/test/javax/management/MBeanInfo/MBeanInfoEqualsTest.java b/test/javax/management/MBeanInfo/MBeanInfoEqualsTest.java --- a/test/javax/management/MBeanInfo/MBeanInfoEqualsTest.java +++ b/test/javax/management/MBeanInfo/MBeanInfoEqualsTest.java @@ -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 diff --git a/test/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java b/test/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java --- a/test/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java +++ b/test/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java @@ -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 diff --git a/test/javax/management/MBeanInfo/NotificationInfoTest.java b/test/javax/management/MBeanInfo/NotificationInfoTest.java --- a/test/javax/management/MBeanInfo/NotificationInfoTest.java +++ b/test/javax/management/MBeanInfo/NotificationInfoTest.java @@ -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 diff --git a/test/javax/management/MBeanInfo/NullInfoArraysTest.java b/test/javax/management/MBeanInfo/NullInfoArraysTest.java --- a/test/javax/management/MBeanInfo/NullInfoArraysTest.java +++ b/test/javax/management/MBeanInfo/NullInfoArraysTest.java @@ -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 diff --git a/test/javax/management/MBeanInfo/SerializationTest.java b/test/javax/management/MBeanInfo/SerializationTest.java --- a/test/javax/management/MBeanInfo/SerializationTest.java +++ b/test/javax/management/MBeanInfo/SerializationTest.java @@ -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 diff --git a/test/javax/management/MBeanInfo/SerializationTest1.java b/test/javax/management/MBeanInfo/SerializationTest1.java --- a/test/javax/management/MBeanInfo/SerializationTest1.java +++ b/test/javax/management/MBeanInfo/SerializationTest1.java @@ -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 diff --git a/test/javax/management/MBeanInfo/TooManyFooTest.java b/test/javax/management/MBeanInfo/TooManyFooTest.java --- a/test/javax/management/MBeanInfo/TooManyFooTest.java +++ b/test/javax/management/MBeanInfo/TooManyFooTest.java @@ -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 diff --git a/test/javax/management/MBeanServer/AttributeListTypeSafeTest.java b/test/javax/management/MBeanServer/AttributeListTypeSafeTest.java --- a/test/javax/management/MBeanServer/AttributeListTypeSafeTest.java +++ b/test/javax/management/MBeanServer/AttributeListTypeSafeTest.java @@ -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; diff --git a/test/javax/management/MBeanServer/MBeanExceptionTest.java b/test/javax/management/MBeanServer/MBeanExceptionTest.java --- a/test/javax/management/MBeanServer/MBeanExceptionTest.java +++ b/test/javax/management/MBeanServer/MBeanExceptionTest.java @@ -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 */ diff --git a/test/javax/management/MBeanServer/MBeanFallbackTest.java b/test/javax/management/MBeanServer/MBeanFallbackTest.java --- a/test/javax/management/MBeanServer/MBeanFallbackTest.java +++ b/test/javax/management/MBeanServer/MBeanFallbackTest.java @@ -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 diff --git a/test/javax/management/MBeanServer/MBeanServerInvocationHandlerExceptionTest.java b/test/javax/management/MBeanServer/MBeanServerInvocationHandlerExceptionTest.java --- a/test/javax/management/MBeanServer/MBeanServerInvocationHandlerExceptionTest.java +++ b/test/javax/management/MBeanServer/MBeanServerInvocationHandlerExceptionTest.java @@ -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 diff --git a/test/javax/management/MBeanServer/MBeanServerNotificationTest.java b/test/javax/management/MBeanServer/MBeanServerNotificationTest.java --- a/test/javax/management/MBeanServer/MBeanServerNotificationTest.java +++ b/test/javax/management/MBeanServer/MBeanServerNotificationTest.java @@ -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 */ diff --git a/test/javax/management/MBeanServer/MBeanTest.java b/test/javax/management/MBeanServer/MBeanTest.java --- a/test/javax/management/MBeanServer/MBeanTest.java +++ b/test/javax/management/MBeanServer/MBeanTest.java @@ -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 diff --git a/test/javax/management/MBeanServer/NewMBeanListenerTest.java b/test/javax/management/MBeanServer/NewMBeanListenerTest.java --- a/test/javax/management/MBeanServer/NewMBeanListenerTest.java +++ b/test/javax/management/MBeanServer/NewMBeanListenerTest.java @@ -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 diff --git a/test/javax/management/MBeanServer/NotifDeadlockTest.java b/test/javax/management/MBeanServer/NotifDeadlockTest.java --- a/test/javax/management/MBeanServer/NotifDeadlockTest.java +++ b/test/javax/management/MBeanServer/NotifDeadlockTest.java @@ -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 diff --git a/test/javax/management/MBeanServer/OldMBeanServerTest.java b/test/javax/management/MBeanServer/OldMBeanServerTest.java --- a/test/javax/management/MBeanServer/OldMBeanServerTest.java +++ b/test/javax/management/MBeanServer/OldMBeanServerTest.java @@ -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 */ diff --git a/test/javax/management/MBeanServer/PostExceptionTest.java b/test/javax/management/MBeanServer/PostExceptionTest.java --- a/test/javax/management/MBeanServer/PostExceptionTest.java +++ b/test/javax/management/MBeanServer/PostExceptionTest.java @@ -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 */ diff --git a/test/javax/management/MBeanServer/PostRegisterDeadlockTest.java b/test/javax/management/MBeanServer/PostRegisterDeadlockTest.java --- a/test/javax/management/MBeanServer/PostRegisterDeadlockTest.java +++ b/test/javax/management/MBeanServer/PostRegisterDeadlockTest.java @@ -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 diff --git a/test/javax/management/MBeanServer/PostRegisterDeadlockTest2.java b/test/javax/management/MBeanServer/PostRegisterDeadlockTest2.java --- a/test/javax/management/MBeanServer/PostRegisterDeadlockTest2.java +++ b/test/javax/management/MBeanServer/PostRegisterDeadlockTest2.java @@ -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 */ diff --git a/test/javax/management/MBeanServer/PreDeregisterDeadlockTest.java b/test/javax/management/MBeanServer/PreDeregisterDeadlockTest.java --- a/test/javax/management/MBeanServer/PreDeregisterDeadlockTest.java +++ b/test/javax/management/MBeanServer/PreDeregisterDeadlockTest.java @@ -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 diff --git a/test/javax/management/MBeanServer/PreRegisterTest.java b/test/javax/management/MBeanServer/PreRegisterTest.java --- a/test/javax/management/MBeanServer/PreRegisterTest.java +++ b/test/javax/management/MBeanServer/PreRegisterTest.java @@ -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 diff --git a/test/javax/management/MBeanServerFactory/ReleaseMBeanServerTest.java b/test/javax/management/MBeanServerFactory/ReleaseMBeanServerTest.java --- a/test/javax/management/MBeanServerFactory/ReleaseMBeanServerTest.java +++ b/test/javax/management/MBeanServerFactory/ReleaseMBeanServerTest.java @@ -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 diff --git a/test/javax/management/MustBeValidMBeanInfo/MustBeValidCommand.java b/test/javax/management/MustBeValidMBeanInfo/MustBeValidCommand.java --- a/test/javax/management/MustBeValidMBeanInfo/MustBeValidCommand.java +++ b/test/javax/management/MustBeValidMBeanInfo/MustBeValidCommand.java @@ -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 diff --git a/test/javax/management/ObjectInstance/MBeanInfoFailTest.java b/test/javax/management/ObjectInstance/MBeanInfoFailTest.java --- a/test/javax/management/ObjectInstance/MBeanInfoFailTest.java +++ b/test/javax/management/ObjectInstance/MBeanInfoFailTest.java @@ -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 diff --git a/test/javax/management/ObjectInstance/ObjectInstanceNullTest.java b/test/javax/management/ObjectInstance/ObjectInstanceNullTest.java --- a/test/javax/management/ObjectInstance/ObjectInstanceNullTest.java +++ b/test/javax/management/ObjectInstance/ObjectInstanceNullTest.java @@ -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 diff --git a/test/javax/management/ObjectInstance/ToStringMethodTest.java b/test/javax/management/ObjectInstance/ToStringMethodTest.java --- a/test/javax/management/ObjectInstance/ToStringMethodTest.java +++ b/test/javax/management/ObjectInstance/ToStringMethodTest.java @@ -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 diff --git a/test/javax/management/ObjectName/ApplyWildcardTest.java b/test/javax/management/ObjectName/ApplyWildcardTest.java --- a/test/javax/management/ObjectName/ApplyWildcardTest.java +++ b/test/javax/management/ObjectName/ApplyWildcardTest.java @@ -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 diff --git a/test/javax/management/ObjectName/ComparatorTest.java b/test/javax/management/ObjectName/ComparatorTest.java --- a/test/javax/management/ObjectName/ComparatorTest.java +++ b/test/javax/management/ObjectName/ComparatorTest.java @@ -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 diff --git a/test/javax/management/ObjectName/DelegateNameWildcardNameTest.java b/test/javax/management/ObjectName/DelegateNameWildcardNameTest.java --- a/test/javax/management/ObjectName/DelegateNameWildcardNameTest.java +++ b/test/javax/management/ObjectName/DelegateNameWildcardNameTest.java @@ -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 diff --git a/test/javax/management/ObjectName/NullEmptyKeyValueTest.java b/test/javax/management/ObjectName/NullEmptyKeyValueTest.java --- a/test/javax/management/ObjectName/NullEmptyKeyValueTest.java +++ b/test/javax/management/ObjectName/NullEmptyKeyValueTest.java @@ -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 diff --git a/test/javax/management/ObjectName/ObjectNameGetInstanceTest.java b/test/javax/management/ObjectName/ObjectNameGetInstanceTest.java --- a/test/javax/management/ObjectName/ObjectNameGetInstanceTest.java +++ b/test/javax/management/ObjectName/ObjectNameGetInstanceTest.java @@ -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 diff --git a/test/javax/management/ObjectName/RepositoryWildcardTest.java b/test/javax/management/ObjectName/RepositoryWildcardTest.java --- a/test/javax/management/ObjectName/RepositoryWildcardTest.java +++ b/test/javax/management/ObjectName/RepositoryWildcardTest.java @@ -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 diff --git a/test/javax/management/ObjectName/SerialCompatTest.java b/test/javax/management/ObjectName/SerialCompatTest.java --- a/test/javax/management/ObjectName/SerialCompatTest.java +++ b/test/javax/management/ObjectName/SerialCompatTest.java @@ -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 diff --git a/test/javax/management/ObjectName/ValueWildcardTest.java b/test/javax/management/ObjectName/ValueWildcardTest.java --- a/test/javax/management/ObjectName/ValueWildcardTest.java +++ b/test/javax/management/ObjectName/ValueWildcardTest.java @@ -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 diff --git a/test/javax/management/descriptor/DefaultDescriptorTest.java b/test/javax/management/descriptor/DefaultDescriptorTest.java --- a/test/javax/management/descriptor/DefaultDescriptorTest.java +++ b/test/javax/management/descriptor/DefaultDescriptorTest.java @@ -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 diff --git a/test/javax/management/descriptor/DescriptorTest.java b/test/javax/management/descriptor/DescriptorTest.java --- a/test/javax/management/descriptor/DescriptorTest.java +++ b/test/javax/management/descriptor/DescriptorTest.java @@ -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 diff --git a/test/javax/management/descriptor/EqualsHashCodeTest.java b/test/javax/management/descriptor/EqualsHashCodeTest.java --- a/test/javax/management/descriptor/EqualsHashCodeTest.java +++ b/test/javax/management/descriptor/EqualsHashCodeTest.java @@ -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 diff --git a/test/javax/management/descriptor/ImmutableArrayFieldTest.java b/test/javax/management/descriptor/ImmutableArrayFieldTest.java --- a/test/javax/management/descriptor/ImmutableArrayFieldTest.java +++ b/test/javax/management/descriptor/ImmutableArrayFieldTest.java @@ -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 diff --git a/test/javax/management/descriptor/ImmutableDescriptorSerialTest.java b/test/javax/management/descriptor/ImmutableDescriptorSerialTest.java --- a/test/javax/management/descriptor/ImmutableDescriptorSerialTest.java +++ b/test/javax/management/descriptor/ImmutableDescriptorSerialTest.java @@ -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 diff --git a/test/javax/management/descriptor/ImmutableDescriptorSetFieldsTest.java b/test/javax/management/descriptor/ImmutableDescriptorSetFieldsTest.java --- a/test/javax/management/descriptor/ImmutableDescriptorSetFieldsTest.java +++ b/test/javax/management/descriptor/ImmutableDescriptorSetFieldsTest.java @@ -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 diff --git a/test/javax/management/descriptor/MBeanInfoInteropTest.java b/test/javax/management/descriptor/MBeanInfoInteropTest.java --- a/test/javax/management/descriptor/MBeanInfoInteropTest.java +++ b/test/javax/management/descriptor/MBeanInfoInteropTest.java @@ -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 diff --git a/test/javax/management/descriptor/UnionTest.java b/test/javax/management/descriptor/UnionTest.java --- a/test/javax/management/descriptor/UnionTest.java +++ b/test/javax/management/descriptor/UnionTest.java @@ -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 diff --git a/test/javax/management/generified/GenericTest.java b/test/javax/management/generified/GenericTest.java --- a/test/javax/management/generified/GenericTest.java +++ b/test/javax/management/generified/GenericTest.java @@ -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 diff --git a/test/javax/management/generified/ListTypeCheckTest.java b/test/javax/management/generified/ListTypeCheckTest.java --- a/test/javax/management/generified/ListTypeCheckTest.java +++ b/test/javax/management/generified/ListTypeCheckTest.java @@ -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 diff --git a/test/javax/management/loading/ArrayClassTest.java b/test/javax/management/loading/ArrayClassTest.java --- a/test/javax/management/loading/ArrayClassTest.java +++ b/test/javax/management/loading/ArrayClassTest.java @@ -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); diff --git a/test/javax/management/loading/DocumentRootTest.java b/test/javax/management/loading/DocumentRootTest.java --- a/test/javax/management/loading/DocumentRootTest.java +++ b/test/javax/management/loading/DocumentRootTest.java @@ -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 diff --git a/test/javax/management/loading/GetMBeansFromURLTest.java b/test/javax/management/loading/GetMBeansFromURLTest.java --- a/test/javax/management/loading/GetMBeansFromURLTest.java +++ b/test/javax/management/loading/GetMBeansFromURLTest.java @@ -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 diff --git a/test/javax/management/loading/LibraryLoader/LibraryLoaderTest.java b/test/javax/management/loading/LibraryLoader/LibraryLoaderTest.java --- a/test/javax/management/loading/LibraryLoader/LibraryLoaderTest.java +++ b/test/javax/management/loading/LibraryLoader/LibraryLoaderTest.java @@ -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 diff --git a/test/javax/management/loading/MLetCLR/MLetCommand.java b/test/javax/management/loading/MLetCLR/MLetCommand.java --- a/test/javax/management/loading/MLetCLR/MLetCommand.java +++ b/test/javax/management/loading/MLetCLR/MLetCommand.java @@ -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 diff --git a/test/javax/management/loading/MLetContentTest.java b/test/javax/management/loading/MLetContentTest.java --- a/test/javax/management/loading/MLetContentTest.java +++ b/test/javax/management/loading/MLetContentTest.java @@ -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 diff --git a/test/javax/management/loading/MLetInternalsTest.java b/test/javax/management/loading/MLetInternalsTest.java --- a/test/javax/management/loading/MLetInternalsTest.java +++ b/test/javax/management/loading/MLetInternalsTest.java @@ -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 { diff --git a/test/javax/management/loading/ParserInfiniteLoopTest.java b/test/javax/management/loading/ParserInfiniteLoopTest.java --- a/test/javax/management/loading/ParserInfiniteLoopTest.java +++ b/test/javax/management/loading/ParserInfiniteLoopTest.java @@ -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 diff --git a/test/javax/management/loading/SystemClassLoaderTest.java b/test/javax/management/loading/SystemClassLoaderTest.java --- a/test/javax/management/loading/SystemClassLoaderTest.java +++ b/test/javax/management/loading/SystemClassLoaderTest.java @@ -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 diff --git a/test/javax/management/modelmbean/AddAttributeChangeNotificationListenerTest.java b/test/javax/management/modelmbean/AddAttributeChangeNotificationListenerTest.java --- a/test/javax/management/modelmbean/AddAttributeChangeNotificationListenerTest.java +++ b/test/javax/management/modelmbean/AddAttributeChangeNotificationListenerTest.java @@ -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 diff --git a/test/javax/management/modelmbean/DescriptorSupportSerialTest.java b/test/javax/management/modelmbean/DescriptorSupportSerialTest.java --- a/test/javax/management/modelmbean/DescriptorSupportSerialTest.java +++ b/test/javax/management/modelmbean/DescriptorSupportSerialTest.java @@ -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 diff --git a/test/javax/management/modelmbean/DescriptorSupportTest.java b/test/javax/management/modelmbean/DescriptorSupportTest.java --- a/test/javax/management/modelmbean/DescriptorSupportTest.java +++ b/test/javax/management/modelmbean/DescriptorSupportTest.java @@ -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 diff --git a/test/javax/management/modelmbean/DescriptorSupportXMLTest.java b/test/javax/management/modelmbean/DescriptorSupportXMLTest.java --- a/test/javax/management/modelmbean/DescriptorSupportXMLTest.java +++ b/test/javax/management/modelmbean/DescriptorSupportXMLTest.java @@ -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 diff --git a/test/javax/management/modelmbean/ExoticTargetTypeTest.java b/test/javax/management/modelmbean/ExoticTargetTypeTest.java --- a/test/javax/management/modelmbean/ExoticTargetTypeTest.java +++ b/test/javax/management/modelmbean/ExoticTargetTypeTest.java @@ -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 diff --git a/test/javax/management/modelmbean/InfoSupportTest.java b/test/javax/management/modelmbean/InfoSupportTest.java --- a/test/javax/management/modelmbean/InfoSupportTest.java +++ b/test/javax/management/modelmbean/InfoSupportTest.java @@ -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 diff --git a/test/javax/management/modelmbean/LoggingExceptionTest.java b/test/javax/management/modelmbean/LoggingExceptionTest.java --- a/test/javax/management/modelmbean/LoggingExceptionTest.java +++ b/test/javax/management/modelmbean/LoggingExceptionTest.java @@ -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; diff --git a/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java b/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java --- a/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java +++ b/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java @@ -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 diff --git a/test/javax/management/modelmbean/OnUnregisterTest.java b/test/javax/management/modelmbean/OnUnregisterTest.java --- a/test/javax/management/modelmbean/OnUnregisterTest.java +++ b/test/javax/management/modelmbean/OnUnregisterTest.java @@ -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 diff --git a/test/javax/management/modelmbean/RequiredModelMBeanGetAttributeTest.java b/test/javax/management/modelmbean/RequiredModelMBeanGetAttributeTest.java --- a/test/javax/management/modelmbean/RequiredModelMBeanGetAttributeTest.java +++ b/test/javax/management/modelmbean/RequiredModelMBeanGetAttributeTest.java @@ -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 diff --git a/test/javax/management/modelmbean/RequiredModelMBeanMethodTest.java b/test/javax/management/modelmbean/RequiredModelMBeanMethodTest.java --- a/test/javax/management/modelmbean/RequiredModelMBeanMethodTest.java +++ b/test/javax/management/modelmbean/RequiredModelMBeanMethodTest.java @@ -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 diff --git a/test/javax/management/modelmbean/RequiredModelMBeanSetAttributeTest.java b/test/javax/management/modelmbean/RequiredModelMBeanSetAttributeTest.java --- a/test/javax/management/modelmbean/RequiredModelMBeanSetAttributeTest.java +++ b/test/javax/management/modelmbean/RequiredModelMBeanSetAttributeTest.java @@ -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 diff --git a/test/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java b/test/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java --- a/test/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java +++ b/test/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java @@ -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 diff --git a/test/javax/management/modelmbean/UnserializableTargetObjectTest.java b/test/javax/management/modelmbean/UnserializableTargetObjectTest.java --- a/test/javax/management/modelmbean/UnserializableTargetObjectTest.java +++ b/test/javax/management/modelmbean/UnserializableTargetObjectTest.java @@ -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 diff --git a/test/javax/management/monitor/AttributeArbitraryDataTypeTest.java b/test/javax/management/monitor/AttributeArbitraryDataTypeTest.java --- a/test/javax/management/monitor/AttributeArbitraryDataTypeTest.java +++ b/test/javax/management/monitor/AttributeArbitraryDataTypeTest.java @@ -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 diff --git a/test/javax/management/monitor/CounterMonitorDeadlockTest.java b/test/javax/management/monitor/CounterMonitorDeadlockTest.java --- a/test/javax/management/monitor/CounterMonitorDeadlockTest.java +++ b/test/javax/management/monitor/CounterMonitorDeadlockTest.java @@ -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 diff --git a/test/javax/management/monitor/CounterMonitorInitThresholdTest.java b/test/javax/management/monitor/CounterMonitorInitThresholdTest.java --- a/test/javax/management/monitor/CounterMonitorInitThresholdTest.java +++ b/test/javax/management/monitor/CounterMonitorInitThresholdTest.java @@ -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 diff --git a/test/javax/management/monitor/CounterMonitorTest.java b/test/javax/management/monitor/CounterMonitorTest.java --- a/test/javax/management/monitor/CounterMonitorTest.java +++ b/test/javax/management/monitor/CounterMonitorTest.java @@ -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 diff --git a/test/javax/management/monitor/CounterMonitorThresholdTest.java b/test/javax/management/monitor/CounterMonitorThresholdTest.java --- a/test/javax/management/monitor/CounterMonitorThresholdTest.java +++ b/test/javax/management/monitor/CounterMonitorThresholdTest.java @@ -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 diff --git a/test/javax/management/monitor/DerivedGaugeMonitorTest.java b/test/javax/management/monitor/DerivedGaugeMonitorTest.java --- a/test/javax/management/monitor/DerivedGaugeMonitorTest.java +++ b/test/javax/management/monitor/DerivedGaugeMonitorTest.java @@ -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 diff --git a/test/javax/management/monitor/GaugeMonitorDeadlockTest.java b/test/javax/management/monitor/GaugeMonitorDeadlockTest.java --- a/test/javax/management/monitor/GaugeMonitorDeadlockTest.java +++ b/test/javax/management/monitor/GaugeMonitorDeadlockTest.java @@ -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 diff --git a/test/javax/management/monitor/MultiMonitorTest.java b/test/javax/management/monitor/MultiMonitorTest.java --- a/test/javax/management/monitor/MultiMonitorTest.java +++ b/test/javax/management/monitor/MultiMonitorTest.java @@ -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 diff --git a/test/javax/management/monitor/NonComparableAttributeValueTest.java b/test/javax/management/monitor/NonComparableAttributeValueTest.java --- a/test/javax/management/monitor/NonComparableAttributeValueTest.java +++ b/test/javax/management/monitor/NonComparableAttributeValueTest.java @@ -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 diff --git a/test/javax/management/monitor/NullAttributeValueTest.java b/test/javax/management/monitor/NullAttributeValueTest.java --- a/test/javax/management/monitor/NullAttributeValueTest.java +++ b/test/javax/management/monitor/NullAttributeValueTest.java @@ -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 diff --git a/test/javax/management/monitor/ReflectionExceptionTest.java b/test/javax/management/monitor/ReflectionExceptionTest.java --- a/test/javax/management/monitor/ReflectionExceptionTest.java +++ b/test/javax/management/monitor/ReflectionExceptionTest.java @@ -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 diff --git a/test/javax/management/monitor/RuntimeExceptionTest.java b/test/javax/management/monitor/RuntimeExceptionTest.java --- a/test/javax/management/monitor/RuntimeExceptionTest.java +++ b/test/javax/management/monitor/RuntimeExceptionTest.java @@ -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 diff --git a/test/javax/management/monitor/StartStopTest.java b/test/javax/management/monitor/StartStopTest.java --- a/test/javax/management/monitor/StartStopTest.java +++ b/test/javax/management/monitor/StartStopTest.java @@ -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 diff --git a/test/javax/management/monitor/StringMonitorDeadlockTest.java b/test/javax/management/monitor/StringMonitorDeadlockTest.java --- a/test/javax/management/monitor/StringMonitorDeadlockTest.java +++ b/test/javax/management/monitor/StringMonitorDeadlockTest.java @@ -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 diff --git a/test/javax/management/monitor/ThreadPoolAccTest.java b/test/javax/management/monitor/ThreadPoolAccTest.java --- a/test/javax/management/monitor/ThreadPoolAccTest.java +++ b/test/javax/management/monitor/ThreadPoolAccTest.java @@ -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 diff --git a/test/javax/management/monitor/ThreadPoolTest.java b/test/javax/management/monitor/ThreadPoolTest.java --- a/test/javax/management/monitor/ThreadPoolTest.java +++ b/test/javax/management/monitor/ThreadPoolTest.java @@ -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 diff --git a/test/javax/management/mxbean/AmbiguousConstructorTest.java b/test/javax/management/mxbean/AmbiguousConstructorTest.java --- a/test/javax/management/mxbean/AmbiguousConstructorTest.java +++ b/test/javax/management/mxbean/AmbiguousConstructorTest.java @@ -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 diff --git a/test/javax/management/mxbean/ComparatorExceptionTest.java b/test/javax/management/mxbean/ComparatorExceptionTest.java --- a/test/javax/management/mxbean/ComparatorExceptionTest.java +++ b/test/javax/management/mxbean/ComparatorExceptionTest.java @@ -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; diff --git a/test/javax/management/mxbean/ExceptionDiagnosisTest.java b/test/javax/management/mxbean/ExceptionDiagnosisTest.java --- a/test/javax/management/mxbean/ExceptionDiagnosisTest.java +++ b/test/javax/management/mxbean/ExceptionDiagnosisTest.java @@ -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; diff --git a/test/javax/management/mxbean/GenericArrayTypeTest.java b/test/javax/management/mxbean/GenericArrayTypeTest.java --- a/test/javax/management/mxbean/GenericArrayTypeTest.java +++ b/test/javax/management/mxbean/GenericArrayTypeTest.java @@ -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 diff --git a/test/javax/management/mxbean/GenericTypeTest.java b/test/javax/management/mxbean/GenericTypeTest.java --- a/test/javax/management/mxbean/GenericTypeTest.java +++ b/test/javax/management/mxbean/GenericTypeTest.java @@ -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 */ diff --git a/test/javax/management/mxbean/InvalidMXBeanRegistrationTest.java b/test/javax/management/mxbean/InvalidMXBeanRegistrationTest.java --- a/test/javax/management/mxbean/InvalidMXBeanRegistrationTest.java +++ b/test/javax/management/mxbean/InvalidMXBeanRegistrationTest.java @@ -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 diff --git a/test/javax/management/mxbean/LeakTest.java b/test/javax/management/mxbean/LeakTest.java --- a/test/javax/management/mxbean/LeakTest.java +++ b/test/javax/management/mxbean/LeakTest.java @@ -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 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); diff --git a/test/javax/management/mxbean/MBeanOperationInfoTest.java b/test/javax/management/mxbean/MBeanOperationInfoTest.java --- a/test/javax/management/mxbean/MBeanOperationInfoTest.java +++ b/test/javax/management/mxbean/MBeanOperationInfoTest.java @@ -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 diff --git a/test/javax/management/mxbean/MXBeanAnnotationTest.java b/test/javax/management/mxbean/MXBeanAnnotationTest.java --- a/test/javax/management/mxbean/MXBeanAnnotationTest.java +++ b/test/javax/management/mxbean/MXBeanAnnotationTest.java @@ -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 diff --git a/test/javax/management/mxbean/MXBeanFallbackTest.java b/test/javax/management/mxbean/MXBeanFallbackTest.java --- a/test/javax/management/mxbean/MXBeanFallbackTest.java +++ b/test/javax/management/mxbean/MXBeanFallbackTest.java @@ -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 diff --git a/test/javax/management/mxbean/MXBeanFlagTest.java b/test/javax/management/mxbean/MXBeanFlagTest.java --- a/test/javax/management/mxbean/MXBeanFlagTest.java +++ b/test/javax/management/mxbean/MXBeanFlagTest.java @@ -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 diff --git a/test/javax/management/mxbean/MXBeanPreRegisterTest.java b/test/javax/management/mxbean/MXBeanPreRegisterTest.java --- a/test/javax/management/mxbean/MXBeanPreRegisterTest.java +++ b/test/javax/management/mxbean/MXBeanPreRegisterTest.java @@ -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 diff --git a/test/javax/management/mxbean/MXBeanRefTest.java b/test/javax/management/mxbean/MXBeanRefTest.java --- a/test/javax/management/mxbean/MXBeanRefTest.java +++ b/test/javax/management/mxbean/MXBeanRefTest.java @@ -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 diff --git a/test/javax/management/mxbean/MXBeanTest.java b/test/javax/management/mxbean/MXBeanTest.java --- a/test/javax/management/mxbean/MXBeanTest.java +++ b/test/javax/management/mxbean/MXBeanTest.java @@ -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 diff --git a/test/javax/management/mxbean/MiscTest.java b/test/javax/management/mxbean/MiscTest.java --- a/test/javax/management/mxbean/MiscTest.java +++ b/test/javax/management/mxbean/MiscTest.java @@ -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 diff --git a/test/javax/management/mxbean/OperationImpactTest.java b/test/javax/management/mxbean/OperationImpactTest.java --- a/test/javax/management/mxbean/OperationImpactTest.java +++ b/test/javax/management/mxbean/OperationImpactTest.java @@ -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 diff --git a/test/javax/management/mxbean/OverloadTest.java b/test/javax/management/mxbean/OverloadTest.java --- a/test/javax/management/mxbean/OverloadTest.java +++ b/test/javax/management/mxbean/OverloadTest.java @@ -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 diff --git a/test/javax/management/mxbean/PreRegisterNameTest.java b/test/javax/management/mxbean/PreRegisterNameTest.java --- a/test/javax/management/mxbean/PreRegisterNameTest.java +++ b/test/javax/management/mxbean/PreRegisterNameTest.java @@ -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; diff --git a/test/javax/management/mxbean/PropertyNamesTest.java b/test/javax/management/mxbean/PropertyNamesTest.java --- a/test/javax/management/mxbean/PropertyNamesTest.java +++ b/test/javax/management/mxbean/PropertyNamesTest.java @@ -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 diff --git a/test/javax/management/mxbean/SameObjectTwoNamesTest.java b/test/javax/management/mxbean/SameObjectTwoNamesTest.java --- a/test/javax/management/mxbean/SameObjectTwoNamesTest.java +++ b/test/javax/management/mxbean/SameObjectTwoNamesTest.java @@ -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 */ diff --git a/test/javax/management/mxbean/StandardMBeanOverrideTest.java b/test/javax/management/mxbean/StandardMBeanOverrideTest.java --- a/test/javax/management/mxbean/StandardMBeanOverrideTest.java +++ b/test/javax/management/mxbean/StandardMBeanOverrideTest.java @@ -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 diff --git a/test/javax/management/mxbean/ThreadMXBeanTest.java b/test/javax/management/mxbean/ThreadMXBeanTest.java --- a/test/javax/management/mxbean/ThreadMXBeanTest.java +++ b/test/javax/management/mxbean/ThreadMXBeanTest.java @@ -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 diff --git a/test/javax/management/mxbean/TypeNameTest.java b/test/javax/management/mxbean/TypeNameTest.java --- a/test/javax/management/mxbean/TypeNameTest.java +++ b/test/javax/management/mxbean/TypeNameTest.java @@ -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; diff --git a/test/javax/management/notification/BroadcasterSupportDeadlockTest.java b/test/javax/management/notification/BroadcasterSupportDeadlockTest.java --- a/test/javax/management/notification/BroadcasterSupportDeadlockTest.java +++ b/test/javax/management/notification/BroadcasterSupportDeadlockTest.java @@ -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 diff --git a/test/javax/management/notification/FilterExceptionTest.java b/test/javax/management/notification/FilterExceptionTest.java --- a/test/javax/management/notification/FilterExceptionTest.java +++ b/test/javax/management/notification/FilterExceptionTest.java @@ -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 diff --git a/test/javax/management/notification/NotifExecutorTest.java b/test/javax/management/notification/NotifExecutorTest.java --- a/test/javax/management/notification/NotifExecutorTest.java +++ b/test/javax/management/notification/NotifExecutorTest.java @@ -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 diff --git a/test/javax/management/notification/NotifInfoTest.java b/test/javax/management/notification/NotifInfoTest.java --- a/test/javax/management/notification/NotifInfoTest.java +++ b/test/javax/management/notification/NotifInfoTest.java @@ -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 diff --git a/test/javax/management/openmbean/ArrayTypeTest.java b/test/javax/management/openmbean/ArrayTypeTest.java --- a/test/javax/management/openmbean/ArrayTypeTest.java +++ b/test/javax/management/openmbean/ArrayTypeTest.java @@ -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 diff --git a/test/javax/management/openmbean/BadConstraintTest.java b/test/javax/management/openmbean/BadConstraintTest.java --- a/test/javax/management/openmbean/BadConstraintTest.java +++ b/test/javax/management/openmbean/BadConstraintTest.java @@ -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 diff --git a/test/javax/management/openmbean/CompositeDataStringTest.java b/test/javax/management/openmbean/CompositeDataStringTest.java --- a/test/javax/management/openmbean/CompositeDataStringTest.java +++ b/test/javax/management/openmbean/CompositeDataStringTest.java @@ -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; diff --git a/test/javax/management/openmbean/ConstraintTest.java b/test/javax/management/openmbean/ConstraintTest.java --- a/test/javax/management/openmbean/ConstraintTest.java +++ b/test/javax/management/openmbean/ConstraintTest.java @@ -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 diff --git a/test/javax/management/openmbean/EqualsTest.java b/test/javax/management/openmbean/EqualsTest.java --- a/test/javax/management/openmbean/EqualsTest.java +++ b/test/javax/management/openmbean/EqualsTest.java @@ -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 diff --git a/test/javax/management/openmbean/IsValueTest.java b/test/javax/management/openmbean/IsValueTest.java --- a/test/javax/management/openmbean/IsValueTest.java +++ b/test/javax/management/openmbean/IsValueTest.java @@ -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.*; diff --git a/test/javax/management/openmbean/NullConstructorParamsTest.java b/test/javax/management/openmbean/NullConstructorParamsTest.java --- a/test/javax/management/openmbean/NullConstructorParamsTest.java +++ b/test/javax/management/openmbean/NullConstructorParamsTest.java @@ -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.*; diff --git a/test/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java b/test/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java --- a/test/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java +++ b/test/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java @@ -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 diff --git a/test/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java b/test/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java --- a/test/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java +++ b/test/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java @@ -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 diff --git a/test/javax/management/openmbean/OpenTypeDescriptorTest.java b/test/javax/management/openmbean/OpenTypeDescriptorTest.java --- a/test/javax/management/openmbean/OpenTypeDescriptorTest.java +++ b/test/javax/management/openmbean/OpenTypeDescriptorTest.java @@ -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 diff --git a/test/javax/management/openmbean/TabularDataOrderTest.java b/test/javax/management/openmbean/TabularDataOrderTest.java --- a/test/javax/management/openmbean/TabularDataOrderTest.java +++ b/test/javax/management/openmbean/TabularDataOrderTest.java @@ -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; diff --git a/test/javax/management/proxy/JMXProxyFallbackTest.java b/test/javax/management/proxy/JMXProxyFallbackTest.java --- a/test/javax/management/proxy/JMXProxyFallbackTest.java +++ b/test/javax/management/proxy/JMXProxyFallbackTest.java @@ -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 diff --git a/test/javax/management/proxy/JMXProxyTest.java b/test/javax/management/proxy/JMXProxyTest.java --- a/test/javax/management/proxy/JMXProxyTest.java +++ b/test/javax/management/proxy/JMXProxyTest.java @@ -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 diff --git a/test/javax/management/proxy/NotificationEmitterProxy.java b/test/javax/management/proxy/NotificationEmitterProxy.java --- a/test/javax/management/proxy/NotificationEmitterProxy.java +++ b/test/javax/management/proxy/NotificationEmitterProxy.java @@ -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 diff --git a/test/javax/management/proxy/ProxyObjectMethodsTest.java b/test/javax/management/proxy/ProxyObjectMethodsTest.java --- a/test/javax/management/proxy/ProxyObjectMethodsTest.java +++ b/test/javax/management/proxy/ProxyObjectMethodsTest.java @@ -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 diff --git a/test/javax/management/query/CustomQueryTest.java b/test/javax/management/query/CustomQueryTest.java --- a/test/javax/management/query/CustomQueryTest.java +++ b/test/javax/management/query/CustomQueryTest.java @@ -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; diff --git a/test/javax/management/query/InstanceOfExpTest.java b/test/javax/management/query/InstanceOfExpTest.java --- a/test/javax/management/query/InstanceOfExpTest.java +++ b/test/javax/management/query/InstanceOfExpTest.java @@ -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 diff --git a/test/javax/management/query/QueryExpStringTest.java b/test/javax/management/query/QueryExpStringTest.java --- a/test/javax/management/query/QueryExpStringTest.java +++ b/test/javax/management/query/QueryExpStringTest.java @@ -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 diff --git a/test/javax/management/query/QueryMatchTest.java b/test/javax/management/query/QueryMatchTest.java --- a/test/javax/management/query/QueryMatchTest.java +++ b/test/javax/management/query/QueryMatchTest.java @@ -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 diff --git a/test/javax/management/query/QuerySubstringTest.java b/test/javax/management/query/QuerySubstringTest.java --- a/test/javax/management/query/QuerySubstringTest.java +++ b/test/javax/management/query/QuerySubstringTest.java @@ -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 diff --git a/test/javax/management/relation/NonArrayListTest.java b/test/javax/management/relation/NonArrayListTest.java --- a/test/javax/management/relation/NonArrayListTest.java +++ b/test/javax/management/relation/NonArrayListTest.java @@ -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 diff --git a/test/javax/management/relation/RelationNotificationSeqNoTest.java b/test/javax/management/relation/RelationNotificationSeqNoTest.java --- a/test/javax/management/relation/RelationNotificationSeqNoTest.java +++ b/test/javax/management/relation/RelationNotificationSeqNoTest.java @@ -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 */ /* diff --git a/test/javax/management/relation/RelationNotificationSourceTest.java b/test/javax/management/relation/RelationNotificationSourceTest.java --- a/test/javax/management/relation/RelationNotificationSourceTest.java +++ b/test/javax/management/relation/RelationNotificationSourceTest.java @@ -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 diff --git a/test/javax/management/relation/RelationTypeTest.java b/test/javax/management/relation/RelationTypeTest.java --- a/test/javax/management/relation/RelationTypeTest.java +++ b/test/javax/management/relation/RelationTypeTest.java @@ -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 diff --git a/test/javax/management/remote/mandatory/URLTest.java b/test/javax/management/remote/mandatory/URLTest.java --- a/test/javax/management/remote/mandatory/URLTest.java +++ b/test/javax/management/remote/mandatory/URLTest.java @@ -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 diff --git a/test/javax/management/remote/mandatory/connection/AddressableTest.java b/test/javax/management/remote/mandatory/connection/AddressableTest.java --- a/test/javax/management/remote/mandatory/connection/AddressableTest.java +++ b/test/javax/management/remote/mandatory/connection/AddressableTest.java @@ -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 diff --git a/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java b/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java --- a/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java +++ b/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java @@ -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 * @run clean BrokenConnectionTest * @run build BrokenConnectionTest * @run main BrokenConnectionTest diff --git a/test/javax/management/remote/mandatory/connection/CloseFailedClientTest.java b/test/javax/management/remote/mandatory/connection/CloseFailedClientTest.java --- a/test/javax/management/remote/mandatory/connection/CloseFailedClientTest.java +++ b/test/javax/management/remote/mandatory/connection/CloseFailedClientTest.java @@ -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 4921888 * @summary Tests that we do not get a NullPointException. * @author Shanliang JIANG + * @modules java.management * @run clean CloseFailedClientTest * @run build CloseFailedClientTest * @run main CloseFailedClientTest diff --git a/test/javax/management/remote/mandatory/connection/CloseServerTest.java b/test/javax/management/remote/mandatory/connection/CloseServerTest.java --- a/test/javax/management/remote/mandatory/connection/CloseServerTest.java +++ b/test/javax/management/remote/mandatory/connection/CloseServerTest.java @@ -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 4838640 * @summary test server close in different conditions. * @author Shanliang JIANG + * @modules java.management * @run clean CloseServerTest * @run build CloseServerTest * @run main CloseServerTest diff --git a/test/javax/management/remote/mandatory/connection/CloseUnconnectedTest.java b/test/javax/management/remote/mandatory/connection/CloseUnconnectedTest.java --- a/test/javax/management/remote/mandatory/connection/CloseUnconnectedTest.java +++ b/test/javax/management/remote/mandatory/connection/CloseUnconnectedTest.java @@ -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 4897052 * @summary Tests that opening and immediately closing a connector works * @author Eamonn McManus + * @modules java.management * @run clean CloseUnconnectedTest * @run build CloseUnconnectedTest * @run main CloseUnconnectedTest diff --git a/test/javax/management/remote/mandatory/connection/CloseableTest.java b/test/javax/management/remote/mandatory/connection/CloseableTest.java --- a/test/javax/management/remote/mandatory/connection/CloseableTest.java +++ b/test/javax/management/remote/mandatory/connection/CloseableTest.java @@ -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 @@ -28,6 +28,7 @@ * the method "void close() throws IOException;" extend * or implement the java.io.Closeable interface. * @author Luis-Miguel Alventosa + * @modules java.management * @run clean CloseableTest * @run build CloseableTest * @run main CloseableTest diff --git a/test/javax/management/remote/mandatory/connection/ConnectionListenerNullTest.java b/test/javax/management/remote/mandatory/connection/ConnectionListenerNullTest.java --- a/test/javax/management/remote/mandatory/connection/ConnectionListenerNullTest.java +++ b/test/javax/management/remote/mandatory/connection/ConnectionListenerNullTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, 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 4943248 * @summary Tests that NullPointerException is thrown when listener is null. * @author Daniel Fuchs + * @modules java.management * @run clean ConnectionListenerNullTest * @run build ConnectionListenerNullTest * @run main ConnectionListenerNullTest diff --git a/test/javax/management/remote/mandatory/connection/ConnectionTest.java b/test/javax/management/remote/mandatory/connection/ConnectionTest.java --- a/test/javax/management/remote/mandatory/connection/ConnectionTest.java +++ b/test/javax/management/remote/mandatory/connection/ConnectionTest.java @@ -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 4865397 * @summary Tests remote JMX connections * @author Eamonn McManus + * @modules java.management * @run clean ConnectionTest * @run build ConnectionTest * @run main ConnectionTest diff --git a/test/javax/management/remote/mandatory/connection/DaemonRMIExporterTest.java b/test/javax/management/remote/mandatory/connection/DaemonRMIExporterTest.java --- a/test/javax/management/remote/mandatory/connection/DaemonRMIExporterTest.java +++ b/test/javax/management/remote/mandatory/connection/DaemonRMIExporterTest.java @@ -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 @@ -28,6 +28,7 @@ * @summary test the connector server option that causes it not to prevent the * VM from exiting * @author Shanliang JIANG, Eamonn McManus + * @modules java.management * @run main/othervm DaemonRMIExporterTest */ import java.util.Arrays; diff --git a/test/javax/management/remote/mandatory/connection/DeadLockTest.java b/test/javax/management/remote/mandatory/connection/DeadLockTest.java --- a/test/javax/management/remote/mandatory/connection/DeadLockTest.java +++ b/test/javax/management/remote/mandatory/connection/DeadLockTest.java @@ -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 5039210 * @summary test on a client notification deadlock. * @author Shanliang JIANG + * @modules java.management * @run clean DeadLockTest * @run build DeadLockTest * @run main DeadLockTest diff --git a/test/javax/management/remote/mandatory/connection/FailedConnectionTest.java b/test/javax/management/remote/mandatory/connection/FailedConnectionTest.java --- a/test/javax/management/remote/mandatory/connection/FailedConnectionTest.java +++ b/test/javax/management/remote/mandatory/connection/FailedConnectionTest.java @@ -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 @@ * @bug 4939578 * @summary test to get an IOException. * @author Shanliang JIANG + * @modules java.management * @run clean FailedConnectionTest * @run build FailedConnectionTest * @run main FailedConnectionTest diff --git a/test/javax/management/remote/mandatory/connection/GetConnectionTest.java b/test/javax/management/remote/mandatory/connection/GetConnectionTest.java --- a/test/javax/management/remote/mandatory/connection/GetConnectionTest.java +++ b/test/javax/management/remote/mandatory/connection/GetConnectionTest.java @@ -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 4951414 * @summary Try to get an IOException. * @author Shanliang JIANG + * @modules java.management * @run clean GetConnectionTest * @run build GetConnectionTest * @run main GetConnectionTest diff --git a/test/javax/management/remote/mandatory/connection/IIOPURLTest.java b/test/javax/management/remote/mandatory/connection/IIOPURLTest.java --- a/test/javax/management/remote/mandatory/connection/IIOPURLTest.java +++ b/test/javax/management/remote/mandatory/connection/IIOPURLTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, 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 4886799 * @summary Check that IIOP URLs have /ior/ in the path * @author Eamonn McManus + * @modules java.management * @run clean IIOPURLTest * @run build IIOPURLTest * @run main IIOPURLTest diff --git a/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java b/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java --- a/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java +++ b/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java @@ -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 4886838 4886830 8025204 * @summary Tests that idle timeouts happen at appropriate times * @author Eamonn McManus + * @modules java.management/com.sun.jmx.remote.util * @run clean IdleTimeoutTest * @run build IdleTimeoutTest * @run main IdleTimeoutTest diff --git a/test/javax/management/remote/mandatory/connection/MultiOpenCloseTest.java b/test/javax/management/remote/mandatory/connection/MultiOpenCloseTest.java --- a/test/javax/management/remote/mandatory/connection/MultiOpenCloseTest.java +++ b/test/javax/management/remote/mandatory/connection/MultiOpenCloseTest.java @@ -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 1234567 * @summary Open, connect then close multi-connectors. * @author Shanliang JIANG + * @modules java.management * @run clean MultiOpenCloseTest * @run build MultiOpenCloseTest * @run main MultiOpenCloseTest diff --git a/test/javax/management/remote/mandatory/connection/MultiThreadDeadLockTest.java b/test/javax/management/remote/mandatory/connection/MultiThreadDeadLockTest.java --- a/test/javax/management/remote/mandatory/connection/MultiThreadDeadLockTest.java +++ b/test/javax/management/remote/mandatory/connection/MultiThreadDeadLockTest.java @@ -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 @@ -45,6 +45,7 @@ * @bug 6697180 * @summary test on a client notification deadlock. * @author Shanliang JIANG + * @modules java.management * @run clean MultiThreadDeadLockTest * @run build MultiThreadDeadLockTest * @run main MultiThreadDeadLockTest diff --git a/test/javax/management/remote/mandatory/connection/NoIIOP.java b/test/javax/management/remote/mandatory/connection/NoIIOP.java --- a/test/javax/management/remote/mandatory/connection/NoIIOP.java +++ b/test/javax/management/remote/mandatory/connection/NoIIOP.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,6 +25,7 @@ * @bug 8004502 * @summary Sanity check that attempts to use the IIOP transport or * RMIIIOPServerImpl when RMI/IIOP not present throws the expected exceptions + * @modules java.management */ import javax.management.MBeanServer; diff --git a/test/javax/management/remote/mandatory/connection/RMIConnectionIdTest.java b/test/javax/management/remote/mandatory/connection/RMIConnectionIdTest.java --- a/test/javax/management/remote/mandatory/connection/RMIConnectionIdTest.java +++ b/test/javax/management/remote/mandatory/connection/RMIConnectionIdTest.java @@ -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 4901808 7183800 * @summary Check that RMI connection ids include client host name * @author Eamonn McManus + * @modules java.management * @run clean RMIConnectionIdTest * @run build RMIConnectionIdTest * @run main RMIConnectionIdTest diff --git a/test/javax/management/remote/mandatory/connection/RMIConnectorInternalMapTest.java b/test/javax/management/remote/mandatory/connection/RMIConnectorInternalMapTest.java --- a/test/javax/management/remote/mandatory/connection/RMIConnectorInternalMapTest.java +++ b/test/javax/management/remote/mandatory/connection/RMIConnectorInternalMapTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -42,6 +42,7 @@ * @bug 6566891 * @summary Check no memory leak on RMIConnector's rmbscMap * @author Shanliang JIANG + * @modules java.management * @run clean RMIConnectorInternalMapTest * @run build RMIConnectorInternalMapTest * @run main RMIConnectorInternalMapTest diff --git a/test/javax/management/remote/mandatory/connection/RMIConnectorNullSubjectConnTest.java b/test/javax/management/remote/mandatory/connection/RMIConnectorNullSubjectConnTest.java --- a/test/javax/management/remote/mandatory/connection/RMIConnectorNullSubjectConnTest.java +++ b/test/javax/management/remote/mandatory/connection/RMIConnectorNullSubjectConnTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -38,6 +38,7 @@ * @bug 6566891 * @summary Check no memory leak on RMIConnector's nullSubjectConn * @author Shanliang JIANG + * @modules java.management * @run clean RMIConnectorNullSubjectConnTest * @run build RMIConnectorNullSubjectConnTest * @run main RMIConnectorNullSubjectConnTest diff --git a/test/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java b/test/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java --- a/test/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java +++ b/test/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,6 +26,11 @@ * @summary NPE IN RMIConnector.connect * @bug 6984520 * @library /java/rmi/testlibrary + * @modules java.management + * java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @run clean RMIConnector_NPETest * @run build TestLibrary RMID * @run build RMIConnector_NPETest diff --git a/test/javax/management/remote/mandatory/connection/RMIExitTest.java b/test/javax/management/remote/mandatory/connection/RMIExitTest.java --- a/test/javax/management/remote/mandatory/connection/RMIExitTest.java +++ b/test/javax/management/remote/mandatory/connection/RMIExitTest.java @@ -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 @@ * @bug 4917237 * @summary test that process exit immediately after stop() / close() called * @author Jean Francois Denise + * @modules java.management * @run clean RMIExitTest * @run build RMIExitTest * @run main RMIExitTest diff --git a/test/javax/management/remote/mandatory/connection/RMISerializeTest.java b/test/javax/management/remote/mandatory/connection/RMISerializeTest.java --- a/test/javax/management/remote/mandatory/connection/RMISerializeTest.java +++ b/test/javax/management/remote/mandatory/connection/RMISerializeTest.java @@ -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 @@ * @summary Tests to serialize RMIConnector * @bug 5032052 * @author Shanliang JIANG + * @modules java.management * @run clean RMISerializeTest * @run build RMISerializeTest * @run main RMISerializeTest diff --git a/test/javax/management/remote/mandatory/connection/ReconnectTest.java b/test/javax/management/remote/mandatory/connection/ReconnectTest.java --- a/test/javax/management/remote/mandatory/connection/ReconnectTest.java +++ b/test/javax/management/remote/mandatory/connection/ReconnectTest.java @@ -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 4927217 * @summary test to reconnect * @author Shanliang JIANG + * @modules java.management * @run clean ReconnectTest * @run build ReconnectTest * @run main ReconnectTest diff --git a/test/javax/management/remote/mandatory/connectorServer/ConnectorStopDeadlockTest.java b/test/javax/management/remote/mandatory/connectorServer/ConnectorStopDeadlockTest.java --- a/test/javax/management/remote/mandatory/connectorServer/ConnectorStopDeadlockTest.java +++ b/test/javax/management/remote/mandatory/connectorServer/ConnectorStopDeadlockTest.java @@ -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 6475157 * @summary Tests deadlock in simultaneous connection and connector-server close * @author Eamonn McManus + * @modules java.management */ /* This test is somewhat dependent on implementation details. If it suddenly diff --git a/test/javax/management/remote/mandatory/connectorServer/JNDIFailureTest.java b/test/javax/management/remote/mandatory/connectorServer/JNDIFailureTest.java --- a/test/javax/management/remote/mandatory/connectorServer/JNDIFailureTest.java +++ b/test/javax/management/remote/mandatory/connectorServer/JNDIFailureTest.java @@ -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 Tests that JNDI bind failure doesn't leave an orphan RMI * Connector Server object * @author Eamonn McManus + * @modules java.management * @run clean JNDIFailureTest * @run build JNDIFailureTest * @run main JNDIFailureTest diff --git a/test/javax/management/remote/mandatory/connectorServer/MBSFPreStartPostStartTest.java b/test/javax/management/remote/mandatory/connectorServer/MBSFPreStartPostStartTest.java --- a/test/javax/management/remote/mandatory/connectorServer/MBSFPreStartPostStartTest.java +++ b/test/javax/management/remote/mandatory/connectorServer/MBSFPreStartPostStartTest.java @@ -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 setting an MBeanServerForwarder on an already * started RMI connector server has the expected behavior. * @author Luis-Miguel Alventosa + * @modules java.management * @run clean MBSFPreStartPostStartTest * @run build MBSFPreStartPostStartTest * @run main MBSFPreStartPostStartTest diff --git a/test/javax/management/remote/mandatory/connectorServer/RMIExporterTest.java b/test/javax/management/remote/mandatory/connectorServer/RMIExporterTest.java --- a/test/javax/management/remote/mandatory/connectorServer/RMIExporterTest.java +++ b/test/javax/management/remote/mandatory/connectorServer/RMIExporterTest.java @@ -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 5016705 * @summary Tests the use of the RMIExporter class. * @author Luis-Miguel Alventosa + * @modules java.management/com.sun.jmx.remote.internal * @run clean RMIExporterTest * @run build RMIExporterTest * @run main RMIExporterTest diff --git a/test/javax/management/remote/mandatory/connectorServer/SetMBeanServerForwarder.java b/test/javax/management/remote/mandatory/connectorServer/SetMBeanServerForwarder.java --- a/test/javax/management/remote/mandatory/connectorServer/SetMBeanServerForwarder.java +++ b/test/javax/management/remote/mandatory/connectorServer/SetMBeanServerForwarder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, 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 Tests that IllegalArgumentException is thrown when * MBeanServerForwrder is null. * @author Daniel Fuchs + * @modules java.management/com.sun.jmx.remote.security * @run clean SetMBeanServerForwarder * @run build SetMBeanServerForwarder * @run main SetMBeanServerForwarder diff --git a/test/javax/management/remote/mandatory/loading/DefaultProviderTest.java b/test/javax/management/remote/mandatory/loading/DefaultProviderTest.java --- a/test/javax/management/remote/mandatory/loading/DefaultProviderTest.java +++ b/test/javax/management/remote/mandatory/loading/DefaultProviderTest.java @@ -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 4884913 * @summary Tests that default protocols are loaded correctly * @author Eamonn McManus + * @modules java.management * @run clean DefaultProviderTest * @run build DefaultProviderTest * @run main DefaultProviderTest diff --git a/test/javax/management/remote/mandatory/loading/DeserializeEncodedURLTest.java b/test/javax/management/remote/mandatory/loading/DeserializeEncodedURLTest.java --- a/test/javax/management/remote/mandatory/loading/DeserializeEncodedURLTest.java +++ b/test/javax/management/remote/mandatory/loading/DeserializeEncodedURLTest.java @@ -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 4924683 * @summary Check RMI/JRMP stubs can be deserialized using user's loader * @author Eamonn McManus + * @modules java.management * @run clean DeserializeEncodedURLTest SingleClassLoader * @run build DeserializeEncodedURLTest SingleClassLoader * @run main DeserializeEncodedURLTest diff --git a/test/javax/management/remote/mandatory/loading/MethodResultTest.java b/test/javax/management/remote/mandatory/loading/MethodResultTest.java --- a/test/javax/management/remote/mandatory/loading/MethodResultTest.java +++ b/test/javax/management/remote/mandatory/loading/MethodResultTest.java @@ -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,14 @@ * @bug 4898478 * @summary Tests client default class loader used before JSR 160 loader * @author Eamonn McManus + * @modules java.management * @run clean MethodResultTest * @run build MethodResultTest * @run main MethodResultTest */ import java.io.*; +import java.nio.file.Paths; import java.net.*; import java.util.*; import javax.management.*; @@ -56,24 +58,23 @@ */ public class MethodResultTest { public static void main(String[] args) throws Exception { - Class thisClass = MethodResultTest.class; - Class exoticClass = Exotic.class; + Class thisClass = MethodResultTest.class; + Class exoticClass = Exotic.class; String exoticClassName = Exotic.class.getName(); - ClassLoader testClassLoader = thisClass.getClassLoader(); - if (!(testClassLoader instanceof URLClassLoader)) { - System.out.println("TEST INVALID: Not loaded by a " + - "URLClassLoader: " + testClassLoader); - 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 tcl = (URLClassLoader) testClassLoader; - URL[] urls = tcl.getURLs(); ClassLoader shadowLoader = - new ShadowLoader(urls, testClassLoader, + new ShadowLoader(urls, thisClass.getClassLoader(), new String[] {exoticClassName, ExoticMBeanInfo.class.getName(), ExoticException.class.getName()}); - Class cl = shadowLoader.loadClass(exoticClassName); + Class cl = shadowLoader.loadClass(exoticClassName); if (cl == exoticClass) { System.out.println("TEST INVALID: Shadow class loader loaded " + "same class as test class loader"); @@ -197,12 +198,12 @@ } private static boolean checkType(String what, Object object, - Class wrongClass) { + Class wrongClass) { return checkType(what, object, wrongClass, false); } private static boolean checkType(String what, Object object, - Class wrongClass, boolean isException) { + Class wrongClass, boolean isException) { final String type = isException ? "exception" : "object"; final String rendered = isException ? "thrown" : "returned"; System.out.println("For " + type + " " + rendered + " by " + what + @@ -224,7 +225,7 @@ } private static boolean checkExceptionType(String what, Exception exception, - Class wrongClass) { + Class wrongClass) { if (!(exception instanceof MBeanException)) { System.out.println("Exception thrown by " + what + " is not an " + MBeanException.class.getName() + @@ -320,7 +321,7 @@ this.shadowClassNames = Arrays.asList(shadowClassNames); } - protected Class findClass(String name) throws ClassNotFoundException { + protected Class findClass(String name) throws ClassNotFoundException { if (shadowClassNames.contains(name)) return super.findClass(name); else diff --git a/test/javax/management/remote/mandatory/loading/MissingClassTest.java b/test/javax/management/remote/mandatory/loading/MissingClassTest.java --- a/test/javax/management/remote/mandatory/loading/MissingClassTest.java +++ b/test/javax/management/remote/mandatory/loading/MissingClassTest.java @@ -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 4915825 4921009 4934965 4977469 8019584 * @summary Tests behavior when client or server gets object of unknown class * @author Eamonn McManus + * @modules java.management * @run clean MissingClassTest SingleClassLoader * @run build MissingClassTest SingleClassLoader * @run main MissingClassTest diff --git a/test/javax/management/remote/mandatory/loading/RMIDownloadTest.java b/test/javax/management/remote/mandatory/loading/RMIDownloadTest.java --- a/test/javax/management/remote/mandatory/loading/RMIDownloadTest.java +++ b/test/javax/management/remote/mandatory/loading/RMIDownloadTest.java @@ -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 5021246 * @summary Check that class downloading is supported by RMI connector * @author Eamonn McManus + * @modules java.management * @run main RMIDownloadTest receive without * @run main RMIDownloadTest send without * @run main RMIDownloadTest receive with diff --git a/test/javax/management/remote/mandatory/loading/TargetMBeanTest.java b/test/javax/management/remote/mandatory/loading/TargetMBeanTest.java --- a/test/javax/management/remote/mandatory/loading/TargetMBeanTest.java +++ b/test/javax/management/remote/mandatory/loading/TargetMBeanTest.java @@ -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 4910428 * @summary Tests target MBean class loader used before JSR 160 loader * @author Eamonn McManus + * @modules java.management * @run clean TargetMBeanTest * @run build TargetMBeanTest * @run main TargetMBeanTest diff --git a/test/javax/management/remote/mandatory/loading/UserClassLoaderTest.java b/test/javax/management/remote/mandatory/loading/UserClassLoaderTest.java --- a/test/javax/management/remote/mandatory/loading/UserClassLoaderTest.java +++ b/test/javax/management/remote/mandatory/loading/UserClassLoaderTest.java @@ -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 6356458 * @summary test to not lose a user classloader * @author Shanliang JIANG + * @modules java.management * @run clean UserClassLoaderTest * @run build UserClassLoaderTest * @run main UserClassLoaderTest diff --git a/test/javax/management/remote/mandatory/notif/AddRemoveTest.java b/test/javax/management/remote/mandatory/notif/AddRemoveTest.java --- a/test/javax/management/remote/mandatory/notif/AddRemoveTest.java +++ b/test/javax/management/remote/mandatory/notif/AddRemoveTest.java @@ -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 @@ * @bug 4838640 4917194 * @summary test on add/remove NotificationListener * @author Shanliang JIANG + * @modules java.management * @run clean AddRemoveTest * @run build AddRemoveTest * @run main AddRemoveTest diff --git a/test/javax/management/remote/mandatory/notif/ConcurrentModificationTest.java b/test/javax/management/remote/mandatory/notif/ConcurrentModificationTest.java --- a/test/javax/management/remote/mandatory/notif/ConcurrentModificationTest.java +++ b/test/javax/management/remote/mandatory/notif/ConcurrentModificationTest.java @@ -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 7120365 * @summary test on Concurrent Modification * @author Shanliang JIANG + * @modules java.management * @run main ConcurrentModificationTest */ @@ -164,4 +165,4 @@ mserver.removeNotificationListener(delegateName, listener); } } -} \ No newline at end of file +} diff --git a/test/javax/management/remote/mandatory/notif/DeadListenerTest.java b/test/javax/management/remote/mandatory/notif/DeadListenerTest.java --- a/test/javax/management/remote/mandatory/notif/DeadListenerTest.java +++ b/test/javax/management/remote/mandatory/notif/DeadListenerTest.java @@ -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 @@ -25,6 +25,7 @@ * @test * @bug 6957378 * @summary Test that a listener can be removed remotely from an MBean that no longer exists. + * @modules java.management/com.sun.jmx.remote.internal * @author Eamonn McManus */ diff --git a/test/javax/management/remote/mandatory/notif/DiffHBTest.java b/test/javax/management/remote/mandatory/notif/DiffHBTest.java --- a/test/javax/management/remote/mandatory/notif/DiffHBTest.java +++ b/test/javax/management/remote/mandatory/notif/DiffHBTest.java @@ -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 4911721 * @summary test on add/remove NotificationListener * @author Shanliang JIANG + * @modules java.management * @run clean DiffHBTest * @run build DiffHBTest * @run main DiffHBTest diff --git a/test/javax/management/remote/mandatory/notif/EmptyDomainNotificationTest.java b/test/javax/management/remote/mandatory/notif/EmptyDomainNotificationTest.java --- a/test/javax/management/remote/mandatory/notif/EmptyDomainNotificationTest.java +++ b/test/javax/management/remote/mandatory/notif/EmptyDomainNotificationTest.java @@ -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 the expected notification is received by the JMX * client even when the domain in the ObjectName is not specified * @author Shanliang JIANG + * @modules java.management * @run clean EmptyDomainNotificationTest * @run build EmptyDomainNotificationTest * @run main EmptyDomainNotificationTest diff --git a/test/javax/management/remote/mandatory/notif/ListenerScaleTest.java b/test/javax/management/remote/mandatory/notif/ListenerScaleTest.java --- a/test/javax/management/remote/mandatory/notif/ListenerScaleTest.java +++ b/test/javax/management/remote/mandatory/notif/ListenerScaleTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2012, 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 6338874 * @summary Check that notification dispatch is not linear in number of MBeans. * @author Eamonn McManus + * @modules java.management */ /* diff --git a/test/javax/management/remote/mandatory/notif/NotSerializableNotifTest.java b/test/javax/management/remote/mandatory/notif/NotSerializableNotifTest.java --- a/test/javax/management/remote/mandatory/notif/NotSerializableNotifTest.java +++ b/test/javax/management/remote/mandatory/notif/NotSerializableNotifTest.java @@ -26,6 +26,7 @@ * @summary Tests to send a not serializable notification. * @bug 5022196 * @author Shanliang JIANG + * @modules java.management * @run clean NotSerializableNotifTest * @run build NotSerializableNotifTest * @run main NotSerializableNotifTest diff --git a/test/javax/management/remote/mandatory/notif/NotifBufferSizePropertyNameTest.java b/test/javax/management/remote/mandatory/notif/NotifBufferSizePropertyNameTest.java --- a/test/javax/management/remote/mandatory/notif/NotifBufferSizePropertyNameTest.java +++ b/test/javax/management/remote/mandatory/notif/NotifBufferSizePropertyNameTest.java @@ -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 6174229 * @summary Verify the property name specifying server notification buffer size. * @author Shanliang JIANG + * @modules java.management * @run clean NotifBufferSizePropertyNameTest * @run build NotifBufferSizePropertyNameTest * @run main NotifBufferSizePropertyNameTest diff --git a/test/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java b/test/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java --- a/test/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java +++ b/test/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java @@ -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 6199899 * @summary Tests reconnection done by a fetching notif thread. * @author Shanliang JIANG + * @modules java.management * @run clean NotifReconnectDeadlockTest * @run build NotifReconnectDeadlockTest * @run main NotifReconnectDeadlockTest diff --git a/test/javax/management/remote/mandatory/notif/NotificationAccessControllerTest.java b/test/javax/management/remote/mandatory/notif/NotificationAccessControllerTest.java --- a/test/javax/management/remote/mandatory/notif/NotificationAccessControllerTest.java +++ b/test/javax/management/remote/mandatory/notif/NotificationAccessControllerTest.java @@ -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 @@ -26,6 +26,7 @@ * @bug 5106721 * @summary Check the NotificationAccessController methods are properly called. * @author Luis-Miguel Alventosa + * @modules java.management/com.sun.jmx.remote.security * @run clean NotificationAccessControllerTest * @run build NotificationAccessControllerTest * @run main NotificationAccessControllerTest diff --git a/test/javax/management/remote/mandatory/notif/NotificationBufferCreationTest.java b/test/javax/management/remote/mandatory/notif/NotificationBufferCreationTest.java --- a/test/javax/management/remote/mandatory/notif/NotificationBufferCreationTest.java +++ b/test/javax/management/remote/mandatory/notif/NotificationBufferCreationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, 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 4934236 * @summary Tests that NotificationBuffer is created when used. * @author jfd@... + * @modules java.management * @run clean NotificationBufferCreationTest NotificationSender * @run build NotificationBufferCreationTest * @run main NotificationBufferCreationTest diff --git a/test/javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java b/test/javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java --- a/test/javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java +++ b/test/javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java @@ -27,6 +27,7 @@ * @summary Tests NotificationBuffer doesn't hold locks when adding listeners, * if test times out then deadlock is suspected. * @author Eamonn McManus + * @modules java.management * @run clean NotificationBufferDeadlockTest * @run build NotificationBufferDeadlockTest * @run main NotificationBufferDeadlockTest diff --git a/test/javax/management/remote/mandatory/notif/NotificationBufferTest.java b/test/javax/management/remote/mandatory/notif/NotificationBufferTest.java --- a/test/javax/management/remote/mandatory/notif/NotificationBufferTest.java +++ b/test/javax/management/remote/mandatory/notif/NotificationBufferTest.java @@ -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 @@ -26,6 +26,8 @@ * @bug 7654321 * @summary Tests the NotificationBuffer class. * @author Eamonn McManus + * @modules java.management/com.sun.jmx.remote.internal + * java.management/com.sun.jmx.remote.util * @run clean NotificationBufferTest * @run build NotificationBufferTest NotificationSender NotificationSenderMBean * @run main NotificationBufferTest diff --git a/test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java b/test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java --- a/test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java +++ b/test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java @@ -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 Check the emission of notifications when a Security Manager is * installed. Test the property "jmx.remote.x.check.notification.emission". * @author Luis-Miguel Alventosa + * @modules java.management * @run clean NotificationEmissionTest * @run build NotificationEmissionTest * @run main NotificationEmissionTest 1 diff --git a/test/javax/management/remote/mandatory/notif/RMINotifTest.java b/test/javax/management/remote/mandatory/notif/RMINotifTest.java --- a/test/javax/management/remote/mandatory/notif/RMINotifTest.java +++ b/test/javax/management/remote/mandatory/notif/RMINotifTest.java @@ -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 Tests to receive notifications for opened and closed connections ions * @author sjiang + * @modules java.management * @run clean RMINotifTest * @run build RMINotifTest * @run main RMINotifTest diff --git a/test/javax/management/remote/mandatory/notif/ServerNotifs.java b/test/javax/management/remote/mandatory/notif/ServerNotifs.java --- a/test/javax/management/remote/mandatory/notif/ServerNotifs.java +++ b/test/javax/management/remote/mandatory/notif/ServerNotifs.java @@ -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 Tests the reception of the notifications for opened and closed * connections * @author sjiang + * @modules java.management * @run clean ServerNotifs * @run build ServerNotifs * @run main ServerNotifs diff --git a/test/javax/management/remote/mandatory/notif/UnexpectedNotifTest.java b/test/javax/management/remote/mandatory/notif/UnexpectedNotifTest.java --- a/test/javax/management/remote/mandatory/notif/UnexpectedNotifTest.java +++ b/test/javax/management/remote/mandatory/notif/UnexpectedNotifTest.java @@ -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 Tests whether a listener receives notifs emitted before the * listener is registered. * @author Shanliang JIANG + * @modules java.management * @run clean UnexpectedNotifTest * @run build UnexpectedNotifTest * @run main UnexpectedNotifTest diff --git a/test/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java b/test/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java --- a/test/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java +++ b/test/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java @@ -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 Tests that MBeanServerFileAccessController supports * principals other than JMXPrincipal. * @author Luis-Miguel Alventosa + * @modules java.management * @run clean NonJMXPrincipalsTest SimpleStandard SimpleStandardMBean * @run build NonJMXPrincipalsTest SimpleStandard SimpleStandardMBean * @run main NonJMXPrincipalsTest diff --git a/test/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java b/test/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java --- a/test/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java +++ b/test/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java @@ -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 Tests the use of the "jmx.remote.x.password.file" and * "jmx.remote.x.access.file" environment map properties. * @author Luis-Miguel Alventosa + * @modules java.management * @run clean PasswordAccessFileTest SimpleStandard SimpleStandardMBean * @run build PasswordAccessFileTest SimpleStandard SimpleStandardMBean * @run main PasswordAccessFileTest diff --git a/test/javax/management/remote/mandatory/passwordAuthenticator/RMIAltAuthTest.java b/test/javax/management/remote/mandatory/passwordAuthenticator/RMIAltAuthTest.java --- a/test/javax/management/remote/mandatory/passwordAuthenticator/RMIAltAuthTest.java +++ b/test/javax/management/remote/mandatory/passwordAuthenticator/RMIAltAuthTest.java @@ -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 5016508 * @summary Supplies an alternative JAAS configuration for authenticating RMI clients * @author Luis-Miguel Alventosa + * @modules java.management/com.sun.jmx.remote.security * @run clean RMIAltAuthTest * @run build RMIAltAuthTest SimpleStandard SimpleStandardMBean * @run main RMIAltAuthTest diff --git a/test/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java b/test/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java --- a/test/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java +++ b/test/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java @@ -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 5016508 * @summary Tests the default JAAS configuration for authenticating RMI clients * @author Luis-Miguel Alventosa + * @modules java.management/com.sun.jmx.remote.security * @run clean RMIPasswdAuthTest * @run build RMIPasswdAuthTest SimpleStandard SimpleStandardMBean * @run main RMIPasswdAuthTest diff --git a/test/javax/management/remote/mandatory/provider/ProviderTest.java b/test/javax/management/remote/mandatory/provider/ProviderTest.java --- a/test/javax/management/remote/mandatory/provider/ProviderTest.java +++ b/test/javax/management/remote/mandatory/provider/ProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, 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,7 @@ /* * @test ProviderTest.java * @summary Tests jar services provider are called + * @modules java.management * @run clean ProviderTest provider.JMXConnectorProviderImpl provider.JMXConnectorServerProviderImpl * @run build ProviderTest provider.JMXConnectorProviderImpl provider.JMXConnectorServerProviderImpl * @run main ProviderTest diff --git a/test/javax/management/remote/mandatory/serverError/JMXServerErrorTest.java b/test/javax/management/remote/mandatory/serverError/JMXServerErrorTest.java --- a/test/javax/management/remote/mandatory/serverError/JMXServerErrorTest.java +++ b/test/javax/management/remote/mandatory/serverError/JMXServerErrorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, 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 4871761 * @summary Tests that JMXServiceErrorException is correctly emitted. * @author Daniel Fuchs + * @modules java.management/com.sun.jmx.remote.security * @run clean JMXServerErrorTest * @run build JMXServerErrorTest * @run main JMXServerErrorTest diff --git a/test/javax/management/remote/mandatory/socketFactories/RMISocketFactoriesTest.java b/test/javax/management/remote/mandatory/socketFactories/RMISocketFactoriesTest.java --- a/test/javax/management/remote/mandatory/socketFactories/RMISocketFactoriesTest.java +++ b/test/javax/management/remote/mandatory/socketFactories/RMISocketFactoriesTest.java @@ -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 7654321 * @summary Tests the use of the custom RMI socket factories. * @author Luis-Miguel Alventosa + * @modules java.management * @run clean RMISocketFactoriesTest * @run build RMISocketFactoriesTest RMIClientFactory RMIServerFactory * @run main RMISocketFactoriesTest test_server_factory diff --git a/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation1Test.java b/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation1Test.java --- a/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation1Test.java +++ b/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation1Test.java @@ -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 Tests the use of the subject delegation feature in the * RMI connector * @author Luis-Miguel Alventosa + * @modules java.management/com.sun.jmx.remote.security * @run clean SubjectDelegation1Test SimpleStandard SimpleStandardMBean * @run build SubjectDelegation1Test SimpleStandard SimpleStandardMBean * @run main SubjectDelegation1Test policy11 ok diff --git a/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java b/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java --- a/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java +++ b/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java @@ -27,6 +27,7 @@ * @summary Tests the use of the subject delegation feature on the authenticated * principals within the RMI connector server's creator codebase. * @author Luis-Miguel Alventosa + * @modules java.management/com.sun.jmx.remote.security * @run clean SubjectDelegation2Test SimpleStandard SimpleStandardMBean * @run build SubjectDelegation2Test SimpleStandard SimpleStandardMBean * @run main SubjectDelegation2Test policy21 ok diff --git a/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java b/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java --- a/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java +++ b/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java @@ -28,6 +28,7 @@ * principals within the RMI connector server's creator codebase with * subject delegation. * @author Luis-Miguel Alventosa + * @modules java.management/com.sun.jmx.remote.security * @run clean SubjectDelegation3Test SimpleStandard SimpleStandardMBean * @run build SubjectDelegation3Test SimpleStandard SimpleStandardMBean * @run main SubjectDelegation3Test policy31 ok diff --git a/test/javax/management/remote/mandatory/threads/ExecutorTest.java b/test/javax/management/remote/mandatory/threads/ExecutorTest.java --- a/test/javax/management/remote/mandatory/threads/ExecutorTest.java +++ b/test/javax/management/remote/mandatory/threads/ExecutorTest.java @@ -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 @@ -26,6 +26,7 @@ * @bug 6190873 * @summary Tests that thread creation can use a user-supplied Executor * @author Eamonn McManus + * @modules java.management * @run clean ExecutorTest * @run build ExecutorTest * @run main ExecutorTest diff --git a/test/javax/management/remote/mandatory/threads/NoServerTimeoutTest.java b/test/javax/management/remote/mandatory/threads/NoServerTimeoutTest.java --- a/test/javax/management/remote/mandatory/threads/NoServerTimeoutTest.java +++ b/test/javax/management/remote/mandatory/threads/NoServerTimeoutTest.java @@ -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 6192124 * @summary Tests that you can turn off the server connection timeout thread * @author Eamonn McManus + * @modules java.management * @run clean NoServerTimeoutTest * @run build NoServerTimeoutTest * @run main NoServerTimeoutTest diff --git a/test/javax/management/remote/mandatory/util/MapNullValuesTest.java b/test/javax/management/remote/mandatory/util/MapNullValuesTest.java --- a/test/javax/management/remote/mandatory/util/MapNullValuesTest.java +++ b/test/javax/management/remote/mandatory/util/MapNullValuesTest.java @@ -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 @@ -31,6 +31,7 @@ * Check also that null values for keys are not allowed in * the maps passed to the JMXConnector[Server] factories. * @author Luis-Miguel Alventosa + * @modules java.management/com.sun.jmx.remote.util * @run clean MapNullValuesTest * @run build MapNullValuesTest * @run main MapNullValuesTest diff --git a/test/javax/management/remote/mandatory/version/ImplVersionTest.java b/test/javax/management/remote/mandatory/version/ImplVersionTest.java --- a/test/javax/management/remote/mandatory/version/ImplVersionTest.java +++ b/test/javax/management/remote/mandatory/version/ImplVersionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2006, 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 @@ * security manager and the test codebase has the java permission to read * the "java.runtime.version" system property. * @author Luis-Miguel Alventosa, Joel Feraud + * @modules java.management * @run clean ImplVersionTest ImplVersionCommand * @run build ImplVersionTest ImplVersionCommand ImplVersionReader * @run main ImplVersionTest @@ -66,13 +67,9 @@ // Get test classes String testClasses = System.getProperty("test.classes"); - // Get boot class path - String bootClassPath = System.getProperty("sun.boot.class.path"); - // Build command string 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 + diff --git a/test/javax/management/security/AvoidGetMBeanInfoCallsTest.java b/test/javax/management/security/AvoidGetMBeanInfoCallsTest.java --- a/test/javax/management/security/AvoidGetMBeanInfoCallsTest.java +++ b/test/javax/management/security/AvoidGetMBeanInfoCallsTest.java @@ -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 MBeanServer.queryNames doesn't call getMBeanInfo on every * resultant MBean when there is no security manager installed. * @author Luis-Miguel Alventosa + * @modules java.management * @run clean AvoidGetMBeanInfoCallsTest * @run build AvoidGetMBeanInfoCallsTest * @run main AvoidGetMBeanInfoCallsTest diff --git a/test/javax/management/security/MBeanPermissionTest.java b/test/javax/management/security/MBeanPermissionTest.java --- a/test/javax/management/security/MBeanPermissionTest.java +++ b/test/javax/management/security/MBeanPermissionTest.java @@ -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 6228749 * @summary MBeanPermission(null,"") should throw IllegalArgumentException. * @author Luis-Miguel Alventosa + * @modules java.management * @run clean MBeanPermissionTest * @run build MBeanPermissionTest * @run main MBeanPermissionTest diff --git a/test/javax/management/standardmbean/DeadlockTest.java b/test/javax/management/standardmbean/DeadlockTest.java --- a/test/javax/management/standardmbean/DeadlockTest.java +++ b/test/javax/management/standardmbean/DeadlockTest.java @@ -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 @@ -26,6 +26,7 @@ * @bug 6331746 * @summary Test a deadlock and will be blocked forever if the deadlock is present. * @author Shanliang JIANG + * @modules java.management * @run main DeadlockTest */ diff --git a/test/javax/management/timer/MissingNotificationTest.java b/test/javax/management/timer/MissingNotificationTest.java --- a/test/javax/management/timer/MissingNotificationTest.java +++ b/test/javax/management/timer/MissingNotificationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2012, 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 6809322 * @summary Test for missing notifications in a high concurrency environment * @author Jaroslav Bachorik + * @modules java.management * @run clean MissingNotificationTest * @run build MissingNotificationTest * @run main MissingNotificationTest diff --git a/test/javax/management/timer/StartTest.java b/test/javax/management/timer/StartTest.java --- a/test/javax/management/timer/StartTest.java +++ b/test/javax/management/timer/StartTest.java @@ -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 @@ -26,6 +26,7 @@ * @bug 6659215 * @summary Test on timer start method with past notifications * @author Shanliang JIANG + * @modules java.management * @run clean StartTest * @run build StartTest * @run main StartTest diff --git a/test/sun/jvmstat/monitor/HostIdentifier/HostIdentifierCreate.java b/test/sun/jvmstat/monitor/HostIdentifier/HostIdentifierCreate.java --- a/test/sun/jvmstat/monitor/HostIdentifier/HostIdentifierCreate.java +++ b/test/sun/jvmstat/monitor/HostIdentifier/HostIdentifierCreate.java @@ -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 @@ -24,6 +24,7 @@ /* * @test * @bug 4990825 + * @modules jdk.jvmstat/sun.jvmstat.monitor * @summary test that HostIdentifier objects get created as expected */ diff --git a/test/sun/jvmstat/monitor/MonitoredVm/CR6672135.java b/test/sun/jvmstat/monitor/MonitoredVm/CR6672135.java --- a/test/sun/jvmstat/monitor/MonitoredVm/CR6672135.java +++ b/test/sun/jvmstat/monitor/MonitoredVm/CR6672135.java @@ -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 @@ -34,6 +34,7 @@ * @bug 6672135 * @summary setInterval() for local MonitoredHost and local MonitoredVm * @author Tomas Hurka + * @modules jdk.jvmstat/sun.jvmstat.monitor * @run main/othervm -XX:+UsePerfData CR6672135 */ public class CR6672135 { diff --git a/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java b/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java --- a/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java +++ b/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java @@ -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 @@ -67,6 +67,9 @@ * @bug 4990825 * @summary attach to external but local JVM processes * @library /lib/testlibrary + * @modules java.management + * jdk.jvmstat/sun.jvmstat.monitor + * jdk.jvmstat/sun.jvmstat.monitor.event * @build jdk.testlibrary.* * @run main/othervm MonitorVmStartTerminate */ diff --git a/test/sun/jvmstat/monitor/VmIdentifier/VmIdentifierCreateResolve.java b/test/sun/jvmstat/monitor/VmIdentifier/VmIdentifierCreateResolve.java --- a/test/sun/jvmstat/monitor/VmIdentifier/VmIdentifierCreateResolve.java +++ b/test/sun/jvmstat/monitor/VmIdentifier/VmIdentifierCreateResolve.java @@ -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 @@ -24,6 +24,7 @@ /* * @test * @bug 4990825 + * @modules jdk.jvmstat/sun.jvmstat.monitor * @summary test that VmIdentifier objects get created as expected */ diff --git a/test/sun/jvmstat/perfdata/PrologSanity/PrologSizeSanityCheck.java b/test/sun/jvmstat/perfdata/PrologSanity/PrologSizeSanityCheck.java --- a/test/sun/jvmstat/perfdata/PrologSanity/PrologSizeSanityCheck.java +++ b/test/sun/jvmstat/perfdata/PrologSanity/PrologSizeSanityCheck.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, 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 @@ -24,6 +24,7 @@ /* * @test * @bug 4990825 + * @modules jdk.jvmstat/sun.jvmstat.monitor * @run main/othervm -XX:+UsePerfData PrologSizeSanityCheck * @summary prolog size and overflow sanity checks */ diff --git a/test/sun/management/AgentCMETest.java b/test/sun/management/AgentCMETest.java --- a/test/sun/management/AgentCMETest.java +++ b/test/sun/management/AgentCMETest.java @@ -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 @@ * @test * @bug 7164191 * @summary properties.putAll API may fail with ConcurrentModifcationException on multi-thread scenario + * @modules java.management/sun.management * @author Deven You */ diff --git a/test/sun/management/AgentCheckTest.java b/test/sun/management/AgentCheckTest.java --- a/test/sun/management/AgentCheckTest.java +++ b/test/sun/management/AgentCheckTest.java @@ -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 @@ -25,6 +25,7 @@ * @test * @bug 5013605 * @summary Localize log messages from the management agents + * @modules java.management/sun.management * * @author Tim Bell */ diff --git a/test/sun/management/HotspotClassLoadingMBean/GetClassInitializationTime.java b/test/sun/management/HotspotClassLoadingMBean/GetClassInitializationTime.java --- a/test/sun/management/HotspotClassLoadingMBean/GetClassInitializationTime.java +++ b/test/sun/management/HotspotClassLoadingMBean/GetClassInitializationTime.java @@ -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 4858522 * @summary Basic unit test of HotspotClassLoadingMBean.getClassInitializationTime() * @author Steve Bohne + * @modules java.management/sun.management * @run main/othervm -XX:+UsePerfData GetClassInitializationTime */ diff --git a/test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java b/test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java --- a/test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java +++ b/test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java @@ -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 4858522 * @summary Basic unit test of HotspotClassLoadingMBean.getClassLoadingTime() * @author Steve Bohne + * @modules java.management/sun.management * @build ClassToLoad0 * @run main/othervm -XX:+UsePerfData GetClassLoadingTime */ diff --git a/test/sun/management/HotspotClassLoadingMBean/GetInitializedClassCount.java b/test/sun/management/HotspotClassLoadingMBean/GetInitializedClassCount.java --- a/test/sun/management/HotspotClassLoadingMBean/GetInitializedClassCount.java +++ b/test/sun/management/HotspotClassLoadingMBean/GetInitializedClassCount.java @@ -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 4858522 * @summary Basic unit test of HotspotClassLoadingMBean.getInitializedClassCount() * @author Steve Bohne + * @modules java.management/sun.management * @run main/othervm -XX:+UsePerfData GetInitializedClassCount */ diff --git a/test/sun/management/HotspotClassLoadingMBean/GetLoadedClassSize.java b/test/sun/management/HotspotClassLoadingMBean/GetLoadedClassSize.java --- a/test/sun/management/HotspotClassLoadingMBean/GetLoadedClassSize.java +++ b/test/sun/management/HotspotClassLoadingMBean/GetLoadedClassSize.java @@ -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 4858522 * @summary Basic unit test of HotspotClassLoadingMBean.getLoadedClassSize() * @author Steve Bohne + * @modules java.management/sun.management * @run main/othervm -XX:+UsePerfData GetLoadedClassSize */ diff --git a/test/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java b/test/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java --- a/test/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java +++ b/test/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java @@ -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 4858522 * @summary Basic unit test of HotspotClassLoadingMBean.getMethodDataSize() * @author Steve Bohne + * @modules java.management/sun.management * @run main/othervm -XX:+UsePerfData GetMethodDataSize */ diff --git a/test/sun/management/HotspotClassLoadingMBean/GetUnloadedClassSize.java b/test/sun/management/HotspotClassLoadingMBean/GetUnloadedClassSize.java --- a/test/sun/management/HotspotClassLoadingMBean/GetUnloadedClassSize.java +++ b/test/sun/management/HotspotClassLoadingMBean/GetUnloadedClassSize.java @@ -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 4858522 * @summary Basic unit test of HotspotClassLoadingMBean.getUnloadedClassSize() * @author Steve Bohne + * @modules java.management/sun.management * @run main/othervm -XX:+UsePerfData GetUnloadedClassSize */ diff --git a/test/sun/management/HotspotRuntimeMBean/GetSafepointCount.java b/test/sun/management/HotspotRuntimeMBean/GetSafepointCount.java --- a/test/sun/management/HotspotRuntimeMBean/GetSafepointCount.java +++ b/test/sun/management/HotspotRuntimeMBean/GetSafepointCount.java @@ -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 4858522 * @summary Basic unit test of HotspotClassLoadingMBean.getSafepointCount() * @author Steve Bohne + * @modules java.management/sun.management * @run main/othervm -XX:+UsePerfData GetSafepointCount */ diff --git a/test/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java b/test/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java --- a/test/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java +++ b/test/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java @@ -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 4858522 * @summary Basic unit test of HotspotRuntimeMBean.getSafepointSyncTime() * @author Steve Bohne + * @modules java.management/sun.management * @run main/othervm -XX:+UsePerfData GetSafepointSyncTime */ diff --git a/test/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java b/test/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java --- a/test/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java +++ b/test/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java @@ -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 @@ -24,6 +24,7 @@ /* * @test * @bug 4858522 + * @modules java.management/sun.management * @summary Basic unit test of HotspotRuntimeMBean.getTotalSafepointTime() * @author Steve Bohne */ diff --git a/test/sun/management/HotspotThreadMBean/GetInternalThreads.java b/test/sun/management/HotspotThreadMBean/GetInternalThreads.java --- a/test/sun/management/HotspotThreadMBean/GetInternalThreads.java +++ b/test/sun/management/HotspotThreadMBean/GetInternalThreads.java @@ -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 Test for HotspotThreadMBean.getInternalThreadCount() * and getInternalThreadCpuTime() * @author Mandy Chung + * @modules java.management/sun.management * @run main/othervm -XX:+UsePerfData GetInternalThreads */ diff --git a/test/sun/management/jdp/JdpDefaultsTest.java b/test/sun/management/jdp/JdpDefaultsTest.java --- a/test/sun/management/jdp/JdpDefaultsTest.java +++ b/test/sun/management/jdp/JdpDefaultsTest.java @@ -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 @@ * @test JdpDefaultsTest * @summary Assert that we can read JDP packets from a multicast socket connection, on default IP and port. * @library /lib/testlibrary + * @modules java.management/sun.management.jdp * @build jdk.testlibrary.* ClientConnection JdpTestUtil JdpTestCase JdpOnTestCase DynamicLauncher * @run main JdpDefaultsTest */ diff --git a/test/sun/management/jdp/JdpOffTest.java b/test/sun/management/jdp/JdpOffTest.java --- a/test/sun/management/jdp/JdpOffTest.java +++ b/test/sun/management/jdp/JdpOffTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,6 +32,7 @@ * @test JdpOffTest.java * @summary Assert that no JDP packets are sent to the default address and port. * @library /lib/testlibrary + * @modules java.management/sun.management.jdp * @build jdk.testlibrary.* ClientConnection JdpTestUtil JdpTestCase JdpOffTestCase DynamicLauncher * @run main JdpOffTest */ diff --git a/test/sun/management/jdp/JdpSpecificAddressTest.java b/test/sun/management/jdp/JdpSpecificAddressTest.java --- a/test/sun/management/jdp/JdpSpecificAddressTest.java +++ b/test/sun/management/jdp/JdpSpecificAddressTest.java @@ -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 @@ * @test JdpSpecificAddressTest * @summary Assert that we can read JDP packets from a multicast socket connection, on specific IP and port. * @library /lib/testlibrary + * @modules java.management/sun.management.jdp * @build jdk.testlibrary.* ClientConnection JdpTestUtil JdpTestCase JdpOnTestCase DynamicLauncher * @run main JdpSpecificAddressTest */ diff --git a/test/sun/management/jmxremote/LocalRMIServerSocketFactoryTest.java b/test/sun/management/jmxremote/LocalRMIServerSocketFactoryTest.java --- a/test/sun/management/jmxremote/LocalRMIServerSocketFactoryTest.java +++ b/test/sun/management/jmxremote/LocalRMIServerSocketFactoryTest.java @@ -28,6 +28,7 @@ * * @author Daniel Fuchs * + * @modules java.management/sun.management.jmxremote * @run compile -XDignore.symbol.file=true -g LocalRMIServerSocketFactoryTest.java * @run main LocalRMIServerSocketFactoryTest */ diff --git a/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java b/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java --- a/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java +++ b/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java @@ -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,8 @@ * @test * @bug 6434402 8004926 * @library /lib/testlibrary + * @modules java.management/sun.management + * java.management * @build jdk.testlibrary.* * @build TestManager TestApplication CustomLauncherTest * @run main/othervm CustomLauncherTest diff --git a/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java b/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java --- a/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java +++ b/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2014, 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 Tests that the jvmstat counters published by the out-of-the-box * management agent for the JMX connection details are correct. * @author Luis-Miguel Alventosa + * @modules java.management/sun.management * @run clean JvmstatCountersTest * @run build JvmstatCountersTest * @run main/othervm/timeout=600 -XX:+UsePerfData JvmstatCountersTest 1 diff --git a/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java b/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java --- a/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java +++ b/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java @@ -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 @@ -37,6 +37,7 @@ * without connection or username/password details. * TestManager will attempt a connection to the address obtained from * both agent properties and jvmstat buffer. + * @modules java.management/sun.management * @build jdk.testlibrary.* TestManager TestApplication * @run main/othervm/timeout=300 -XX:+UsePerfData LocalManagementTest */ diff --git a/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.java b/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.java --- a/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.java +++ b/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.java @@ -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 @@ * @library /lib/testlibrary * @bug 6557093 * @summary Check SSL config file permission for out-of-the-box management + * @modules java.management * @build jdk.testlibrary.* AbstractFilePermissionTest Dummy * @run main/timeout=300 PasswordFilePermissionTest * diff --git a/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh b/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh --- a/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh +++ b/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh @@ -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,9 @@ # @summary Test RMI Bootstrap # # @library /lib/testlibrary +# @modules java.management/sun.management +# java.management/sun.management.jmxremote +# java.management # @build jdk.testlibrary.* TestLogger Utils RmiBootstrapTest # @run shell/timeout=300 RmiBootstrapTest.sh diff --git a/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java b/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java --- a/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java +++ b/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java @@ -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 @@ -42,6 +42,7 @@ * @library /lib/testlibrary * @bug 6228231 * @summary Test that RMI registry uses SSL. + * @modules java.management * @build jdk.testlibrary.* RmiRegistrySslTestApp * @run main/timeout=300 RmiRegistrySslTest * @author Luis-Miguel Alventosa, Taras Ledkov diff --git a/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh b/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh --- a/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh +++ b/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh @@ -27,9 +27,11 @@ # @summary Test RMI Bootstrap with SSL # # @library /lib/testlibrary +# @modules java.management/sun.management +# java.management/sun.management.jmxremote +# @ignore 8077924 # @build jdk.testlibrary.* TestLogger Utils RmiBootstrapTest # @run shell/timeout=300 RmiSslBootstrapTest.sh -# @ignore 8077924 # Define the Java class test name TESTCLASS="RmiBootstrapTest" diff --git a/test/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh b/test/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh --- a/test/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh +++ b/test/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh @@ -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,8 @@ # @summary Test RMI Bootstrap with SSL and no keystore. # # @bug 4932854 +# @modules java.management/sun.management +# java.management/sun.management.jmxremote # @build TestLogger RmiSslNoKeyStoreTest # @run shell/timeout=300 RmiSslNoKeyStoreTest.sh diff --git a/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.java b/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.java --- a/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.java +++ b/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.java @@ -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 @@ * @test * @library /lib/testlibrary * @bug 6557093 + * @modules java.management * @build jdk.testlibrary.* Dummy AbstractFilePermissionTest * @summary Check SSL config file permission for out-of-the-box management * @run main/timeout=300 SSLConfigFilePermissionTest diff --git a/test/sun/management/jmxremote/startstop/JMXStartStopTest.java b/test/sun/management/jmxremote/startstop/JMXStartStopTest.java --- a/test/sun/management/jmxremote/startstop/JMXStartStopTest.java +++ b/test/sun/management/jmxremote/startstop/JMXStartStopTest.java @@ -56,6 +56,7 @@ * @test * @bug 7110104 * @library /lib/testlibrary + * @modules java.management/sun.management * @build jdk.testlibrary.* JMXStartStopTest JMXStartStopDoSomething * @run main/othervm/timeout=600 -XX:+UsePerfData JMXStartStopTest * @summary Makes sure that enabling/disabling the management agent through JCMD diff --git a/test/sun/tools/jcmd/TestJcmdDefaults.java b/test/sun/tools/jcmd/TestJcmdDefaults.java --- a/test/sun/tools/jcmd/TestJcmdDefaults.java +++ b/test/sun/tools/jcmd/TestJcmdDefaults.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2014, 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 @@ -42,6 +42,7 @@ * @test * @bug 7104647 * @library /lib/testlibrary + * @modules java.management * @build jdk.testlibrary.* * @run main TestJcmdDefaults */ diff --git a/test/sun/tools/jcmd/TestJcmdSanity.java b/test/sun/tools/jcmd/TestJcmdSanity.java --- a/test/sun/tools/jcmd/TestJcmdSanity.java +++ b/test/sun/tools/jcmd/TestJcmdSanity.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2014, 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 @@ -43,6 +43,7 @@ * @test * @bug 7104647 7154822 * @library /lib/testlibrary + * @modules java.management * @build jdk.testlibrary.* * @run main/othervm -XX:+UsePerfData TestJcmdSanity */ diff --git a/test/sun/tools/jconsole/ResourceCheckTest.java b/test/sun/tools/jconsole/ResourceCheckTest.java --- a/test/sun/tools/jconsole/ResourceCheckTest.java +++ b/test/sun/tools/jconsole/ResourceCheckTest.java @@ -26,6 +26,7 @@ * @test * @bug 5008856 5023573 5024917 5062569 7172176 * @summary 'missing resource key' error for key = "Operating system" + * @modules jdk.jconsole/sun.tools.jconsole * @run main ResourceCheckTest */ diff --git a/test/sun/tools/jhat/HatHeapDump1Test.java b/test/sun/tools/jhat/HatHeapDump1Test.java --- a/test/sun/tools/jhat/HatHeapDump1Test.java +++ b/test/sun/tools/jhat/HatHeapDump1Test.java @@ -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 @@ -33,6 +33,7 @@ * @bug 5102009 * @summary Sanity test of jhat functionality * @library /lib/testlibrary + * @modules java.management * @build jdk.testlibarary.* * @compile -g HelloWorld.java * @run main HatHeapDump1Test diff --git a/test/sun/tools/jinfo/JInfoLauncherTest.java b/test/sun/tools/jinfo/JInfoLauncherTest.java --- a/test/sun/tools/jinfo/JInfoLauncherTest.java +++ b/test/sun/tools/jinfo/JInfoLauncherTest.java @@ -36,6 +36,7 @@ /** * @test * @bug 8039080 + * @modules jdk.jcmd/sun.tools.jinfo * @run testng JInfoLauncherTest * @summary Test JInfo launcher argument parsing */ diff --git a/test/sun/tools/jinfo/JInfoRunningProcessFlagTest.java b/test/sun/tools/jinfo/JInfoRunningProcessFlagTest.java --- a/test/sun/tools/jinfo/JInfoRunningProcessFlagTest.java +++ b/test/sun/tools/jinfo/JInfoRunningProcessFlagTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -37,6 +37,7 @@ * @test * @summary The test sanity checks 'jinfo -flag' option. * @library /lib/testlibrary + * @modules java.management * @build jdk.testlibrary.* JInfoHelper * @run main/othervm -XX:+HeapDumpOnOutOfMemoryError JInfoRunningProcessFlagTest */ diff --git a/test/sun/tools/jinfo/JInfoRunningProcessTest.java b/test/sun/tools/jinfo/JInfoRunningProcessTest.java --- a/test/sun/tools/jinfo/JInfoRunningProcessTest.java +++ b/test/sun/tools/jinfo/JInfoRunningProcessTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,6 +30,7 @@ * @test * @summary The test sanity checks functionality of 'jinfo', 'jinfo -sysprops' and 'jinfo -flags' * @library /lib/testlibrary + * @modules java.management * @build jdk.testlibrary.* JInfoHelper * @run main/othervm -XX:+HeapDumpOnOutOfMemoryError JInfoRunningProcessTest */ diff --git a/test/sun/tools/jinfo/JInfoSanityTest.java b/test/sun/tools/jinfo/JInfoSanityTest.java --- a/test/sun/tools/jinfo/JInfoSanityTest.java +++ b/test/sun/tools/jinfo/JInfoSanityTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,6 +33,7 @@ * @summary The test sanity checks functionality of 'jinfo -h', 'jinfo -help', * and verifies jinfo exits abnormally if started with invalid options. * @library /lib/testlibrary + * @modules java.management * @build jdk.testlibrary.* JInfoHelper * @run main JInfoSanityTest */ diff --git a/test/sun/tools/jmap/BasicJMapTest.java b/test/sun/tools/jmap/BasicJMapTest.java --- a/test/sun/tools/jmap/BasicJMapTest.java +++ b/test/sun/tools/jmap/BasicJMapTest.java @@ -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 @@ -34,6 +34,7 @@ * @bug 6321286 * @summary Unit test for jmap utility * @library /lib/testlibrary + * @modules java.management * @build jdk.testlibrary.* * @run main BasicJMapTest */ diff --git a/test/sun/tools/jmap/heapconfig/JMapHeapConfigTest.java b/test/sun/tools/jmap/heapconfig/JMapHeapConfigTest.java --- a/test/sun/tools/jmap/heapconfig/JMapHeapConfigTest.java +++ b/test/sun/tools/jmap/heapconfig/JMapHeapConfigTest.java @@ -26,6 +26,7 @@ * @bug 8042397 * @summary Unit test for jmap utility test heap configuration reader * @library /lib/testlibrary + * @modules java.management * @build jdk.testlibrary.* * @build JMapHeapConfigTest LingeredApp TmtoolTestScenario * @run main JMapHeapConfigTest diff --git a/test/sun/tools/jps/TestJpsClass.java b/test/sun/tools/jps/TestJpsClass.java --- a/test/sun/tools/jps/TestJpsClass.java +++ b/test/sun/tools/jps/TestJpsClass.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -35,6 +35,8 @@ * will be started from within the test application. * The output should contain proper values. * @library /lib/testlibrary + * @modules jdk.jartool/sun.tools.jar + * java.management * @build jdk.testlibrary.* JpsHelper JpsBase * @run driver TestJpsClass */ diff --git a/test/sun/tools/jps/TestJpsJar.java b/test/sun/tools/jps/TestJpsJar.java --- a/test/sun/tools/jps/TestJpsJar.java +++ b/test/sun/tools/jps/TestJpsJar.java @@ -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,8 +36,10 @@ * will be started from within the test application. * The output should contain proper values. * @library /lib/testlibrary + * @modules jdk.jartool/sun.tools.jar + * java.management * @build jdk.testlibrary.* JpsHelper JpsBase - * @run driver TestJpsJar + * @run main/othervm TestJpsJar */ public class TestJpsJar { diff --git a/test/sun/tools/jps/TestJpsJarRelative.java b/test/sun/tools/jps/TestJpsJarRelative.java --- a/test/sun/tools/jps/TestJpsJarRelative.java +++ b/test/sun/tools/jps/TestJpsJarRelative.java @@ -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,8 +36,10 @@ * will be started from within the test application. * The output should contain proper values. * @library /lib/testlibrary + * @modules jdk.jartool/sun.tools.jar + * java.management * @build jdk.testlibrary.* JpsHelper JpsBase - * @run driver TestJpsJarRelative + * @run main/othervm TestJpsJarRelative */ public class TestJpsJarRelative { diff --git a/test/sun/tools/jps/TestJpsSanity.java b/test/sun/tools/jps/TestJpsSanity.java --- a/test/sun/tools/jps/TestJpsSanity.java +++ b/test/sun/tools/jps/TestJpsSanity.java @@ -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 @@ -29,6 +29,8 @@ * @summary This test verifies jps usage and checks that appropriate error message is shown * when running jps with illegal arguments. * @library /lib/testlibrary + * @modules jdk.jartool/sun.tools.jar + * java.management * @build jdk.testlibrary.* JpsHelper * @run driver TestJpsSanity */ diff --git a/test/sun/tools/jstack/BasicJStackTest.java b/test/sun/tools/jstack/BasicJStackTest.java --- a/test/sun/tools/jstack/BasicJStackTest.java +++ b/test/sun/tools/jstack/BasicJStackTest.java @@ -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 @@ -32,6 +32,7 @@ * @bug 6260070 * @summary Unit test for jstack utility * @library /lib/testlibrary + * @modules java.management * @build jdk.testlibrary.* * @run main BasicJStackTest */ diff --git a/test/sun/tools/jstat/JStatInterval.java b/test/sun/tools/jstat/JStatInterval.java --- a/test/sun/tools/jstat/JStatInterval.java +++ b/test/sun/tools/jstat/JStatInterval.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,6 +28,7 @@ * @summary Test checks case when target application finishes execution and jstat didn't complete work. jstat is started with interval = 100 (jstat -compiler 100) and monitored application finishes after 500ms. This shouldn't cause crash or hang in target application or in jstat. + * @modules java.management * @build jdk.testlibrary.* JStatInterval * @run main JStatInterval */ diff --git a/test/sun/tools/jstat/snap2.awk b/test/sun/tools/jstat/snap2.awk --- a/test/sun/tools/jstat/snap2.awk +++ b/test/sun/tools/jstat/snap2.awk @@ -3,7 +3,7 @@ { totallines++; print $0 } -$0 !~ /[java|sun|com\.sun]\..+=.*$/ { count++ } +$0 !~ /[java|jdk|sun|com\.sun]\..+=.*$/ { count++ } END { if ((count == 0) && (totallines != 0)) { diff --git a/test/sun/tools/jstatd/TestJstatdDefaults.java b/test/sun/tools/jstatd/TestJstatdDefaults.java --- a/test/sun/tools/jstatd/TestJstatdDefaults.java +++ b/test/sun/tools/jstatd/TestJstatdDefaults.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,6 +25,7 @@ * @test * @bug 4990825 * @library /lib/testlibrary + * @modules java.management * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser * @run main/timeout=60 TestJstatdDefaults */ diff --git a/test/sun/tools/jstatd/TestJstatdExternalRegistry.java b/test/sun/tools/jstatd/TestJstatdExternalRegistry.java --- a/test/sun/tools/jstatd/TestJstatdExternalRegistry.java +++ b/test/sun/tools/jstatd/TestJstatdExternalRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,6 +25,7 @@ * @test * @bug 4990825 7092186 * @library /lib/testlibrary + * @modules java.management * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser * @run main/timeout=60 TestJstatdExternalRegistry */ diff --git a/test/sun/tools/jstatd/TestJstatdPort.java b/test/sun/tools/jstatd/TestJstatdPort.java --- a/test/sun/tools/jstatd/TestJstatdPort.java +++ b/test/sun/tools/jstatd/TestJstatdPort.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,6 +25,7 @@ * @test * @bug 4990825 * @library /lib/testlibrary + * @modules java.management * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser * @run main/timeout=60 TestJstatdPort */ diff --git a/test/sun/tools/jstatd/TestJstatdPortAndServer.java b/test/sun/tools/jstatd/TestJstatdPortAndServer.java --- a/test/sun/tools/jstatd/TestJstatdPortAndServer.java +++ b/test/sun/tools/jstatd/TestJstatdPortAndServer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,6 +25,7 @@ * @test * @bug 4990825 * @library /lib/testlibrary + * @modules java.management * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser * @run main/timeout=60 TestJstatdPortAndServer */ diff --git a/test/sun/tools/jstatd/TestJstatdServer.java b/test/sun/tools/jstatd/TestJstatdServer.java --- a/test/sun/tools/jstatd/TestJstatdServer.java +++ b/test/sun/tools/jstatd/TestJstatdServer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,6 +25,7 @@ * @test * @bug 4990825 * @library /lib/testlibrary + * @modules java.management * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser * @run main/timeout=60 TestJstatdServer */ diff --git a/test/sun/tools/jstatd/TestJstatdUsage.java b/test/sun/tools/jstatd/TestJstatdUsage.java --- a/test/sun/tools/jstatd/TestJstatdUsage.java +++ b/test/sun/tools/jstatd/TestJstatdUsage.java @@ -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 @@ -29,6 +29,7 @@ * @test * @bug 4990825 * @library /lib/testlibrary + * @modules java.management * @build jdk.testlibrary.* * @run main TestJstatdUsage */