diff --git a/bin/unshuffle_list.txt b/bin/unshuffle_list.txt index 406b1387684..21945a93a71 100644 --- a/bin/unshuffle_list.txt +++ b/bin/unshuffle_list.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -88,7 +88,6 @@ src/jdk.naming.dns : jdk/src/jdk.naming.dns src/jdk.naming.rmi : jdk/src/jdk.naming.rmi src/jdk.net : jdk/src/jdk.net src/jdk.pack : jdk/src/jdk.pack -src/jdk.rmic : corba/src/jdk.rmic jdk/src/jdk.rmic src/jdk.scripting.nashorn : nashorn/src/jdk.scripting.nashorn src/jdk.scripting.nashorn.shell : nashorn/src/jdk.scripting.nashorn.shell src/jdk.sctp : jdk/src/jdk.sctp @@ -140,7 +139,6 @@ src/utils/src/build : jdk/make/non-build-utils/src/build make/BuildNashorn.gmk : nashorn/make/BuildNashorn.gmk make/CompileDemos.gmk : jdk/make/CompileDemos.gmk make/CompileInterimLangtools.gmk : langtools/make/CompileInterim.gmk -make/CompileInterimRmic.gmk : jdk/make/CompileInterimRmic.gmk make/CompileModuleTools.gmk : jdk/make/CompileModuleTools.gmk make/CompileToolsHotspot.gmk : hotspot/make/CompileTools.gmk make/CompileToolsJdk.gmk : jdk/make/CompileTools.gmk @@ -180,7 +178,6 @@ make/mapfiles/libjvm_dtrace : hotspot/make/mapfiles/libjvm_dtrace make/mapfiles/libsaproc : hotspot/make/mapfiles/libsaproc make/nashorn : nashorn/make make/nb_native : common/nb_native -make/rmic : jdk/make/rmic make/scripts/addNotices.sh : jdk/make/scripts/addNotices.sh make/scripts/compare.sh : common/bin/compare.sh make/scripts/compare_exceptions.sh.incl : common/bin/compare_exceptions.sh.incl diff --git a/doc/building.html b/doc/building.html index 2beff475885..36da52360f0 100644 --- a/doc/building.html +++ b/doc/building.html @@ -536,7 +536,7 @@ CC: Sun C++ 5.13 SunOS_i386 151846-10 2015/10/30
  • dist-clean - Remove all files, including configuration

    • Run make help to get an up-to-date list of important make targets and make control variables.

    -

    It is possible to build just a single module, a single phase, or a single phase of a single module, by creating make targets according to these followin patterns. A phase can be either of gensrc, gendata, copy, java, launchers, libs or rmic. See Using Fine-Grained Make Targets for more details about this functionality.

    +

    It is possible to build just a single module, a single phase, or a single phase of a single module, by creating make targets according to these followin patterns. A phase can be either of gensrc, gendata, copy, java, launchers, or libs. See Using Fine-Grained Make Targets for more details about this functionality.

    You can build only a single phase for a module by using the notation $MODULE-$PHASE. For instance, to build the gensrc phase for java.base, use make java.base-gensrc.

    Note that some phases may depend on others, e.g. java depends on gensrc (if present). Make will build all needed prerequisites before building the requested phase.

    diff --git a/doc/building.md b/doc/building.md index 50088f27996..041cb0fe5ea 100644 --- a/doc/building.md +++ b/doc/building.md @@ -818,7 +818,7 @@ control variables. It is possible to build just a single module, a single phase, or a single phase of a single module, by creating make targets according to these followin patterns. A phase can be either of `gensrc`, `gendata`, `copy`, `java`, -`launchers`, `libs` or `rmic`. See [Using Fine-Grained Make Targets]( +`launchers`, or `libs`. See [Using Fine-Grained Make Targets]( #using-fine-grained-make-targets) for more details about this functionality. * `` - Build the specified phase and everything it depends on @@ -1619,7 +1619,6 @@ and other artifact the module consists of. The phases are: * `java` (Compile Java code) * `launchers` (Compile native executables) * `libs` (Compile native libraries) - * `rmic` (Run the `rmic` tool) You can build only a single phase for a module by using the notation `$MODULE-$PHASE`. For instance, to build the `gensrc` phase for `java.base`, diff --git a/test/hotspot/jtreg/applications/ctw/modules/jdk_rmic.java b/test/hotspot/jtreg/applications/ctw/modules/jdk_rmic.java deleted file mode 100644 index 5f1f46cb509..00000000000 --- a/test/hotspot/jtreg/applications/ctw/modules/jdk_rmic.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. - * 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. - */ - -/* - * @test - * @summary run CTW for all classes from jdk.rmic module - * - * @library /test/lib / /testlibrary/ctw/src - * @modules java.base/jdk.internal.access - * java.base/jdk.internal.jimage - * java.base/jdk.internal.misc - * java.base/jdk.internal.reflect - * @modules jdk.rmic - * - * @build sun.hotspot.WhiteBox - * @run driver ClassFileInstaller sun.hotspot.WhiteBox - * sun.hotspot.WhiteBox$WhiteBoxPermission - * @run driver/timeout=7200 sun.hotspot.tools.ctw.CtwRunner modules:jdk.rmic - */ diff --git a/test/hotspot/jtreg/runtime/cds/appcds/ProtectionDomain.java b/test/hotspot/jtreg/runtime/cds/appcds/ProtectionDomain.java index 2f2982829a6..8a84a2f6226 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/ProtectionDomain.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/ProtectionDomain.java @@ -48,7 +48,6 @@ public class ProtectionDomain { "com/sun/tools/javac/Main", "jdk/nio/zipfs/ZipInfo", "java/net/URL", - "sun/rmi/rmic/Main", "com/sun/jndi/dns/DnsName")); // First class is loaded from CDS, second class is loaded from JAR diff --git a/test/hotspot/jtreg/runtime/cds/appcds/SharedPackages.java b/test/hotspot/jtreg/runtime/cds/appcds/SharedPackages.java index 748e8e9178e..5129229c701 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/SharedPackages.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/SharedPackages.java @@ -44,7 +44,6 @@ public class SharedPackages { "sun/tools/javac/Main", "jdk/nio/zipfs/ZipInfo", "java/net/URL", - "sun/rmi/rmic/Main", "com/sun/jndi/dns/DnsName")); OutputAnalyzer output; diff --git a/test/hotspot/jtreg/runtime/cds/appcds/test-classes/JimageClassPackage.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/JimageClassPackage.java index aedb07db0aa..c15ef7dff21 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/test-classes/JimageClassPackage.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/JimageClassPackage.java @@ -30,8 +30,7 @@ public class JimageClassPackage { // sun.tools.javac.Main (testcase 1), // jdk.nio.zipfs.ZipInfo (testcase 2), // java.net.URL (testcase 3), - // sun.rmi.rmic.Main (testcase 4), - // com.sun.jndi.dns.DnsName (testcase 5) + // com.sun.jndi.dns.DnsName (testcase 4) String testcases[][] = {{"Loading shared boot module class first", "java.util", "java.util.Dictionary", "java.util.ServiceConfigurationError"}, @@ -45,9 +44,6 @@ public class JimageClassPackage { {"Loading non-shared boot module class first", "java.net", "java.net.HttpCookie", "java.net.URL"}, - {"Loading non-shared app module class first", "sun.rmi.rmic", - "sun.rmi.rmic.RMIGenerator", "sun.rmi.rmic.Main"}, - {"Loading non-shared ext module class first", "com.sun.jndi.dns", "com.sun.jndi.dns.Resolver", "com.sun.jndi.dns.DnsName"}}; diff --git a/test/hotspot/jtreg/runtime/cds/appcds/test-classes/JimageClassProtDomain.java b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/JimageClassProtDomain.java index dc85daeba1c..f3f996370fa 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/test-classes/JimageClassProtDomain.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/JimageClassProtDomain.java @@ -30,7 +30,6 @@ public class JimageClassProtDomain { // sun.tools.javac.Main (testcase 1), // jdk.nio.zipfs.ZipInfo (testcase 2), // java.net.URL (testcase 3), - // sun.rmi.rmic.Main (testcase 4), // com.sun.jndi.dns.DnsName (testcase 5) String testcases[][] = {{"Loading shared boot module class first", diff --git a/test/langtools/jdk/javadoc/doclet/testModules/jdk/element-list b/test/langtools/jdk/javadoc/doclet/testModules/jdk/element-list index e64629f4959..e3c40a9e121 100644 --- a/test/langtools/jdk/javadoc/doclet/testModules/jdk/element-list +++ b/test/langtools/jdk/javadoc/doclet/testModules/jdk/element-list @@ -318,7 +318,6 @@ module:jdk.naming.rmi module:jdk.net jdk.net module:jdk.pack -module:jdk.rmic module:jdk.scripting.nashorn jdk.nashorn.api.scripting jdk.nashorn.api.tree diff --git a/test/langtools/jdk/javadoc/doclet/testRecordTypes/jdk11/element-list b/test/langtools/jdk/javadoc/doclet/testRecordTypes/jdk11/element-list index a58b007407f..65e05f809c2 100644 --- a/test/langtools/jdk/javadoc/doclet/testRecordTypes/jdk11/element-list +++ b/test/langtools/jdk/javadoc/doclet/testRecordTypes/jdk11/element-list @@ -261,7 +261,6 @@ module:jdk.net jdk.net jdk.nio module:jdk.pack -module:jdk.rmic module:jdk.scripting.nashorn jdk.nashorn.api.scripting jdk.nashorn.api.tree diff --git a/test/langtools/tools/jdeps/modules/InverseDeps.java b/test/langtools/tools/jdeps/modules/InverseDeps.java index 0327d6a248b..cdaf7eaf745 100644 --- a/test/langtools/tools/jdeps/modules/InverseDeps.java +++ b/test/langtools/tools/jdeps/modules/InverseDeps.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -92,18 +92,17 @@ public class InverseDeps { @DataProvider(name = "jdkModules") public Object[][] jdkModules() { return new Object[][]{ - // --require and a subset of dependences + // --require and a subset of dependencies { "jdk.compiler", new String[][] { new String[] {"jdk.compiler", "jdk.jshell"}, - new String[] {"jdk.compiler", "jdk.rmic"}, - new String[] {"jdk.compiler", "jdk.javadoc", "jdk.rmic"}, + new String[] {"jdk.compiler", "jdk.javadoc"}, } }, { "java.compiler", new String[][] { new String[] {"java.compiler", "jdk.jshell"}, new String[] {"java.compiler", "jdk.compiler", "jdk.jshell"}, - new String[] {"java.compiler", "jdk.compiler", "jdk.rmic"}, - new String[] {"java.compiler", "jdk.compiler", "jdk.javadoc", "jdk.rmic"}, + new String[] {"java.compiler", "jdk.compiler"}, + new String[] {"java.compiler", "jdk.compiler", "jdk.javadoc"}, new String[] {"java.compiler", "java.se"}, } },