Mercurial > hg > openjdk > jdk9 > jdk
changeset 14186:35225b837d66 jdk-9+115
8154159: rmic should not have a supported entry point
Reviewed-by: rriggs, chegar
| author | alanb |
|---|---|
| date | Mon, 18 Apr 2016 16:18:56 +0100 |
| parents | 9f0bccd2ef66 |
| children | 483242a6482b 96d7dc590098 |
| files | make/launcher/Launcher-jdk.rmic.gmk src/java.base/share/conf/security/java.security src/jdk.rmic/share/classes/jdk/rmi/rmic/Main.java src/jdk.rmic/share/classes/module-info.java test/java/lang/SecurityManager/RestrictedPackages.java |
| diffstat | 5 files changed, 1 insertions(+), 41 deletions(-) [+] |
line wrap: on
line diff
--- a/make/launcher/Launcher-jdk.rmic.gmk Mon Apr 18 07:30:17 2016 -0700 +++ b/make/launcher/Launcher-jdk.rmic.gmk Mon Apr 18 16:18:56 2016 +0100 @@ -26,6 +26,6 @@ include LauncherCommon.gmk $(eval $(call SetupBuildLauncher, rmic, \ - MAIN_CLASS := jdk.rmi.rmic.Main, \ + MAIN_CLASS := sun.rmi.rmic.Main, \ CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \ ))
--- a/src/java.base/share/conf/security/java.security Mon Apr 18 07:30:17 2016 -0700 +++ b/src/java.base/share/conf/security/java.security Mon Apr 18 16:18:56 2016 +0100 @@ -271,7 +271,6 @@ jdk.internal.,\ jdk.nashorn.internal.,\ jdk.nashorn.tools.,\ - jdk.rmi.rmic.,\ jdk.tools.jimage.,\ com.sun.activation.registries.,\ com.sun.java.accessibility.util.internal.,\ @@ -328,7 +327,6 @@ jdk.internal.,\ jdk.nashorn.internal.,\ jdk.nashorn.tools.,\ - jdk.rmi.rmic.,\ jdk.tools.jimage.,\ com.sun.activation.registries.,\ com.sun.java.accessibility.util.internal.,\
--- a/src/jdk.rmic/share/classes/jdk/rmi/rmic/Main.java Mon Apr 18 07:30:17 2016 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2015, 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. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * 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 jdk.rmi.rmic; - -/** - * The initial class for the rmic tool. - */ - -public class Main { - public static void main(String[] args) { - sun.rmi.rmic.Main.main(args); - } -}
--- a/src/jdk.rmic/share/classes/module-info.java Mon Apr 18 07:30:17 2016 -0700 +++ b/src/jdk.rmic/share/classes/module-info.java Mon Apr 18 16:18:56 2016 +0100 @@ -27,6 +27,5 @@ requires java.corba; requires jdk.compiler; requires jdk.javadoc; - exports jdk.rmi.rmic; }
--- a/test/java/lang/SecurityManager/RestrictedPackages.java Mon Apr 18 07:30:17 2016 -0700 +++ b/test/java/lang/SecurityManager/RestrictedPackages.java Mon Apr 18 16:18:56 2016 +0100 @@ -77,7 +77,6 @@ "jdk.internal.", "jdk.nashorn.internal.", "jdk.nashorn.tools.", - "jdk.rmi.rmic.", "jdk.tools.jimage.", "com.sun.activation.registries.", "com.sun.java.accessibility.util.internal."