fixed excludes after merge

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

README.md

@@ -11,7 +11,7 @@ can be found on the [releases page](https://github.com/JetBrains/JetBrainsRuntim
 
 | IDE Version | Latest JBR | Date Released |
 |  ---        | ---        | ---           |
-| 2022.2      | [17.0.3-b469.37](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.3b469.37)| 02-Aug-2022   |
+| 2022.2      | [17.0.4-b469.46](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.4b469.46)| 22-Aug-2022   |
 
 
 ## Contents

make/scripts/fixpath.sh

@@ -147,14 +147,13 @@ function import_path() {
   if [[ "$path" != "" ]]; then
     # Store current unix path
     unixpath="$path"
-    # Now turn it into a windows path
-    winpath="$($PATHTOOL -w "$path" 2>/dev/null)"
-    # If it fails, try again with an added .exe (needed on WSL)
-    if [[ $? -ne 0 ]]; then
+    # If $unixpath does not exist, add .exe (needed on WSL)
+    if [[ ! -e "$unixpath" ]]; then
       unixpath="$unixpath.exe"
-      winpath="$($PATHTOOL -w "$unixpath" 2>/dev/null)"
     fi
-    if [[ $? -eq 0 ]]; then
+    # Now turn it into a windows path
+    winpath="$($PATHTOOL -w "$unixpath" 2>/dev/null)"
+    if [[ $? -eq 0 && -e "$unixpath" ]]; then
       if [[ ! "$winpath" =~ ^"$ENVROOT"\\.*$ ]] ; then
         # If it is not in envroot, it's a generic windows path
         if [[ ! $winpath =~ ^[-_.:\\a-zA-Z0-9]*$ ]] ; then

src/java.base/share/classes/com/jetbrains/internal/JBRApi.java

@@ -87,6 +87,7 @@ import static java.lang.invoke.MethodHandles.Lookup;
  * user to directly create proxy object.
  */
 public class JBRApi {
+    static final boolean VERBOSE = Boolean.getBoolean("jetbrains.api.verbose");
 
     private static final Map<String, RegisteredProxyInfo> registeredProxyInfoByInterfaceName = new HashMap<>();
     private static final Map<String, RegisteredProxyInfo> registeredProxyInfoByTargetName = new HashMap<>();
@@ -115,6 +116,9 @@ public class JBRApi {
             knownServices = Set.of();
             knownProxies = Set.of();
         }
+        if (VERBOSE) {
+            System.out.println("JBR API init\nKNOWN_SERVICES = " + knownServices + "\nKNOWN_PROXIES = " + knownProxies);
+        }
     }
 
     /**
@@ -136,7 +140,12 @@ public class JBRApi {
             RegisteredProxyInfo info = registeredProxyInfoByInterfaceName.get(i.getName());
             if (info == null) return null;
             ProxyInfo resolved = ProxyInfo.resolve(info);
-            return resolved != null ? new Proxy<>(resolved) : null;
+            if (resolved == null) {
+                if (VERBOSE) {
+                    System.err.println("Couldn't resolve proxy info: " + i.getName());
+                }
+                return null;
+            } else return new Proxy<>(resolved);
         });
     }
 
@@ -159,9 +168,10 @@ public class JBRApi {
         RegisteredProxyInfo info = registeredProxyInfoByTargetName.get(targetName);
         if (info == null) return null;
         try {
-            return (info.type().isPublicApi() ? outerLookup : info.apiModule())
-                    .findClass(info.interfaceName());
-        } catch (ClassNotFoundException | IllegalAccessException e) {
+            return Class.forName(info.interfaceName(), true,
+                    (info.type().isPublicApi() ? outerLookup : info.apiModule()).lookupClass().getClassLoader());
+        } catch (ClassNotFoundException e) {
+            if (VERBOSE) e.printStackTrace();
             return null;
         }
     }

src/java.base/share/classes/com/jetbrains/internal/ProxyDependencyManager.java

@@ -78,7 +78,7 @@ class ProxyDependencyManager {
      * Collect dependencies for given class and store them into cache.
      */
     private static void step(Node parent, Class<?> clazz) {
-        if (!clazz.getPackageName().startsWith("com.jetbrains")) return;
+        if (!clazz.getPackageName().startsWith("com.jetbrains") && !JBRApi.isKnownProxyInterface(clazz)) return;
         if (parent != null && parent.findAndMergeCycle(clazz) != null) {
             return;
         }
@@ -101,6 +101,9 @@ class ProxyDependencyManager {
             // Otherwise cache will contain incomplete data
             for (Class<?> c : node.cycle.members) {
                 cache.put(c, node.cycle.dependencies);
+                if (JBRApi.VERBOSE) {
+                    System.out.println("Found dependencies for " + c.getName() + ": " + node.cycle.dependencies);
+                }
             }
         }
     }

src/java.base/share/classes/com/jetbrains/internal/ProxyGenerator.java

@@ -17,6 +17,7 @@
 package com.jetbrains.internal;
 
 import jdk.internal.org.objectweb.asm.*;
+import jdk.internal.org.objectweb.asm.util.CheckClassAdapter;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -54,13 +55,15 @@ class ProxyGenerator {
     /**
      * Print warnings about usage of deprecated interfaces and methods to {@link System#err}.
      */
-    private static final boolean LOG_DEPRECATED = System.getProperty("jetbrains.api.logDeprecated", "true").equalsIgnoreCase("true");
+    private static final boolean LOG_DEPRECATED = System.getProperty("jetbrains.api.logDeprecated", String.valueOf(JBRApi.VERBOSE)).equalsIgnoreCase("true");
+    private static final boolean VERIFY_BYTECODE = Boolean.getBoolean("jetbrains.api.verifyBytecode");
 
     private static final AtomicInteger nameCounter = new AtomicInteger();
 
     private final ProxyInfo info;
     private final boolean generateBridge;
     private final String proxyName, bridgeName;
+    private final ClassWriter originalProxyWriter, originalBridgeWriter;
     private final ClassVisitor proxyWriter, bridgeWriter;
     private final List<Supplier<MethodHandle>> handles = new ArrayList<>();
     private final List<Supplier<Class<?>>> classReferences = new ArrayList<>();
@@ -77,6 +80,9 @@ class ProxyGenerator {
      * classes until {@link #defineClasses()} is called.
      */
     ProxyGenerator(ProxyInfo info) {
+        if (JBRApi.VERBOSE) {
+            System.out.println("Generating proxy " + info.interFace.getName());
+        }
         this.info = info;
         generateBridge = info.type.isPublicApi();
         int nameId = nameCounter.getAndIncrement();
@@ -84,26 +90,25 @@ class ProxyGenerator {
         bridgeName = generateBridge ? info.apiModule.lookupClass().getPackageName().replace('.', '/') + "/" +
                 info.interFace.getSimpleName() + "$$JBRApiBridge$" + nameId : null;
 
-        class ClassWriter extends jdk.internal.org.objectweb.asm.ClassWriter {
-            ClassWriter() { super(ClassWriter.COMPUTE_FRAMES); }
-            ClassVisitor createEmptyVisitor() {
-                return new ClassVisitor(api) {
-                    @Override
-                    public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
-                        return new MethodVisitor(api) {};
-                    }
-                };
+        originalProxyWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
+        proxyWriter = VERIFY_BYTECODE ? new CheckClassAdapter(originalProxyWriter, true) : originalProxyWriter;
+        originalBridgeWriter = generateBridge ? new ClassWriter(ClassWriter.COMPUTE_FRAMES) : null;
+        if (generateBridge) {
+            bridgeWriter = VERIFY_BYTECODE ? new CheckClassAdapter(originalBridgeWriter, true) : originalBridgeWriter;
+        } else bridgeWriter = new ClassVisitor(Opcodes.ASM9) { // Empty visitor
+            @Override
+            public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
+                return new MethodVisitor(api) {};
             }
-        }
-        ClassWriter proxyClassWriter = new ClassWriter();
-        proxyWriter = proxyClassWriter;
-        bridgeWriter = generateBridge ? new ClassWriter() : proxyClassWriter.createEmptyVisitor();
+        };
         proxyWriter.visit(CLASSFILE_VERSION, ACC_SUPER | ACC_FINAL | ACC_SYNTHETIC, proxyName, null,
                 "java/lang/Object", new String[] {Type.getInternalName(info.interFace)});
         bridgeWriter.visit(CLASSFILE_VERSION, ACC_SUPER | ACC_FINAL | ACC_SYNTHETIC | ACC_PUBLIC, bridgeName, null,
                 "java/lang/Object", null);
         generateConstructor();
         generateMethods();
+        proxyWriter.visitEnd();
+        bridgeWriter.visitEnd();
     }
 
     boolean areAllMethodsImplemented() {
@@ -187,9 +192,9 @@ class ProxyGenerator {
     void defineClasses() {
         try {
             Lookup bridge = !generateBridge ? null : MethodHandles.privateLookupIn(
-                    info.apiModule.defineClass(((ClassWriter) bridgeWriter).toByteArray()), info.apiModule);
+                    info.apiModule.defineClass(originalBridgeWriter.toByteArray()), info.apiModule);
             generatedProxy = info.interFaceLookup.defineHiddenClass(
-                    ((ClassWriter) proxyWriter).toByteArray(), true, Lookup.ClassOption.STRONG, Lookup.ClassOption.NESTMATE);
+                    originalProxyWriter.toByteArray(), true, Lookup.ClassOption.STRONG, Lookup.ClassOption.NESTMATE);
             generatedHandlesHolder = generateBridge ? bridge : generatedProxy;
         } catch (IllegalAccessException e) {
             throw new RuntimeException(e);
@@ -205,6 +210,7 @@ class ProxyGenerator {
         if (LOG_DEPRECATED && info.interFace.isAnnotationPresent(Deprecated.class)) {
             logDeprecated(p, "Warning: using deprecated JBR API interface " + info.interFace.getName());
         }
+        p.visitCode();
         p.visitVarInsn(ALOAD, 0);
         if (info.target != null) {
             p.visitInsn(DUP);
@@ -213,7 +219,8 @@ class ProxyGenerator {
         }
         p.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
         p.visitInsn(RETURN);
-        p.visitMaxs(-1, -1);
+        p.visitMaxs(0, 0);
+        p.visitEnd();
     }
 
     private void generateMethods() {
@@ -250,6 +257,11 @@ class ProxyGenerator {
             if (e1 != null) exceptions.add(e1);
             if (e2 != null) exceptions.add(e2);
             generateUnsupportedMethod(proxyWriter, method);
+            if (JBRApi.VERBOSE) {
+                System.err.println("Couldn't generate method " + method.getName());
+                if (e1 != null) e1.printStackTrace();
+                if (e2 != null) e2.printStackTrace();
+            }
             allMethodsImplemented = false;
         }
     }
@@ -292,6 +304,8 @@ class ProxyGenerator {
             logDeprecated(p, "Warning: using deprecated JBR API method " +
                     interfaceMethod.getDeclaringClass().getName() + "#" + interfaceMethod.getName());
         }
+        p.visitCode();
+        b.visitCode();
         MethodVisitor bp = generateBridge ? b : p;
         bp.visitFieldInsn(GETSTATIC, bridgeOrProxyName, handleName, MH_DESCRIPTOR);
         if (passInstance) {
@@ -315,8 +329,10 @@ class ProxyGenerator {
         int returnOpcode = getReturnOpcode(mapping.returnMapping().to());
         p.visitInsn(returnOpcode);
         b.visitInsn(returnOpcode);
-        p.visitMaxs(-1, -1);
-        b.visitMaxs(-1, -1);
+        p.visitMaxs(0, 0);
+        b.visitMaxs(0, 0);
+        p.visitEnd();
+        b.visitEnd();
     }
 
     private String addHandle(ClassVisitor classWriter, Supplier<MethodHandle> handleSupplier) {

src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformComponent.java

@@ -27,6 +27,7 @@
 package sun.lwawt.macosx;
 
 import java.awt.Insets;
+import java.util.Objects;
 
 import sun.lwawt.PlatformComponent;
 import sun.lwawt.PlatformWindow;
@@ -54,6 +55,8 @@ class CPlatformComponent extends CFRetainedResource
 
     @Override
     public void initialize(final PlatformWindow platformWindow) {
+        Objects.requireNonNull(platformWindow);
+
         this.platformWindow = platformWindow;
         setPtr(nativeCreateComponent(platformWindow.getLayerPtr()));
     }
@@ -62,11 +65,13 @@ class CPlatformComponent extends CFRetainedResource
 
     @Override
     public void setBounds(final int x, final int y, final int w, final int h) {
-        // translates values from the coordinate system of the top-level window
-        // to the coordinate system of the content view
-        final LWWindowPeer peer = platformWindow.getPeer();
-        final Insets insets = (peer != null) ? peer.getInsets() : new Insets(0, 0, 0, 0);
-        execute(ptr->nativeSetBounds(ptr, x - insets.left, y - insets.top, w, h));
+        if (platformWindow != null) {
+            // translates values from the coordinate system of the top-level window
+            // to the coordinate system of the content view
+            final LWWindowPeer peer = platformWindow.getPeer();
+            final Insets insets = (peer != null) ? peer.getInsets() : new Insets(0, 0, 0, 0);
+            execute(ptr -> nativeSetBounds(ptr, x - insets.left, y - insets.top, w, h));
+        }
     }
 
     @Override

src/java.desktop/macosx/classes/sun/lwawt/macosx/CWrapper.java

@@ -50,7 +50,9 @@ final class CWrapper {
         static void makeKeyAndOrderFront(long window) {
             AWTThreading.executeWaitToolkit(wait -> nativeMakeKeyAndOrderFront(window, wait));
         }
-        static native void makeKeyWindow(long window);
+        static void makeKeyWindow(long window) {
+            AWTThreading.executeWaitToolkit(wait -> nativeMakeKeyWindow(window, wait));
+        }
         static native void makeMainWindow(long window);
         static native boolean canBecomeMainWindow(long window);
         static native boolean isKeyWindow(long window);
@@ -71,6 +73,7 @@ final class CWrapper {
         }
 
         private static native void nativeOrderOut(long window, boolean wait);
+        private static native void nativeMakeKeyWindow(long window, boolean wait);
         private static native void nativeMakeKeyAndOrderFront(long window, boolean wait);
 
         /**

src/java.desktop/macosx/native/libawt_lwawt/awt/CWrapper.m

@@ -50,12 +50,12 @@ JNI_COCOA_EXIT(env);
 
 /*
  * Class:     sun_lwawt_macosx_CWrapper$NSWindow
- * Method:    makeKeyWindow
- * Signature: (J)V
+ * Method:    nativeMakeKeyWindow
+ * Signature: (JZ)V
  */
 JNIEXPORT void JNICALL
-Java_sun_lwawt_macosx_CWrapper_00024NSWindow_makeKeyWindow
-(JNIEnv *env, jclass cls, jlong windowPtr)
+Java_sun_lwawt_macosx_CWrapper_00024NSWindow_nativeMakeKeyWindow
+(JNIEnv *env, jclass cls, jlong windowPtr, jboolean wait)
 {
 JNI_COCOA_ENTER(env);
 
@@ -63,7 +63,7 @@ JNI_COCOA_ENTER(env);
     [ThreadUtilities performOnMainThread:@selector(makeKeyWindow)
                                       on:window
                               withObject:nil
-                           waitUntilDone:NO];
+                           waitUntilDone:(BOOL)wait];
 
 JNI_COCOA_EXIT(env);
 }

src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLRenderQueue.m

@@ -619,13 +619,9 @@ Java_sun_java2d_metal_MTLRenderQueue_flushBuffer
                     MTLGraphicsConfigInfo *mtlInfo =
                             (MTLGraphicsConfigInfo *)jlong_to_ptr(pConfigInfo);
 
-                    if (mtlInfo == NULL) {
-
-                    } else {
+                    if (mtlInfo != NULL) {
                         MTLContext *newMtlc = mtlInfo->context;
-                        if (newMtlc == NULL) {
-
-                        } else {
+                        if (newMtlc != NULL) {
                             if (mtlc != NULL) {
                                 [mtlc.encoderManager endEncoder];
                                 MTLCommandBufferWrapper * cbwrapper = [mtlc pullCommandBufferWrapper];

src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLSurfaceData.m

@@ -24,6 +24,7 @@
  */
 
 #import <stdlib.h>
+#import <AWTView.h>
 
 #import "sun_java2d_metal_MTLSurfaceData.h"
 
@@ -326,7 +327,9 @@ Java_sun_java2d_metal_MTLSurfaceData_initOps
     bmtlsdo->isOpaque = isOpaque;
 
     mtlsdo->peerData = (AWTView *)jlong_to_ptr(pPeerData);
+    [mtlsdo->peerData retain];
     mtlsdo->layer = (MTLLayer *)jlong_to_ptr(layerPtr);
+    [mtlsdo->layer retain];
     mtlsdo->configInfo = (MTLGraphicsConfigInfo *)jlong_to_ptr(pConfigInfo);
 
     if (mtlsdo->configInfo == NULL) {
@@ -343,8 +346,9 @@ Java_sun_java2d_metal_MTLSurfaceData_clearWindow
 
     BMTLSDOps *bmtlsdo = (MTLSDOps*) SurfaceData_GetOps(env, mtlsd);
     MTLSDOps *mtlsdo = (MTLSDOps*) bmtlsdo->privOps;
-
+    [mtlsdo->peerData release];
     mtlsdo->peerData = NULL;
+    [mtlsdo->layer release];
     mtlsdo->layer = NULL;
 }
 

src/java.desktop/share/classes/com/jetbrains/desktop/JBRApiModule.java

@@ -31,6 +31,9 @@ public class JBRApiModule {
                 .service("com.jetbrains.JBRFileDialogService", null)
                     .withStatic("getFileDialog", "com.jetbrains.desktop.JBRFileDialog", "get")
                 .proxy("com.jetbrains.JBRFileDialog", "com.jetbrains.desktop.JBRFileDialog")
-                .service("com.jetbrains.CustomWindowDecoration", "java.awt.Window$CustomWindowDecoration");
+                .service("com.jetbrains.CustomWindowDecoration", "java.awt.Window$CustomWindowDecoration")
+                .service("com.jetbrains.DesktopActions", null)
+                    .withStatic("setHandler", "java.awt.Desktop", "setDesktopActionsHandler")
+                .clientProxy("java.awt.Desktop$DesktopActionsHandler", "com.jetbrains.DesktopActions$Handler");
     }
 }

src/java.desktop/share/classes/java/awt/Desktop.java

@@ -40,6 +40,7 @@ import java.awt.peer.DesktopPeer;
 import java.io.File;
 import java.io.FilePermission;
 import java.io.IOException;
+import java.lang.reflect.Field;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.security.AccessController;
@@ -428,7 +429,11 @@ public class Desktop {
         checkActionSupport(Action.OPEN);
         checkFileValidation(file);
 
-        peer.open(file);
+        final DesktopActions localHandler = actions;
+        if (localHandler != null && localHandler.openSupported)
+            localHandler.handler.open(file);
+        else
+            peer.open(file);
     }
 
     /**
@@ -463,7 +468,12 @@ public class Desktop {
         if (file.isDirectory()) {
             throw new IOException(file.getPath() + " is a directory");
         }
-        peer.edit(file);
+
+        final DesktopActions localHandler = actions;
+        if (localHandler != null && localHandler.editSupported)
+            localHandler.handler.edit(file);
+        else
+            peer.edit(file);
     }
 
     /**
@@ -499,7 +509,12 @@ public class Desktop {
         if (file.isDirectory()) {
             throw new IOException(file.getPath() + " is a directory");
         }
-        peer.print(file);
+
+        final DesktopActions localHandler = actions;
+        if (localHandler != null && localHandler.printSupported)
+            localHandler.handler.print(file);
+        else
+            peer.print(file);
     }
 
     /**
@@ -530,7 +545,12 @@ public class Desktop {
         checkExec();
         checkActionSupport(Action.BROWSE);
         Objects.requireNonNull(uri);
-        peer.browse(uri);
+
+        final DesktopActions localHandler = actions;
+        if (localHandler != null && localHandler.browseSupported)
+            localHandler.handler.browse(uri);
+        else
+            peer.browse(uri);
     }
 
     /**
@@ -600,7 +620,11 @@ public class Desktop {
             throw new IllegalArgumentException("URI scheme is not \"mailto\"");
         }
 
-        peer.mail(mailtoURI);
+        final DesktopActions localHandler = actions;
+        if (localHandler != null && localHandler.mailSupported)
+            localHandler.handler.mail(mailtoURI);
+        else
+            peer.mail(mailtoURI);
     }
 
     private void checkExec() throws SecurityException {
@@ -1047,4 +1071,44 @@ public class Desktop {
         });
         return peer.moveToTrash(file);
     }
+
+    private interface DesktopActionsHandler {
+        void open(File file) throws IOException;
+        void edit(File file) throws IOException;
+        void print(File file) throws IOException;
+        void mail(URI mailtoURL) throws IOException;
+        void browse(URI uri) throws IOException;
+    }
+    private static class DesktopActions {
+        private final DesktopActionsHandler handler;
+
+        private final boolean openSupported, editSupported, printSupported, mailSupported, browseSupported;
+
+        private static boolean isImplemented(Object target, String method, Class<?>... params) throws NoSuchMethodException {
+            return !target.getClass().getMethod(method, params)
+                    .getDeclaringClass().getName().equals("com.jetbrains.DesktopActions$Handler");
+        }
+
+        private DesktopActions(DesktopActionsHandler handler) throws NoSuchFieldException, IllegalAccessException, NoSuchMethodException {
+            this.handler = handler;
+            // Check which methods are actually implemented
+            Field targetField = handler.getClass().getDeclaredField("target");
+            targetField.setAccessible(true);
+            Object target = targetField.get(handler);
+            openSupported = isImplemented(target, "open", File.class);
+            editSupported = isImplemented(target, "edit", File.class);
+            printSupported = isImplemented(target, "print", File.class);
+            mailSupported = isImplemented(target, "mail", URI.class);
+            browseSupported = isImplemented(target, "browse", URI.class);
+        }
+    }
+    private static volatile DesktopActions actions;
+
+    static void setDesktopActionsHandler(DesktopActionsHandler h) {
+        try {
+            actions = new DesktopActions(h);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }

src/java.desktop/share/classes/sun/font/SunFontManager.java

@@ -366,10 +366,10 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
         jreFontMap.put("JetBrainsMono-Thin.ttf", new BundledFontInfo("JetBrainsMono-Thin", 2, 225, 0));
         jreFontMap.put("JetBrainsMono-ThinItalic.ttf", new BundledFontInfo("JetBrainsMono-ThinItalic", 2, 225, 0));
 
-        jreFontMap.put("Inter-Bold.otf", new BundledFontInfo("Inter-Bold", 3, 19, 0));
+        jreFontMap.put("Inter-SemiBold.otf", new BundledFontInfo("Inter-Bold", 3, 19, 0));
         jreFontMap.put("Inter-Regular.otf", new BundledFontInfo("Inter-Regular", 3, 19, 0));
         jreFontMap.put("Inter-Italic.otf", new BundledFontInfo("Inter-Italic", 3, 19, 0));
-        jreFontMap.put("Inter-BoldItalic.otf", new BundledFontInfo("Inter-BoldItalic", 3, 19, 0));
+        jreFontMap.put("Inter-SemiBoldItalic.otf", new BundledFontInfo("Inter-BoldItalic", 3, 19, 0));
 
         jreBundledFontFiles.addAll(jreFontMap.keySet());
     }

src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp

@@ -658,9 +658,13 @@ MsgRouting AwtFrame::WmNcMouseDown(WPARAM hitTest, int x, int y, int button) {
                         }
                     } else break;
                 }
+                POINT myPos;
+                myPos.x = x;
+                myPos.y = y;
+                ::ScreenToClient(GetHWnd(), &myPos);
                 WmMouseDown(GetButtonMK(button),
-                            x - rcWindow.left,
-                            y - rcWindow.top,
+                            myPos.x,
+                            myPos.y,
                             button);
                 return mrConsume;
         }
@@ -705,9 +709,11 @@ MsgRouting AwtFrame::WmNcMouseMove(WPARAM hitTest, int x, int y) {
             case HTCLOSE:
             case HTMENU:
             case HTCAPTION:
-                RECT rcWindow;
-                GetWindowRect(GetHWnd(), &rcWindow);
-                WmMouseMove(0, x - rcWindow.left, y - rcWindow.top);
+                POINT myPos;
+                myPos.x = x;
+                myPos.y = y;
+                ::ScreenToClient(GetHWnd(), &myPos);
+                WmMouseMove(0, myPos.x, myPos.y);
                 if (hitTest != HTCAPTION) return mrConsume; // Preserve default window drag for HTCAPTION
         }
     }

src/jetbrains.api/src/com/jetbrains/DesktopActions.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2000-2022 JetBrains s.r.o.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.jetbrains;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+
+public interface DesktopActions {
+
+    void setHandler(Handler handler);
+
+    interface Handler {
+        default void open(File file) throws IOException { throw new UnsupportedOperationException(); }
+        default void edit(File file) throws IOException { throw new UnsupportedOperationException(); }
+        default void print(File file) throws IOException { throw new UnsupportedOperationException(); }
+        default void mail(URI mailtoURL) throws IOException { throw new UnsupportedOperationException(); }
+        default void browse(URI uri) throws IOException { throw new UnsupportedOperationException(); }
+    }
+
+}

src/jetbrains.api/version.properties

@@ -6,9 +6,9 @@
 # 2. When only new API is added, or some existing API was @Deprecated - increment MINOR, reset PATCH to 0
 # 3. For major backwards incompatible API changes - increment MAJOR, reset MINOR and PATCH to 0
 
-VERSION = 0.0.6
+VERSION = 1.0.0
 
 # Hash is used to track changes to jetbrains.api, so you would not forget to update version when needed.
 # When you make any changes, "make jbr-api" will fail and ask you to update hash and version number here.
 
-HASH = 2E2A7E994CCF6D942FB9EB347C8EA4
+HASH = B85A399915766F5414E8CA8BA950F664

test/hotspot/jtreg/jbProblemList.txt

@@ -38,159 +38,26 @@
 #
 #############################################################################
 
-# :hotspot_compiler
+# jb_jdi
 
-compiler/ciReplay/TestSAServer.java 8029528 generic-all
-compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java 8225370 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
+vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021/TestDescription.java 8065773 generic-all
+vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses023/TestDescription.java 8065773 generic-all
 
-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
-
-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
+vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects002/referringObjects002.java
 
 #############################################################################
-
-# :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.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.*;
 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;
         }