fixed excludes after merge

# Conflicts:
#	test/hotspot/jtreg/jbProblemList.txt
#	test/jdk/jbProblemList.txt

test/hotspot/jtreg/jbProblemList.txt

@@ -38,159 +38,26 @@
 #
 #############################################################################
 
-# :hotspot_compiler
+# jb_jdi
 
-compiler/ciReplay/TestSAServer.java 8029528 generic-all
+vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021/TestDescription.java 8065773 generic-all
-compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java 8225370 generic-all
+vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses023/TestDescription.java 8065773 generic-all
-compiler/jvmci/compilerToVM/GetFlagValueTest.java 8204459 generic-all
-compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/NativeCallTest.java 8262901 macosx-aarch64
 
-compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java 8190680 generic-all
+vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect001/plugAttachConnect001.java
+vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect002/plugAttachConnect002.java
+vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect001/plugLaunchConnect001.java
+vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect002/plugLaunchConnect002.java
+vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect001/plugListenConnect001.java
+vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect002/plugListenConnect002.java
+vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001/plugMultiConnect001.java
+vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002/plugMultiConnect002.java
+vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003/plugMultiConnect003.java
+vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004/plugMultiConnect004.java
+vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005/plugMultiConnect005.java
+vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006/plugMultiConnect006.java
+vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService001/transportService001.java
+vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService002/transportService002.java
 
-compiler/runtime/Test8168712.java 8211769,8211771 generic-ppc64,generic-ppc64le,linux-s390x
+vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects002/referringObjects002.java
-
-compiler/rtm/locking/TestRTMAbortRatio.java 8183263 generic-x64
-compiler/rtm/locking/TestRTMAbortThreshold.java 8183263 generic-x64
-compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java 8183263 generic-x64
-compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java 8183263 generic-x64
-compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java 8183263 generic-x64
-compiler/rtm/locking/TestRTMLockingCalculationDelay.java 8183263 generic-x64
-compiler/rtm/locking/TestRTMLockingThreshold.java 8183263 generic-x64
-compiler/rtm/locking/TestRTMSpinLoopCount.java 8183263 generic-x64
-compiler/rtm/locking/TestUseRTMDeopt.java 8183263 generic-x64
-compiler/rtm/locking/TestUseRTMXendForLockBusy.java 8183263 generic-x64
-compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java 8183263 generic-x64
-
-compiler/c2/Test8004741.java 8235801 generic-all
 
 #############################################################################
-
-# :hotspot_gc
-
-gc/epsilon/TestMemoryMXBeans.java 8206434 generic-all
-gc/g1/humongousObjects/objectGraphTest/TestObjectGraphAfterGC.java 8156755 generic-all
-gc/g1/logging/TestG1LoggingFailure.java 8169634 generic-all
-gc/g1/humongousObjects/TestHeapCounters.java 8178918 generic-all
-gc/stress/gclocker/TestExcessGCLockerCollections.java 8229120 generic-all
-gc/stress/gclocker/TestGCLockerWithParallel.java 8180622 generic-all
-gc/stress/gclocker/TestGCLockerWithG1.java 8180622 generic-all
-gc/stress/TestJNIBlockFullGC/TestJNIBlockFullGC.java 8192647 generic-all
-gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java 8241293 macosx-x64
-
-#############################################################################
-
-# :hotspot_runtime
-
-runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP_JFR.java 8253437 windows-x64
-runtime/cds/DeterministicDump.java 8253495 generic-all
-runtime/jni/terminatedThread/TestTerminatedThread.java 8219652 aix-ppc64
-
-#############################################################################
-
-# :hotspot_serviceability
-
-serviceability/sa/sadebugd/DebugdConnectTest.java 8239062 macosx-x64
-serviceability/sa/TestRevPtrsForInvokeDynamic.java 8241235 generic-all
-
-serviceability/jvmti/ModuleAwareAgents/ThreadStart/MAAThreadStart.java 8225354 windows-all
-
-#############################################################################
-
-# :hotspot_misc
-
-#############################################################################
-
-
-#############################################################################
-
-# :vmTestbase_*
-
-#############################################################################
-
-vmTestbase/nsk/monitoring/MemoryPoolMBean/isCollectionUsageThresholdExceeded/isexceeded003/TestDescription.java 8153598 generic-all
-vmTestbase/nsk/monitoring/MemoryPoolMBean/isUsageThresholdExceeded/isexceeded001/TestDescription.java 8198668 generic-all
-vmTestbase/nsk/monitoring/MemoryPoolMBean/isUsageThresholdExceeded/isexceeded002/TestDescription.java 8153598 generic-all
-vmTestbase/nsk/monitoring/MemoryPoolMBean/isUsageThresholdExceeded/isexceeded003/TestDescription.java 8198668 generic-all
-vmTestbase/nsk/monitoring/MemoryPoolMBean/isUsageThresholdExceeded/isexceeded004/TestDescription.java 8153598 generic-all
-vmTestbase/nsk/monitoring/MemoryPoolMBean/isUsageThresholdExceeded/isexceeded005/TestDescription.java 8153598 generic-all
-vmTestbase/nsk/monitoring/ThreadMXBean/ThreadInfo/Deadlock/JavaDeadlock001/TestDescription.java 8060733 generic-all
-
-vmTestbase/nsk/jdi/ThreadReference/stop/stop001/TestDescription.java 7034630 generic-all
-
-vmTestbase/metaspace/gc/firstGC_10m/TestDescription.java 8208250 generic-all
-vmTestbase/metaspace/gc/firstGC_50m/TestDescription.java 8208250 generic-all
-vmTestbase/metaspace/gc/firstGC_99m/TestDescription.java 8208250 generic-all
-vmTestbase/metaspace/gc/firstGC_default/TestDescription.java 8208250 generic-all
-
-vmTestbase/nsk/jvmti/AttachOnDemand/attach045/TestDescription.java 8202971 generic-all
-vmTestbase/nsk/jvmti/scenarios/jni_interception/JI05/ji05t001/TestDescription.java 8219652 aix-ppc64
-vmTestbase/nsk/jvmti/scenarios/jni_interception/JI06/ji06t001/TestDescription.java 8219652 aix-ppc64
-vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab001/TestDescription.java 8219652 aix-ppc64
-
-vmTestbase/gc/lock/jni/jnilock002/TestDescription.java 8192647 generic-all
-
-vmTestbase/jit/escape/LockCoarsening/LockCoarsening001.java 8148743 generic-all
-vmTestbase/jit/escape/LockCoarsening/LockCoarsening002.java 8208259 generic-all
-
-vmTestbase/vm/mlvm/indy/func/jvmti/redefineClassInBootstrap/TestDescription.java 8013267 generic-all
-vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2none_a/TestDescription.java 8013267 generic-all
-vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manyDiff_b/TestDescription.java 8013267 generic-all
-vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manySame_b/TestDescription.java 8013267 generic-all
-
-
-vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java 7199837 generic-all
-
-#############################################################################
-
-vmTestbase/vm/jit/LongTransitions/nativeFnc1/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc10/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc11/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc12/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc13/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc14/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc15/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc16/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc17/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc18/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc19/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc2/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc20/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc21/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc22/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc23/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc24/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc25/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc26/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc27/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc28/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc29/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc3/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc30/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc31/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc32/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc33/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc34/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc35/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc36/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc37/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc38/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc39/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc4/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc40/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc41/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc42/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc43/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc44/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc45/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc46/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc47/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc48/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc49/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc5/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc50/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc51/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc52/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc6/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc7/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc8/TestDescription.java 8271615 macosx-all
-vmTestbase/vm/jit/LongTransitions/nativeFnc9/TestDescription.java 8271615 macosx-all

test/hotspot/jtreg/runtime/7158988/FieldMonitor.java

@@ -143,7 +143,7 @@ public class FieldMonitor {
    * Find a com.sun.jdi.CommandLineLaunch connector
    */
   static LaunchingConnector findLaunchingConnector() {
-    List <Connector> connectors = Bootstrap.virtualMachineManager().allConnectors();
+    List <Connector> connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().allConnectors();
     Iterator <Connector> iter = connectors.iterator();
     while (iter.hasNext()) {
       Connector connector = iter.next();

test/hotspot/jtreg/serviceability/attach/ShMemLongName.java

@@ -60,7 +60,7 @@ public class ShMemLongName {
             waitForReady(target);
 
             log("attaching to the VM...");
-            AttachingConnector ac = Bootstrap.virtualMachineManager().attachingConnectors()
+            AttachingConnector ac = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().attachingConnectors()
                     .stream()
                     .filter(c -> transport.equals(c.transport().name()))
                     .findFirst()

test/hotspot/jtreg/serviceability/jvmti/8036666/GetObjectLockCount.java

@@ -78,7 +78,7 @@ public class GetObjectLockCount {
      * Find a com.sun.jdi.CommandLineLaunch connector
      */
     static LaunchingConnector findLaunchingConnector() {
-        List <Connector> connectors = Bootstrap.virtualMachineManager().allConnectors();
+        List <Connector> connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().allConnectors();
         Iterator <Connector> iter = connectors.iterator();
         while (iter.hasNext()) {
             Connector connector = iter.next();

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/description/description001.java

@@ -52,7 +52,7 @@ public class description001 {
     public static int run(String argv[], PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         List acl = vmm.allConnectors();
 
         if (acl.size() > 0) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid001.java

@@ -76,7 +76,7 @@ public class isvalid001 {
                         "Method tested: " +
                         "jdi.Connector.Argument.isValid\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid002.java

@@ -71,7 +71,7 @@ public class isvalid002 {
                         "Method tested: " +
                         "jdi.Connector.Argument.isValid\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid003.java

@@ -77,7 +77,7 @@ public class isvalid003 {
                         "Method tested: " +
                         "jdi.Connector.Argument.isValid\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid004.java

@@ -78,7 +78,7 @@ public class isvalid004 {
                         "Method tested: " +
                         "jdi.Connector.Argument.isValid\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/isValid/isvalid005.java

@@ -77,7 +77,7 @@ public class isvalid005 {
                         "Method tested: " +
                         "jdi.Connector.Argument.isValid\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/label/label001.java

@@ -52,7 +52,7 @@ public class label001 {
     public static int run(String argv[], PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List acl = vmm.allConnectors();
         if (acl.size() > 0) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/mustSpecify/mustspecify001.java

@@ -73,7 +73,7 @@ public class mustspecify001 {
                         "Method tested: " +
                         "jdi.Connector.IntegerArgument.intValue()\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/name/name001.java

@@ -51,7 +51,7 @@ public class name001 {
     public static int run(String argv[],PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List acl = vmm.allConnectors();
         if (acl.size() > 0) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue001.java

@@ -73,7 +73,7 @@ public class setvalue001 {
                         "Method tested: " +
                         "jdi.Connector.Argument.setValue()\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/setValue/setvalue002.java

@@ -77,7 +77,7 @@ public class setvalue002 {
                         "Method tested: " +
                         "jdi.Connector.Argument.setValue()\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value001.java

@@ -51,7 +51,7 @@ public class value001 {
     public static int run(String argv[], PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List acl = vmm.allConnectors();
         if (acl.size() > 0) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value002.java

@@ -52,7 +52,7 @@ public class value002 {
     public static int run(String argv[], PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List acl = vmm.allConnectors();
         if (acl.size() > 0) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value003.java

@@ -61,7 +61,7 @@ public class value003 {
     public static int run(String argv[], PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         String javaKind = argHandler.getOptions().getProperty("debugee.vmkind");
         boolean java_g = javaKind != null && javaKind.startsWith("java_g"); // ...or java_g.exe

test/hotspot/jtreg/vmTestbase/nsk/jdi/Argument/value/value004.java

@@ -63,7 +63,7 @@ public class value004 {
     public static int run(String argv[],PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         String address = argHandler.getTransportPort();
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001.java

@@ -195,7 +195,7 @@ public class attach001 {
     }
 
     private Connector findConnector(String connectorName) {
-        List connectors = Bootstrap.virtualMachineManager().allConnectors();
+        List connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().allConnectors();
         Iterator iter = connectors.iterator();
 
         while (iter.hasNext()) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002.java

@@ -192,7 +192,7 @@ public class attach002 extends Log {
     }
 
     private Connector findConnector(String connectorName) {
-        List connectors = Bootstrap.virtualMachineManager().allConnectors();
+        List connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().allConnectors();
         Iterator iter = connectors.iterator();
         while (iter.hasNext()) {
             Connector connector = (Connector) iter.next();

test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach003.java

@@ -70,7 +70,7 @@ public class attach003 {
 
         log = new Log(out, new ArgumentHandler(argv));
 
-        List connectors = Bootstrap.virtualMachineManager().attachingConnectors();
+        List connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().attachingConnectors();
         log.display("Getting of " + connectors.size() + " connectors.");
         log.display("-----------------------------------------------");
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach004/TestDriver.java

@@ -28,10 +28,7 @@ import jdk.test.lib.Utils;
 import jtreg.SkippedException;
 import nsk.share.jdi.ArgumentHandler;
 
-import java.io.BufferedReader;
+import java.io.*;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -121,7 +118,7 @@ public class TestDriver {
         cmd.add(JDKToolFinder.getJDKTool("java"));
         Collections.addAll(cmd, Utils.prependTestJavaOpts(
                 "-cp",
-                Utils.TEST_CLASS_PATH,
+                Utils.TEST_CLASS_PATH + File.pathSeparator + System.getenv("CPAPPEND"),
                 debuggerClass.getName(),
                 "-debuggeePID",
                 "" + debuggeePid));

test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001.java

@@ -195,7 +195,7 @@ public class attachnosuspend001 {
     }
 
     private Connector findConnector(String connectorName) {
-        List connectors = Bootstrap.virtualMachineManager().allConnectors();
+        List connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().allConnectors();
         Iterator iter = connectors.iterator();
 
         while (iter.hasNext()) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue001.java

@@ -77,7 +77,7 @@ public class booleanvalue001 {
         String sErr2 =  "ERROR\n" +
                         "Method tested: " +
                         "jdi.Connector.BooleanArgument.booleanValue\n" ;
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/booleanValue/booleanvalue002.java

@@ -79,7 +79,7 @@ public class booleanvalue002 {
                         "jdi.Connector.BooleanArgument.booleanValue\n" ;
 
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid001.java

@@ -77,7 +77,7 @@ public class isvalid001 {
                         "Method tested: " +
                         "jdi.Connector.BooleanArgument.isValue()\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/isValid/isvalid002.java

@@ -71,7 +71,7 @@ public class isvalid002 {
                         "Method tested: " +
                         "jdi.Connector.BooleanArgument.isValid\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue001.java

@@ -91,7 +91,7 @@ public class setvalue001 {
                         "Method tested: " +
                         "jdi.Connector.BooleanArgument.setValue\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/setValue/setvalue002.java

@@ -87,7 +87,7 @@ public class setvalue002 {
                         "Method tested: " +
                         "jdi.Connector.BooleanArgument.setValue\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof001.java

@@ -76,7 +76,7 @@ public class stringvalueof001 {
                         "Method tested: " +
                         "jdi.Connector.BooleanArgument.stringValueof\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanArgument/stringValueOf/stringvalueof002.java

@@ -76,7 +76,7 @@ public class stringvalueof002 {
                         "Method tested: " +
                         "jdi.Connector.BooleanArgument.stringValueOf\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/_bounds_/bounds001.java

@@ -71,7 +71,7 @@ public class bounds001 {
     private int run() {
 
         exitStatus = Consts.TEST_PASSED;
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List attachConnectors;
         List launchConnectors;

test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments001.java

@@ -51,7 +51,7 @@ public class defaultArguments001 {
     public static int run(String argv[],PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List acl = vmm.allConnectors();
         if (acl.size() > 0) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments002.java

@@ -52,7 +52,7 @@ public class defaultArguments002 {
     public static int run(String argv[], PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List acl = vmm.allConnectors();
         if (acl.size() > 0) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/defaultArguments/defaultArguments003.java

@@ -51,7 +51,7 @@ public class defaultArguments003 {
     public static int run(String argv[],PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List acl = vmm.allConnectors();
         if (acl.size() < 1) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/description/description001.java

@@ -51,7 +51,7 @@ public class description001 {
     public static int run(String argv[], PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List acl = vmm.allConnectors();
         if (acl.size() > 0) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/name/name001.java

@@ -50,7 +50,7 @@ public class name001 {
     public static int run(String argv[], PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List acl = vmm.allConnectors();
         if (acl.size() > 0) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/toString/tostring001.java

@@ -75,7 +75,7 @@ public class tostring001 {
         argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         List acl = vmm.allConnectors();
         if (acl.size() > 0) {
             display("Number of all known JDI connectors: " + acl.size());

test/hotspot/jtreg/vmTestbase/nsk/jdi/Connector/transport/transport001.java

@@ -51,7 +51,7 @@ public class transport001 {
     public static int run(String argv[], PrintStream out) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(out, argHandler);
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List acl = vmm.allConnectors();
         if (acl.size() > 0) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue001.java

@@ -84,7 +84,7 @@ public class intvalue001 {
                         "Method tested: " +
                         "jdi.Connector.IntegerArgument.intValue()\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/intValue/intvalue002.java

@@ -86,7 +86,7 @@ public class intvalue002 {
                         "Method tested: " +
                         "jdi.Connector.IntegerArgument.intValue()\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid001.java

@@ -81,7 +81,7 @@ public class isvalid001 {
                         "Method tested: " +
                         "jdi.Connector.IntegerArgument.isValid\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid002.java

@@ -82,7 +82,7 @@ public class isvalid002 {
                         "Method tested: " +
                         "jdi.Connector.IntegerArgument.isValid\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/isValid/isvalid003.java

@@ -82,7 +82,7 @@ public class isvalid003 {
                         "Method tested: " +
                         "jdi.Connector.IntegerArgument.isValid\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/max/max001.java

@@ -77,7 +77,7 @@ public class max001 {
                         "jdi.Connector.IntegerArgument.max\n" ;
 
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/min/min001.java

@@ -75,7 +75,7 @@ public class min001 {
                         "Method tested: " +
                         "jdi.Connector.IntegerArgument.min\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/setValue/setvalue001.java

@@ -119,7 +119,7 @@ public class setvalue001 {
 
     public static int run(String argv[], PrintStream out) {
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerArgument/stringValueOf/stringvalueof001.java

@@ -82,7 +82,7 @@ public class stringvalueof001 {
                         "Method tested: " +
                         "jdi.Connector.IntegerArgument.intValue()\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch001.java

@@ -148,7 +148,7 @@ public class launch001 {
     private LaunchingConnector getLaunchingConnector (
         String connectorName, String transportName) {
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List lcl = vmm.launchingConnectors();
         log.display("Number of attaching connectors: " + lcl.size());

test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch002.java

@@ -148,7 +148,7 @@ public class launch002 {
     private LaunchingConnector getLaunchingConnector (
         String connectorName, String transportName) {
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List lcl = vmm.launchingConnectors();
         log.display("Number of attaching connectors: " + lcl.size());

test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003.java

@@ -155,7 +155,7 @@ public class launch003 {
     private LaunchingConnector getLaunchingConnector(
         String connectorName, String transportName) {
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List lcl = vmm.launchingConnectors();
         log.display("Number of launching connectors: " + lcl.size());

test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004.java

@@ -154,7 +154,7 @@ public class launch004 {
     private LaunchingConnector getLaunchingConnector(
         String connectorName, String transportName) {
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List lcl = vmm.launchingConnectors();
         log.display("Number of launching connectors: " + lcl.size());

test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launchnosuspend/launchnosuspend001.java

@@ -167,7 +167,7 @@ public class launchnosuspend001 {
     private LaunchingConnector getLaunchingConnector(
         String connectorName, String transportName) {
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List lcl = vmm.launchingConnectors();
         log.display("Number of launching connectors: " + lcl.size());

test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001.java

@@ -197,7 +197,7 @@ public class accept001 {
     }
 
     private Connector findConnector(String connectorName) {
-        List connectors = Bootstrap.virtualMachineManager().allConnectors();
+        List connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().allConnectors();
         Iterator iter = connectors.iterator();
 
         while (iter.hasNext()) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002.java

@@ -197,7 +197,7 @@ public class accept002 {
     }
 
     private Connector findConnector(String connectorName) {
-        List connectors = Bootstrap.virtualMachineManager().allConnectors();
+        List connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().allConnectors();
         Iterator iter = connectors.iterator();
 
         while (iter.hasNext()) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001.java

@@ -197,7 +197,7 @@ public class listennosuspend001 {
     }
 
     private Connector findConnector(String connectorName) {
-        List connectors = Bootstrap.virtualMachineManager().allConnectors();
+        List connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().allConnectors();
         Iterator iter = connectors.iterator();
 
         while (iter.hasNext()) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001.java

@@ -297,7 +297,7 @@ public class startlis001 {
     }
 
     private Connector findConnector(String connectorName) {
-        List connectors = Bootstrap.virtualMachineManager().allConnectors();
+        List connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().allConnectors();
         Iterator iter = connectors.iterator();
 
         while (iter.hasNext()) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002.java

@@ -272,7 +272,7 @@ public class startlis002 {
     }
 
     private Connector findConnector(String connectorName) {
-        List connectors = Bootstrap.virtualMachineManager().allConnectors();
+        List connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().allConnectors();
         Iterator iter = connectors.iterator();
 
         while (iter.hasNext()) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis001.java

@@ -202,7 +202,7 @@ public class stoplis001 {
     }
 
     private Connector findConnector(String connectorName) {
-        List connectors = Bootstrap.virtualMachineManager().allConnectors();
+        List connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().allConnectors();
         Iterator iter = connectors.iterator();
 
         while (iter.hasNext()) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/stopListening/stoplis002.java

@@ -202,7 +202,7 @@ public class stoplis002 {
     }
 
     private Connector findConnector(String connectorName) {
-        List connectors = Bootstrap.virtualMachineManager().allConnectors();
+        List connectors = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager().allConnectors();
         Iterator iter = connectors.iterator();
 
         while (iter.hasNext()) {

test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/supportsMultipleConnections/supportsmultipleconnections001.java

@@ -70,7 +70,7 @@ public class supportsmultipleconnections001 {
                         "jdi.ListeningConnector.supportsMultipleConnections()\n" +
                         "no ListeningConnector supporting multiconnections\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect001/plugAttachConnect001.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the Connector interfaces
  *     (AttachingConnector, ListeningConnector, or LaunchingConnector).
  *     The test checks up that at start-up time when
- *     Bootstrap.virtualMachineManager() is invoked the pluggable
+ *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the pluggable
  *     connector named "PlugAttachConnector001_Name" is created on base
  *     of PlugAttachConnector001 class which implements
  *     com.sun.jdi.connect.AttachingConnector interface.
@@ -83,7 +83,7 @@ import java.io.*;
  * (AttachingConnector, ListeningConnector, or LaunchingConnector).    <BR>
  *                                                                     <BR>
  * The test checks up that at start-up time when                       <BR>
- * Bootstrap.virtualMachineManager() is invoked the pluggable          <BR>
+ * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the pluggable          <BR>
  * connector named "PlugAttachConnector001_Name" is created on base    <BR>
  * of PlugAttachConnector001 class which implements                    <BR>
  * com.sun.jdi.connect.AttachingConnector interface.                   <BR>
@@ -158,9 +158,9 @@ public class plugAttachConnect001 {
             ("==> Test checks that expected pluggable attaching connector is created properly.");
 
 
-        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
+        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect002/plugAttachConnect002.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the Connector interfaces
  *     (AttachingConnector, ListeningConnector, or LaunchingConnector).
  *     The test checks up that at start-up time when
- *     Bootstrap.virtualMachineManager() is invoked the pluggable
+ *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the pluggable
  *     connector named "PlugAttachConnector002_Name" is created on base
  *     of PlugAttachConnector002 class which implements
  *     com.sun.jdi.connect.AttachingConnector interface.
@@ -93,7 +93,7 @@ import java.io.*;
  * (AttachingConnector, ListeningConnector, or LaunchingConnector).    <BR>
  *                                                                     <BR>
  * The test checks up that at start-up time when                       <BR>
- * Bootstrap.virtualMachineManager() is invoked the pluggable          <BR>
+ * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the pluggable          <BR>
  * connector named "PlugAttachConnector002_Name" is created on base    <BR>
  * of PlugAttachConnector002 class which implements                    <BR>
  * com.sun.jdi.connect.AttachingConnector interface.                   <BR>
@@ -176,9 +176,9 @@ public class plugAttachConnect002 {
             ("==> Test checks that expected pluggable attaching connector is created properly.");
 
 
-        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
+        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/AttachConnector/plugAttachConnect003/plugAttachConnect003.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the Connector interfaces
  *     (AttachingConnector, ListeningConnector, or LaunchingConnector).
  *     The test checks up that at start-up time when
- *     Bootstrap.virtualMachineManager() is invoked a pluggable
+ *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked a pluggable
  *     connector is NOT created on base of PlugAttachConnector003 class
  *     which implements com.sun.jdi.connect.AttachingConnector interface,
  *     but constructor of PlugAttachConnector003 throws Exception.
@@ -78,7 +78,7 @@ import java.io.*;
  * (AttachingConnector, ListeningConnector, or LaunchingConnector).    <BR>
  *                                                                     <BR>
  * The test checks up that at start-up time when                       <BR>
- * Bootstrap.virtualMachineManager() is invoked a pluggable            <BR>
+ * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked a pluggable            <BR>
  * connector is NOT created on base  of PlugAttachConnector003 class   <BR>
  * which implements com.sun.jdi.connect.AttachingConnector interface,  <BR>
  * but constructor of PlugAttachConnector003 throws Exception.         <BR>
@@ -144,17 +144,17 @@ public class plugAttachConnect003 {
 
         VirtualMachineManager virtualMachineManager = null;
         try {
-            virtualMachineManager = Bootstrap.virtualMachineManager();
+            virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         } catch (Throwable thrown) {
-            // OK: Bootstrap.virtualMachineManager() may throw an unspecified error
+            // OK: com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() may throw an unspecified error
             // if initialization of the VirtualMachineManager fails or if the virtual
             // machine manager is unable to locate or create any Connectors.
             logOnVerbose
-                (infoLogPrefixNead + "Bootstrap.virtualMachineManager() throws:\n" + thrown);
+                (infoLogPrefixNead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() throws:\n" + thrown);
             return STATUS_PASSED;
         }
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect001/plugLaunchConnect001.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the Connector interfaces
  *     (AttachingConnector, ListeningConnector, or LaunchingConnector).
  *     The test checks up that at start-up time when
- *     Bootstrap.virtualMachineManager() is invoked the pluggable
+ *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the pluggable
  *     connector named "PlugLaunchConnector001_Name" is created on base
  *     of PlugLaunchConnector001 class which implements
  *     com.sun.jdi.connect.LaunchingConnector interface.
@@ -85,7 +85,7 @@ import java.io.*;
  * (AttachingConnector, ListeningConnector, or LaunchingConnector).    <BR>
  *                                                                     <BR>
  * The test checks up that at start-up time when                       <BR>
- * Bootstrap.virtualMachineManager() is invoked the pluggable          <BR>
+ * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the pluggable          <BR>
  * connector named "PlugLaunchConnector001_Name" is created on base    <BR>
  * of PlugLaunchConnector001 class which implements                    <BR>
  * com.sun.jdi.connect.LaunchingConnector interface.                   <BR>
@@ -160,9 +160,9 @@ public class plugLaunchConnect001 {
             ("==> Test checks that expected pluggable launching connector is created properly.");
 
 
-        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
+        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect002/plugLaunchConnect002.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the Connector interfaces
  *     (AttachingConnector, ListeningConnector, or LaunchingConnector).
  *     The test checks up that at start-up time when
- *     Bootstrap.virtualMachineManager() is invoked the pluggable
+ *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the pluggable
  *     connector named "PlugLaunchConnector002_Name" is created on base
  *     of PlugLaunchConnector002 class which implements
  *     com.sun.jdi.connect.LaunchingConnector interface.
@@ -93,7 +93,7 @@ import java.io.*;
  * (AttachingConnector, ListeningConnector, or LaunchingConnector).    <BR>
  *                                                                     <BR>
  * The test checks up that at start-up time when                       <BR>
- * Bootstrap.virtualMachineManager() is invoked the pluggable          <BR>
+ * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the pluggable          <BR>
  * connector named "PlugLaunchConnector002_Name" is created on base    <BR>
  * of PlugLaunchConnector002 class which implements                    <BR>
  * com.sun.jdi.connect.LaunchingConnector interface.                   <BR>
@@ -176,9 +176,9 @@ public class plugLaunchConnect002 {
             ("==> Test checks that expected pluggable launching connector is created properly.");
 
 
-        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
+        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/LaunchConnector/plugLaunchConnect003/plugLaunchConnect003.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the Connector interfaces
  *     (AttachingConnector, ListeningConnector, or LaunchingConnector).
  *     The test checks up that at start-up time when
- *     Bootstrap.virtualMachineManager() is invoked a pluggable
+ *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked a pluggable
  *     connector is NOT created on base of PlugLaunchConnector003 class
  *     which implements com.sun.jdi.connect.LaunchingConnector interface,
  *     but constructor of PlugLaunchConnector003 throws Exception.
@@ -78,7 +78,7 @@ import java.io.*;
  * (AttachingConnector, ListeningConnector, or LaunchingConnector).    <BR>
  *                                                                     <BR>
  * The test checks up that at start-up time when                       <BR>
- * Bootstrap.virtualMachineManager() is invoked a pluggable            <BR>
+ * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked a pluggable            <BR>
  * connector is NOT created on base  of PlugLaunchConnector003 class   <BR>
  * which implements com.sun.jdi.connect.LaunchingConnector interface,  <BR>
  * but constructor of PlugLaunchConnector003 throws Exception.         <BR>
@@ -144,17 +144,17 @@ public class plugLaunchConnect003 {
 
         VirtualMachineManager virtualMachineManager = null;
         try {
-            virtualMachineManager = Bootstrap.virtualMachineManager();
+            virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         } catch (Throwable thrown) {
-            // OK: Bootstrap.virtualMachineManager() may throw an unspecified error
+            // OK: com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() may throw an unspecified error
             // if initialization of the VirtualMachineManager fails or if the virtual
             // machine manager is unable to locate or create any Connectors.
             logOnVerbose
-                (infoLogPrefixNead + "Bootstrap.virtualMachineManager() throws:\n" + thrown);
+                (infoLogPrefixNead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() throws:\n" + thrown);
             return STATUS_PASSED;
         }
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect001/plugListenConnect001.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the Connector interfaces
  *     (AttachingConnector, ListeningConnector, or LauWnchingConnector).
  *     The test checks up that at start-up time when
- *     Bootstrap.virtualMachineManager() is invoked the pluggable
+ *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the pluggable
  *     connector named "PlugListenConnector001_Name" is created on base
  *     of PlugListenConnector001 class which implements
  *     com.sun.jdi.connect.ListeningConnector interface.
@@ -85,7 +85,7 @@ import java.io.*;
  * (AttachingConnector, ListeningConnector, or LaunchingConnector).    <BR>
  *                                                                     <BR>
  * The test checks up that at start-up time when                       <BR>
- * Bootstrap.virtualMachineManager() is invoked the pluggable          <BR>
+ * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the pluggable          <BR>
  * connector named "PlugListenConnector001_Name" is created on base    <BR>
  * of PlugListenConnector001 class which implements                    <BR>
  * com.sun.jdi.connect.ListeningConnector interface.                   <BR>
@@ -160,9 +160,9 @@ public class plugListenConnect001 {
             ("==> Test checks that expected pluggable listening connector is created properly.");
 
 
-        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
+        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect002/plugListenConnect002.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the Connector interfaces
  *     (AttachingConnector, ListeningConnector, or LaunchingConnector).
  *     The test checks up that at start-up time when
- *     Bootstrap.virtualMachineManager() is invoked the pluggable
+ *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the pluggable
  *     connector named "PlugListenConnector002_Name" is created on base
  *     of PlugListenConnector002 class which implements
  *     com.sun.jdi.connect.ListeningConnector interface.
@@ -93,7 +93,7 @@ import java.io.*;
  * (AttachingConnector, ListeningConnector, or LaunchingConnector).    <BR>
  *                                                                     <BR>
  * The test checks up that at start-up time when                       <BR>
- * Bootstrap.virtualMachineManager() is invoked the pluggable          <BR>
+ * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the pluggable          <BR>
  * connector named "PlugListenConnector002_Name" is created on base    <BR>
  * of PlugListenConnector002 class which implements                    <BR>
  * com.sun.jdi.connect.ListeningConnector interface.                   <BR>
@@ -176,9 +176,9 @@ public class plugListenConnect002 {
             ("==> Test checks that expected pluggable listening connector is created properly.");
 
 
-        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
+        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/ListenConnector/plugListenConnect003/plugListenConnect003.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the Connector interfaces
  *     (AttachingConnector, ListeningConnector, or LaunchingConnector).
  *     The test checks up that at start-up time when
- *     Bootstrap.virtualMachineManager() is invoked a pluggable
+ *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked a pluggable
  *     connector is NOT created on base of PlugListenConnector003 class
  *     which implements com.sun.jdi.connect.ListeningConnector interface,
  *     but constructor of PlugListenConnector003 throws Exception.
@@ -78,7 +78,7 @@ import java.io.*;
  * (AttachingConnector, ListeningConnector, or LaunchingConnector).    <BR>
  *                                                                     <BR>
  * The test checks up that at start-up time when                       <BR>
- * Bootstrap.virtualMachineManager() is invoked a pluggable            <BR>
+ * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked a pluggable            <BR>
  * connector is NOT created on base  of PlugListenConnector003 class   <BR>
  * which implements com.sun.jdi.connect.ListeningConnector interface,  <BR>
  * but constructor of PlugListenConnector003 throws Exception.         <BR>
@@ -144,17 +144,17 @@ public class plugListenConnect003 {
 
         VirtualMachineManager virtualMachineManager = null;
         try {
-            virtualMachineManager = Bootstrap.virtualMachineManager();
+            virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         } catch (Throwable thrown) {
-            // OK: Bootstrap.virtualMachineManager() may throw an unspecified error
+            // OK: com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() may throw an unspecified error
             // if initialization of the VirtualMachineManager fails or if the virtual
             // machine manager is unable to locate or create any Connectors.
             logOnVerbose
-                (infoLogPrefixNead + "Bootstrap.virtualMachineManager() throws:\n" + thrown);
+                (infoLogPrefixNead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() throws:\n" + thrown);
             return STATUS_PASSED;
         }
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect001/plugMultiConnect001.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the Connector interfaces
  *     (AttachingConnector, ListeningConnector, or LaunchingConnector).
  *     The test checks up that at start-up time when
- *     Bootstrap.virtualMachineManager() is invoked the 6 expected
+ *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the 6 expected
  *     pluggable connectors are created  properly on base of 6 differen
  *     Connector implementations of different types.
  *     The test expects that 2 pluggable connectors should be
@@ -96,7 +96,7 @@ import java.io.*;
  * (AttachingConnector, ListeningConnector, or LaunchingConnector).    <BR>
  *                                                                     <BR>
  * The test checks up that at start-up time when                       <BR>
- * Bootstrap.virtualMachineManager() is invoked the 6 expected         <BR>
+ * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the 6 expected         <BR>
  * pluggable connectors are created  properly on base of 6 different   <BR>
  * Connector implementations of different types.                       <BR>
  *                                                                     <BR>
@@ -201,9 +201,9 @@ public class plugMultiConnect001 {
         referencePlugConnectors[4] = new PlugListenConnector001_01();
         referencePlugConnectors[5] = new PlugListenConnector001_02();
 
-        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
+        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect002/plugMultiConnect002.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the Connector interfaces
  *     (AttachingConnector, ListeningConnector, or LaunchingConnector).
  *     The test checks up that at start-up time when
- *     Bootstrap.virtualMachineManager() is invoked the 6 expected
+ *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the 6 expected
  *     pluggable connectors are created  properly on base of 6 different
  *     Connector implementations of different types, but 3 other pluggable
  *     connectors are NOT created for Connector implementations for which
@@ -59,7 +59,7 @@
  *          Connector.BooleanArgument;
  *          Connector.SelectedArgument;
  *     Also the test checks up that at start-up time when
- *     Bootstrap.virtualMachineManager() is invoked the 3 pluggable
+ *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the 3 pluggable
  *     connectors are NOT created as they are based on classes which
  *     implement the Connector interfaces
  *     (AttachingConnector, ListeningConnector, and LaunchingConnector),
@@ -108,7 +108,7 @@ import java.io.*;
  * (AttachingConnector, ListeningConnector, or LaunchingConnector).    <BR>
  *                                                                     <BR>
  * The test checks up that at start-up time when                       <BR>
- * Bootstrap.virtualMachineManager() is invoked the 6 expected         <BR>
+ * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the 6 expected         <BR>
  * pluggable connectors are created  properly on base of 6 different   <BR>
  * Connector implementations of different types, but 3 other pluggable <BR>
  * connectors are NOT created for Connector implementations for which  <BR>
@@ -139,7 +139,7 @@ import java.io.*;
  *      Connector.SelectedArgument;                                    <BR>
  *                                                                     <BR>
  * Also the test checks up that at start-up time when                  <BR>
- * Bootstrap.virtualMachineManager() is invoked the 3 pluggable        <BR>
+ * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the 3 pluggable        <BR>
  * connectors are NOT created as they are based on classes which       <BR>
  * implement the Connector interfaces                                  <BR>
  * (AttachingConnector, ListeningConnector, and LaunchingConnector),   <BR>
@@ -230,9 +230,9 @@ public class plugMultiConnect002 {
         referencePlugConnectors[4] = new PlugListenConnector002_01();
         referencePlugConnectors[5] = new PlugListenConnector002_02();
 
-        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
+        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect003/plugMultiConnect003.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the TransportService abstract
  *     class (com.sun.jdi.connect.spi.TransportService).
  *     The test checks up that at start-up time when
- *     Bootstrap.virtualMachineManager() is invoked four expected pluggable
+ *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked four expected pluggable
  *     connectors (two AttachingConnectors and two ListeningConnectors) are
  *     created  properly on base of two different TransportService
  *     implementations.
@@ -115,7 +115,7 @@ import java.io.*;
  * class (com.sun.jdi.connect.spi.TransportService).                        <BR>
  *                                                                          <BR>
  * The test checks up that at start-up time when                            <BR>
- * Bootstrap.virtualMachineManager() is invoked four expected pluggable     <BR>
+ * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked four expected pluggable     <BR>
  * connectors (two AttachingConnectors and two ListeningConnectors) are     <BR>
  * created  properly on base of two different TransportService              <BR>
  * implementations.                                                         <BR>
@@ -229,9 +229,9 @@ public class plugMultiConnect003 {
         referenceTransportServices[0] = new PlugTransportService003_01();
         referenceTransportServices[1] = new PlugTransportService003_02();
 
-        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
+        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect004/plugMultiConnect004.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the TransportService abstract
  *     class (com.sun.jdi.connect.spi.TransportService).
  *     The test checks up that at start-up time when
- *     Bootstrap.virtualMachineManager() is invoked four expected pluggable
+ *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked four expected pluggable
  *     connectors (two AttachingConnectors and two ListeningConnectors) are
  *     created  properly on base of two different TransportService
  *     implementations, but 2 other pluggable connectors (AttachingConnector
@@ -77,7 +77,7 @@
  *          capabilities().supportsHandshakeTimeout = false
  *          capabilities().supportsMultipleConnections = false
  *     Also the test checks up that at start-up time when
- *     Bootstrap.virtualMachineManager() is invoked the 2 pluggable connectors
+ *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the 2 pluggable connectors
  *     (AttachingConnector and ListeningConnector) are NOT created as they are
  *     based on class which extends the TransportService abstract class but
  *     constructors of this class throws Exception.
@@ -124,7 +124,7 @@ import java.io.*;
  * class (com.sun.jdi.connect.spi.TransportService).                        <BR>
  *                                                                          <BR>
  * The test checks up that at start-up time when                            <BR>
- * Bootstrap.virtualMachineManager() is invoked four expected pluggable     <BR>
+ * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked four expected pluggable     <BR>
  * connectors (two AttachingConnectors and two ListeningConnectors) are     <BR>
  * created  properly on base of two different TransportService              <BR>
  * implementations, but 2 other pluggable connectors (AttachingConnector    <BR>
@@ -174,7 +174,7 @@ import java.io.*;
  *      capabilities().supportsMultipleConnections = false                  <BR>
  *                                                                          <BR>
  * Also the test checks up that at start-up time when                       <BR>
- * Bootstrap.virtualMachineManager() is invoked the 2 pluggable connectors  <BR>
+ * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the 2 pluggable connectors  <BR>
  * (AttachingConnector and ListeningConnector) are NOT created as they are  <BR>
  * based on class which extends the TransportService abstract class but     <BR>
  * constructors of this class throws Exception.                             <BR>
@@ -258,9 +258,9 @@ public class plugMultiConnect004 {
             = new String[invalidTransportServicesNumber];
         invalidTransportServicesNames[0] = "PlugTransportService004_03_Name";
 
-        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
+        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect005/plugMultiConnect005.java

@@ -35,7 +35,7 @@
  *     (AttachingConnector, ListeningConnector, or LaunchingConnector).
  *     and the TransportService abstract class.
  *     The test checks up that at start-up time when >
- *     Bootstrap.virtualMachineManager() is invoked the 6 expected
+ *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the 6 expected
  *     pluggable connectors are created  properly on base of 6 different
  *     Connector implementations of different types and four expected
  *     pluggable connectors (two AttachingConnectors and two
@@ -126,7 +126,7 @@ import java.io.*;
  * and the TransportService abstract class.                                 <BR>
  *                                                                          <BR>
  * The test checks up that at start-up time when                            <BR>
- * Bootstrap.virtualMachineManager() is invoked the 6 expected              <BR>
+ * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the 6 expected              <BR>
  * pluggable connectors are created  properly on base of 6 different        <BR>
  * Connector implementations of different types and four expected           <BR>
  * pluggable connectors (two AttachingConnectors and two                    <BR>
@@ -272,9 +272,9 @@ public class plugMultiConnect005 {
         referenceTransportServices[0] = new PlugTransportService005_01();
         referenceTransportServices[1] = new PlugTransportService005_02();
 
-        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
+        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/MultiConnectors/plugMultiConnect006/plugMultiConnect006.java

@@ -35,14 +35,14 @@
  *     (AttachingConnector, ListeningConnector, or LaunchingConnector).
  *     and the TransportService abstract class.
  *     The test checks up that at start-up time when
- *     Bootstrap.virtualMachineManager() is invoked the 6 expected
+ *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the 6 expected
  *     pluggable connectors are created  properly on base of 6 different
  *     Connector implementations of different types and four expected
  *     pluggable connectors (two AttachingConnectors and two
  *     ListeningConnectors) are created  properly on base of two different
  *     TransportService implementations.
  *     Also the test checks up that at start-up time when
- *     Bootstrap.virtualMachineManager() is invoked the 3 pluggable connectors
+ *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the 3 pluggable connectors
  *     are NOT created for Connector implementations for which instances can
  *     not be created and 2 pluggable connectors (AttachingConnector and
  *     ListeningConnector) are NOT created for TransportService implementation
@@ -138,7 +138,7 @@ import java.io.*;
  * and the TransportService abstract class.                                 <BR>
  *                                                                          <BR>
  * The test checks up that at start-up time when                            <BR>
- * Bootstrap.virtualMachineManager() is invoked the 6 expected              <BR>
+ * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the 6 expected              <BR>
  * pluggable connectors are created  properly on base of 6 different        <BR>
  * Connector implementations of different types and four expected           <BR>
  * pluggable connectors (two AttachingConnectors and two                    <BR>
@@ -146,7 +146,7 @@ import java.io.*;
  * TransportService implementations.                                        <BR>
  *                                                                          <BR>
  * Also the test checks up that at start-up time when                       <BR>
- * Bootstrap.virtualMachineManager() is invoked the 3 pluggable connectors  <BR>
+ * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked the 3 pluggable connectors  <BR>
  * are NOT created for Connector implementations for which instances can    <BR>
  * not be created and 2 pluggable connectors (AttachingConnector and        <BR>
  * ListeningConnector) are NOT created for TransportService implementation  <BR>
@@ -301,9 +301,9 @@ public class plugMultiConnect006 {
         referenceTransportServices[0] = new PlugTransportService006_01();
         referenceTransportServices[1] = new PlugTransportService006_02();
 
-        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
+        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService001/transportService001.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the TransportService abstract
  *     class (com.sun.jdi.connect.spi.TransportService).
  *     The test checks up that at start-up time when
- *     Bootstrap.virtualMachineManager() is invoked two pluggable
+ *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked two pluggable
  *     connectors (AttachingConnector and ListeningConnector) are created
  *     on base of PlugTransportService001 class which extends
  *     com.sun.jdi.connect.spi.TransportService abstract class
@@ -103,7 +103,7 @@ import java.io.*;
  * class (com.sun.jdi.connect.spi.TransportService).                        <BR>
  *                                                                          <BR>
  * The test checks up that at start-up time when                            <BR>
- * Bootstrap.virtualMachineManager() is invoked two pluggable               <BR>
+ * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked two pluggable               <BR>
  * connectors (AttachingConnector and ListeningConnector) are created       <BR>
  * on base of PlugTransportService001 class which extends                   <BR>
  * com.sun.jdi.connect.spi.TransportService abstract class                  <BR>
@@ -192,9 +192,9 @@ public class transportService001 {
             ("==> Test checks that expected pluggable attaching and listening connectors are created properly.");
 
 
-        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
+        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService002/transportService002.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the TransportService abstract
  *     class (com.sun.jdi.connect.spi.TransportService).
  *     The test checks up that at start-up time when
- *     Bootstrap.virtualMachineManager() is invoked two pluggable
+ *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked two pluggable
  *     connectors (AttachingConnector and ListeningConnector) are created
  *     on base of PlugTransportService002 class which extends
  *     com.sun.jdi.connect.spi.TransportService abstract class
@@ -103,7 +103,7 @@ import java.io.*;
  * class (com.sun.jdi.connect.spi.TransportService).                        <BR>
  *                                                                          <BR>
  * The test checks up that at start-up time when                            <BR>
- * Bootstrap.virtualMachineManager() is invoked two pluggable               <BR>
+ * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked two pluggable               <BR>
  * connectors (AttachingConnector and ListeningConnector) are created       <BR>
  * on base of PlugTransportService002 class which extends                   <BR>
  * com.sun.jdi.connect.spi.TransportService abstract class                  <BR>
@@ -192,9 +192,9 @@ public class transportService002 {
             ("==> Test checks that expected pluggable attaching and listening connectors are created properly.");
 
 
-        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
+        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/PlugConnectors/TransportService/transportService003/transportService003.java

@@ -34,7 +34,7 @@
  *     on base of classes which implement the TransportService abstract
  *     class (com.sun.jdi.connect.spi.TransportService).
  *     The test checks up that at start-up time when
- *     Bootstrap.virtualMachineManager() is invoked pluggable
+ *     com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked pluggable
  *     connectors (AttachingConnector and ListeningConnector) are NOT created
  *     on base of PlugTransportService003 class which extends
  *     com.sun.jdi.connect.spi.TransportService abstract class
@@ -80,7 +80,7 @@ import java.io.*;
  * class (com.sun.jdi.connect.spi.TransportService).                        <BR>
  *                                                                          <BR>
  * The test checks up that at start-up time when                            <BR>
- * Bootstrap.virtualMachineManager() is invoked pluggable                   <BR>
+ * com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() is invoked pluggable                   <BR>
  * connectors (AttachingConnector and ListeningConnector) are NOT created   <BR>
  * on base of PlugTransportService003 class which extends                   <BR>
  * com.sun.jdi.connect.spi.TransportService abstract class                  <BR>
@@ -146,18 +146,18 @@ public class transportService003 {
 
         VirtualMachineManager virtualMachineManager = null;
         try {
-            virtualMachineManager = Bootstrap.virtualMachineManager();
+            virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         } catch (Throwable thrown) {
-            // OK: Bootstrap.virtualMachineManager() may throw an unspecified error
+            // OK: com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() may throw an unspecified error
             // if initialization of the VirtualMachineManager fails or if the virtual
             // machine manager is unable to locate or create any Connectors.
             logOnVerbose
-                (infoLogPrefixNead + "Bootstrap.virtualMachineManager() throws:\n" + thrown);
+                (infoLogPrefixNead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() throws:\n" + thrown);
             return STATUS_PASSED;
         }
 
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/choices/choices001.java

@@ -77,7 +77,7 @@ public class choices001 {
                         "jdi.Connector.SelectedArgument.choices\n" ;
 
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid001.java

@@ -74,7 +74,7 @@ public class isvalid001 {
                         "Method tested: " +
                         "jdi.Connector.SelectedArgument.isValid\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/SelectedArgument/isValid/isvalid002.java

@@ -77,7 +77,7 @@ public class isvalid002 {
                         "Method tested: " +
                         "jdi.Connector.SelectedArgument.isValid\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid001.java

@@ -75,7 +75,7 @@ public class isvalid001 {
                         "Method tested: " +
                         "jdi.Connector.StringArgument.isValid\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid002.java

@@ -75,7 +75,7 @@ public class isvalid002 {
                         "Method tested: " +
                         "jdi.Connector.StringArgument.isValid\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/StringArgument/isValid/isvalid003.java

@@ -75,7 +75,7 @@ public class isvalid003 {
                         "Method tested: " +
                         "jdi.Connector.StringArgument.isValid\n" ;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         List connectorsList = vmm.allConnectors();
         Iterator connectorsListIterator = connectorsList.iterator();

test/hotspot/jtreg/vmTestbase/nsk/jdi/Transport/name/name001.java

@@ -67,7 +67,7 @@ public class name001 {
         int exitCode0 = 0;
         int exitCode2 = 2;
 
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
 
         for (Connector connector : vmm.allConnectors()) {
                 String sName = connector.transport().name();

test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/allConnectors/allconnectors001.java

@@ -114,8 +114,8 @@ public class allconnectors001 {
 
         //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ variable part
 
-        log2("......call to Bootstrap.virtualMachineManager()");
+        log2("......call to com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager()");
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         if (vmm == null) {
             log3("ERROR: null returned");
             testExitCode = FAILED;

test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/attachingConnectors/attaching001.java

@@ -112,8 +112,8 @@ public class attaching001 {
         log1("      TESTING BEGINS");
         //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ variable part
 
-        log2("......call to Bootstrap.virtualMachineManager()");
+        log2("......call to com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager()");
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         if (vmm == null) {
             log3("ERROR: null returned");
             testExitCode = FAILED;

test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm001.java

@@ -185,9 +185,9 @@ public class convm001 {
 
             //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ variable part
 
-            log2("......call to Bootstrap.virtualMachineManager()");
+            log2("......call to com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager()");
 
-            vmm = Bootstrap.virtualMachineManager();
+            vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
             if (vmm == null) {
                 log3("ERROR: null returned");
                 testExitCode = FAILED;

test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm002.java

@@ -168,9 +168,9 @@ public class convm002 {
 
         int size = 0;
 
-        log2("......call to Bootstrap.virtualMachineManager()");
+        log2("......call to com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager()");
 
-        vmm = Bootstrap.virtualMachineManager();
+        vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         if (vmm == null) {
             log3("ERROR: null returned");
             testExitCode = FAILED;

test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/connectedVirtualMachines/convm003.java

@@ -185,9 +185,9 @@ public class convm003 {
             //log1("new checkready: #" + i);
 
             //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ variable part
-            log2("......call to Bootstrap.virtualMachineManager()");
+            log2("......call to com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager()");
 
-            vmm = Bootstrap.virtualMachineManager();
+            vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
             if (vmm == null) {
                 log3("ERROR: null returned");
                 testExitCode = FAILED;

test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM001.java

@@ -100,9 +100,9 @@ public class createVM001 {
         logOnVerbose
             ("==> throw IllegalStateException for Connection that is not open.");
 
-        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
+        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM002.java

@@ -101,9 +101,9 @@ public class createVM002 {
         logOnVerbose
             ("==> throw IOException when I/O error occurs in Connection.");
 
-        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
+        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM003.java

@@ -106,9 +106,9 @@ public class createVM003 {
         logOnVerbose
             ("==> creates Virtual Machine properly for Process that is NOT null.");
 
-        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
+        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM004.java

@@ -106,9 +106,9 @@ public class createVM004 {
         logOnVerbose
             ("==> creates Virtual Machine properly when 'Process' argument is null.");
 
-        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
+        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM005.java

@@ -105,9 +105,9 @@ public class createVM005 {
         logOnVerbose
             ("==> creates Virtual Machine properly.");
 
-        VirtualMachineManager virtualMachineManager = Bootstrap.virtualMachineManager();
+        VirtualMachineManager virtualMachineManager = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         if (virtualMachineManager == null) {
-            logOnError(errorLogPrefixHead + "Bootstrap.virtualMachineManager() returns null.");
+            logOnError(errorLogPrefixHead + "com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager() returns null.");
             return STATUS_FAILED;
         }
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/defaultConnector/default001.java

@@ -113,8 +113,8 @@ public class default001 {
         log1("      TESTING BEGINS");
         //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ variable part
 
-        log2("......call to Bootstrap.virtualMachineManager()");
+        log2("......call to com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager()");
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         if (vmm == null) {
             log3("ERROR: null returned");
             testExitCode = FAILED;

test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/launchingConnectors/launching001.java

@@ -111,8 +111,8 @@ public class launching001 {
         log1("      TESTING BEGINS");
         //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ variable part
 
-        log2("......call to Bootstrap.virtualMachineManager()");
+        log2("......call to com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager()");
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         if (vmm == null) {
             log3("ERROR: null returned");
             testExitCode = FAILED;

test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/listeningConnectors/listening001.java

@@ -113,8 +113,8 @@ public class listening001 {
         log1("      TESTING BEGINS");
         //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ variable part
 
-        log2("......call to Bootstrap.virtualMachineManager()");
+        log2("......call to com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager()");
-        VirtualMachineManager vmm = Bootstrap.virtualMachineManager();
+        VirtualMachineManager vmm = com.jetbrains.jdi.VirtualMachineManagerImpl.testVirtualMachineManager();
         if (vmm == null) {
             log3("ERROR: null returned");
             testExitCode = FAILED;