8310550: Adjust references to rt.jar
Reviewed-by: erikj, clanger
This commit is contained in:
Matthias Baesken
parent
848abd2831
commit
25cbe85d6f
@ -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 \
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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">
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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()) {
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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");
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user