8310550: Adjust references to rt.jar

Reviewed-by: erikj, clanger

Author: MBaesken

make/modules/java.desktop/Java.gmk

@@ -141,8 +141,7 @@ endif
 # pick them up since they aren't generated when the source dirs are
 # searched and they aren't referenced by any other classes so they won't
 # be picked up by implicit compilation. On a rebuild, they are picked up
-# and compiled. Exclude them here to produce the same rt.jar as the old
-# build does when building just once.
+# and compiled.
 EXCLUDE_FILES += \
     javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
     javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \

src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/project.xml

@@ -39,7 +39,6 @@
             <properties>
                 <property-file>user.build.properties</property-file>
                 <property-file>build.properties</property-file>
-                <property name="nbjdk.bootclasspath">${nbjdk.home}/jre/lib/rt.jar</property>
             </properties>
             <folders>
                 <source-folder>

src/demo/share/nbproject/jfc/Notepad/nbproject/jdk.xml

@@ -42,7 +42,6 @@
         <property name="nbjdk.java" value="${nbjdk.home}/bin/java${.exe}"/>
         <property name="nbjdk.javadoc" value="${nbjdk.home}/bin/javadoc${.exe}"/>
         <property name="nbjdk.appletviewer" value="${nbjdk.home}/bin/appletviewer${.exe}"/>
-        <property name="nbjdk.bootclasspath" value="${nbjdk.home}/jre/lib/rt.jar"/>
     </target>
 
     <target name="-jdk-presetdef-basic" depends="-jdk-preinit" unless="nbjdk.presetdef.basic.done">

src/demo/share/nbproject/jfc/SampleTree/nbproject/project.xml

@@ -39,7 +39,6 @@
             <properties>
                 <property-file>user.build.properties</property-file>
                 <property-file>build.properties</property-file>
-                <property name="nbjdk.bootclasspath">${nbjdk.home}/jre/lib/rt.jar</property>
             </properties>
             <folders>
                 <source-folder>

src/demo/share/nbproject/jfc/TableExample/nbproject/project.xml

@@ -39,7 +39,6 @@
             <properties>
                 <property-file>user.build.properties</property-file>
                 <property-file>build.properties</property-file>
-                <property name="nbjdk.bootclasspath">${nbjdk.home}/jre/lib/rt.jar</property>
             </properties>
             <folders>
                 <source-folder>

src/java.sql/share/classes/java/sql/DriverManager.java

@@ -652,10 +652,9 @@ public Void run() {
     private static Connection getConnection(
         String url, java.util.Properties info, Class<?> caller) throws SQLException {
         /*
-         * When callerCl is null, we should check the application's
-         * (which is invoking this class indirectly)
-         * classloader, so that the JDBC driver class outside rt.jar
-         * can be loaded from here.
+         * If the caller is defined to the bootstrap or platform class loader then use
+         * the Thread CCL as the initiating class loader so that a JDBC on the class path,
+         * or bundled with an application, is found.
          */
         ClassLoader callerCL = caller != null ? caller.getClassLoader() : null;
         if (callerCL == null || callerCL == ClassLoader.getPlatformClassLoader()) {

src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java

@@ -193,7 +193,7 @@ private Path getPath(String first, String... more) {
     }
 
     /**
-     * Set whether or not to use ct.sym as an alternate to rt.jar.
+     * Set whether or not to use ct.sym as an alternate to the current runtime.
      */
     public void setSymbolFileEnabled(boolean b) {
         symbolFileEnabled = b;

test/hotspot/jtreg/compiler/c2/Test6603011.java

@@ -212,7 +212,6 @@ public static void main(String[] args) throws Exception {
     }
 
     // Try a few divisors outside the typical range.
-    // The values below have been observed in rt.jar.
     test_divisor(101, apploader);
     test_divisor(400, apploader);
     test_divisor(1000, apploader);

test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach024/TestDescription.java

@@ -37,7 +37,7 @@
  *     Test checks that agent's JAR file is appended at the end of the system class path.
  *     Agent's JAR file contains modified class java.util.TooManyListenersException (it is assumed
  *     that this class isn't loaded before agent is loaded), agent instantiates TooManyListenersException
- *     and checks that non-modified version of this class was loaded from rt.jar (not from agent's JAR).
+ *     and checks that non-modified version of this class was loaded from the jdk image (not from agent's JAR).
  *
  * @library /vmTestbase
  *          /test/lib

test/jdk/com/sun/tools/attach/ProviderTest.java

@@ -107,7 +107,7 @@ private static void buildJar() throws Throwable {
     public static class TestMain {
         public static void main(String args[]) throws Exception {
             // deal with internal builds where classes are loaded from the
-            // 'classes' directory rather than rt.jar
+            // 'classes' directory rather than the runtime image
             ClassLoader cl = AttachProvider.class.getClassLoader();
             if (cl != ClassLoader.getSystemClassLoader()) {
                 System.out.println("Attach API not loaded by system class loader - test skipped");

test/jdk/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java

@@ -228,8 +228,7 @@ static void test(Iterable<String> iterable) {
             throw new RuntimeException("Test failed for the following classes: " + failed);
         }
         if (!classFound && startIndex == 0 && index < maxIndex) {
-            // this is just to verify that we have indeed parsed rt.jar
-            // (or the java.base module)
+            // this is just to verify that we have indeed parsed the java.base module
             throw  new RuntimeException("Test failed: Class.class not found...");
         }
         if (classCount.get() == 0 && startIndex == 0) {

test/langtools/tools/javap/4798312/JavapShouldLoadClassesFromRTJarTest.java

@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 4798312
- * @summary In Windows, javap doesn't load classes from rt.jar
+ * @summary In Windows, javap doesn't load classes from the runtime image
  * @library /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.main