8043937: Drop support for the IIOP transport from the JMX RMIConnector

Reviewed-by: alanb, erikj
This commit is contained in:
Jaroslav Bachorik 2015-08-21 13:34:07 +02:00
parent 07bcb7c6bf
commit 2fdcbf527f
4 changed files with 3 additions and 47 deletions

View File

@ -841,7 +841,6 @@ JDK_MINOR_VERSION
JDK_MAJOR_VERSION
USER_RELEASE_SUFFIX
COMPRESS_JARS
RMICONNECTOR_IIOP
UNLIMITED_CRYPTO
CACERTS_FILE
TEST_IN_BUILD
@ -1060,7 +1059,6 @@ enable_headful
enable_hotspot_test_in_build
with_cacerts_file
enable_unlimited_crypto
enable_rmiconnector_iiop
with_milestone
with_update_version
with_user_release_suffix
@ -1848,9 +1846,6 @@ Optional Features:
run the Queens test after Hotspot build [disabled]
--enable-unlimited-crypto
Enable unlimited crypto policy [disabled]
--enable-rmiconnector-iiop
enable the JMX RMIConnector iiop transport
[disabled]
--disable-warnings-as-errors
do not consider native warnings to be an error
[enabled]
@ -3951,7 +3946,7 @@ pkgadd_help() {
#
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 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
@ -4364,7 +4359,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1435822080
DATE_WHEN_GENERATED=1439979411
###############################################################################
#
@ -20098,22 +20093,6 @@ fi
#
###############################################################################
#
# --enable-rmiconnector-iiop
#
# Check whether --enable-rmiconnector-iiop was given.
if test "${enable_rmiconnector_iiop+set}" = set; then :
enableval=$enable_rmiconnector_iiop;
fi
if test "x$enable_rmiconnector_iiop" = "xyes"; then
RMICONNECTOR_IIOP=true
else
RMICONNECTOR_IIOP=false
fi
###############################################################################
#
# Compress jars

View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 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
@ -453,19 +453,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
AC_SUBST(ENABLE_INTREE_EC)
])
###############################################################################
#
# --enable-rmiconnector-iiop
#
AC_ARG_ENABLE(rmiconnector-iiop, [AS_HELP_STRING([--enable-rmiconnector-iiop],
[enable the JMX RMIConnector iiop transport @<:@disabled@:>@])])
if test "x$enable_rmiconnector_iiop" = "xyes"; then
RMICONNECTOR_IIOP=true
else
RMICONNECTOR_IIOP=false
fi
AC_SUBST(RMICONNECTOR_IIOP)
###############################################################################
#
# Compress jars

View File

@ -281,9 +281,6 @@ CACERTS_FILE=@CACERTS_FILE@
# Enable unlimited crypto policy
UNLIMITED_CRYPTO=@UNLIMITED_CRYPTO@
# Enable RMIConnector IIOP transport
RMICONNECTOR_IIOP=@RMICONNECTOR_IIOP@
GCOV_ENABLED=@GCOV_ENABLED@
# Necessary additional compiler flags to compile X11

View File

@ -274,13 +274,6 @@ java.sql.rowset_CLEAN_FILES := $(wildcard \
$(JDK_TOPDIR)/src/java.sql.rowset/share/classes/com/sun/rowset/*.properties \
$(JDK_TOPDIR)/src/java.sql.rowset/share/classes/javax/sql/rowset/*.properties)
################################################################################
# Exclude building of IIOP transport for RMI Connector
ifeq ($(RMICONNECTOR_IIOP), false)
java.management_EXCLUDES += com/sun/jmx/remote/protocol/iiop
endif
################################################################################
java.rmi_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'