diff --git a/make/modules/java.desktop/Java.gmk b/make/modules/java.desktop/Java.gmk index c9057c09c7f..3b43862dd80 100644 --- a/make/modules/java.desktop/Java.gmk +++ b/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 \ diff --git a/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/project.xml b/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/project.xml index f24531b0f93..085f0d213f5 100644 --- a/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/project.xml +++ b/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/project.xml @@ -39,7 +39,6 @@ user.build.properties build.properties - ${nbjdk.home}/jre/lib/rt.jar diff --git a/src/demo/share/nbproject/jfc/Notepad/nbproject/jdk.xml b/src/demo/share/nbproject/jfc/Notepad/nbproject/jdk.xml index 2b85b77e928..d06d6a8ec94 100644 --- a/src/demo/share/nbproject/jfc/Notepad/nbproject/jdk.xml +++ b/src/demo/share/nbproject/jfc/Notepad/nbproject/jdk.xml @@ -42,7 +42,6 @@ - diff --git a/src/demo/share/nbproject/jfc/SampleTree/nbproject/project.xml b/src/demo/share/nbproject/jfc/SampleTree/nbproject/project.xml index ff388720ac2..9297a4cc9dd 100644 --- a/src/demo/share/nbproject/jfc/SampleTree/nbproject/project.xml +++ b/src/demo/share/nbproject/jfc/SampleTree/nbproject/project.xml @@ -39,7 +39,6 @@ user.build.properties build.properties - ${nbjdk.home}/jre/lib/rt.jar diff --git a/src/demo/share/nbproject/jfc/TableExample/nbproject/project.xml b/src/demo/share/nbproject/jfc/TableExample/nbproject/project.xml index c8033eff909..9fc0be5d08e 100644 --- a/src/demo/share/nbproject/jfc/TableExample/nbproject/project.xml +++ b/src/demo/share/nbproject/jfc/TableExample/nbproject/project.xml @@ -39,7 +39,6 @@ user.build.properties build.properties - ${nbjdk.home}/jre/lib/rt.jar diff --git a/src/java.sql/share/classes/java/sql/DriverManager.java b/src/java.sql/share/classes/java/sql/DriverManager.java index 7b171b2e52c..93bc5972cff 100644 --- a/src/java.sql/share/classes/java/sql/DriverManager.java +++ b/src/java.sql/share/classes/java/sql/DriverManager.java @@ -652,10 +652,9 @@ public class DriverManager { 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()) { diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java index 44951ac83f6..e7ce967065b 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java @@ -193,7 +193,7 @@ public class JavacFileManager extends BaseFileManager implements StandardJavaFil } /** - * 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; diff --git a/test/hotspot/jtreg/compiler/c2/Test6603011.java b/test/hotspot/jtreg/compiler/c2/Test6603011.java index 796370b6641..d035eefcc51 100644 --- a/test/hotspot/jtreg/compiler/c2/Test6603011.java +++ b/test/hotspot/jtreg/compiler/c2/Test6603011.java @@ -212,7 +212,6 @@ public class Test6603011 implements Runnable { } // 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); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach024/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach024/TestDescription.java index 5763ace8595..348c909f2e0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach024/TestDescription.java +++ b/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 diff --git a/test/jdk/com/sun/tools/attach/ProviderTest.java b/test/jdk/com/sun/tools/attach/ProviderTest.java index 575420722d3..5359d4241db 100644 --- a/test/jdk/com/sun/tools/attach/ProviderTest.java +++ b/test/jdk/com/sun/tools/attach/ProviderTest.java @@ -107,7 +107,7 @@ public class ProviderTest { 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"); diff --git a/test/jdk/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java b/test/jdk/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java index 374e9c355b4..624b287b0bf 100644 --- a/test/jdk/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java +++ b/test/jdk/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java @@ -228,8 +228,7 @@ public class FieldSetAccessibleTest { 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) { diff --git a/test/langtools/tools/javap/4798312/JavapShouldLoadClassesFromRTJarTest.java b/test/langtools/tools/javap/4798312/JavapShouldLoadClassesFromRTJarTest.java index aba089df175..664bca040de 100644 --- a/test/langtools/tools/javap/4798312/JavapShouldLoadClassesFromRTJarTest.java +++ b/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