# HG changeset patch
# User dsamersoff
# Date 1441046608 -10800
# Node ID 497c34cc0dc7808fbcb67cab49a341b3d6a29aae
# Parent  f7c5ae2933c0b8510a420d1713a955e4ffc7ad0b# Parent  0b0a6b9ed9915bd4dfb88d095e074b030f5f87b8
Merge

diff -r f7c5ae2933c0 -r 497c34cc0dc7 common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Thu Aug 27 13:21:37 2015 -0700
+++ b/common/autoconf/generated-configure.sh	Mon Aug 31 21:43:28 2015 +0300
@@ -841,7 +841,6 @@
 JDK_MAJOR_VERSION
 USER_RELEASE_SUFFIX
 COMPRESS_JARS
-RMICONNECTOR_IIOP
 UNLIMITED_CRYPTO
 CACERTS_FILE
 TEST_IN_BUILD
@@ -1060,7 +1059,6 @@
 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 @@
                           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 @@
 
 
 #
-# 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 @@
 #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
 
 ###############################################################################
 #
@@ -20100,22 +20095,6 @@
 
   ###############################################################################
   #
-  # --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
   #
   COMPRESS_JARS=false
diff -r f7c5ae2933c0 -r 497c34cc0dc7 common/autoconf/jdk-options.m4
--- a/common/autoconf/jdk-options.m4	Thu Aug 27 13:21:37 2015 -0700
+++ b/common/autoconf/jdk-options.m4	Mon Aug 31 21:43:28 2015 +0300
@@ -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
@@ -455,19 +455,6 @@
 
   ###############################################################################
   #
-  # --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
   #
   COMPRESS_JARS=false
diff -r f7c5ae2933c0 -r 497c34cc0dc7 common/autoconf/spec.gmk.in
--- a/common/autoconf/spec.gmk.in	Thu Aug 27 13:21:37 2015 -0700
+++ b/common/autoconf/spec.gmk.in	Mon Aug 31 21:43:28 2015 +0300
@@ -281,9 +281,6 @@
 # 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
diff -r f7c5ae2933c0 -r 497c34cc0dc7 make/CompileJavaModules.gmk
--- a/make/CompileJavaModules.gmk	Thu Aug 27 13:21:37 2015 -0700
+++ b/make/CompileJavaModules.gmk	Mon Aug 31 21:43:28 2015 +0300
@@ -275,13 +275,6 @@
     $(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.*'
 java.rmi_CLEAN_FILES := $(wildcard \