changeset 9254:c952b81ad038

8033366: Add configure option to allow RMIConnector IIOP transport be selected compiled in or not Reviewed-by: dfuchs
author alanb
date Thu, 06 Feb 2014 15:43:35 +0000
parents ee9f5bef88cc
children cc300f920f7f
files make/CompileJavaClasses.gmk make/GenerateClasses.gmk
diffstat 2 files changed, 13 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/make/CompileJavaClasses.gmk	Thu Feb 06 14:45:12 2014 +0000
+++ b/make/CompileJavaClasses.gmk	Thu Feb 06 15:43:35 2014 +0000
@@ -44,6 +44,10 @@
     com/sun/tools/example/debug/event \
     com/sun/tools/example/debug/gui
 
+ifeq ($(RMICONNECTOR_IIOP), false)
+  EXCLUDES += com/sun/jmx/remote/protocol/iiop
+endif
+
 ifdef OPENJDK
   EXCLUDES += sun/dc \
       com/sun/jmx/snmp \
--- a/make/GenerateClasses.gmk	Thu Feb 06 14:45:12 2014 +0000
+++ b/make/GenerateClasses.gmk	Thu Feb 06 15:43:35 2014 +0000
@@ -89,21 +89,25 @@
 # For RMI/IIOP call rmic a second time with -standardPackage option
 # so that *_tie classes are generated in package without the prefix
 # org.omg.stub (6375696)
-JMAN_RMI_CLASSES := javax.management.remote.rmi.RMIConnectionImpl \
+JMX_RMI_CLASSES := javax.management.remote.rmi.RMIConnectionImpl \
     javax.management.remote.rmi.RMIServerImpl
+GENRMIIIOPCLASSES :=
+ifneq ($(RMICONNECTOR_IIOP), false)
+  GENRMIIIOPCLASSES := $(RMICONNECTOR_IIOP)
+endif
 $(eval $(call SetupRMICompilation,RMI_IIOP, \
-    CLASSES := $(JMAN_RMI_CLASSES), \
+    CLASSES := $(JMX_RMI_CLASSES), \
     CLASSES_DIR := $(CLASSES_DIR), \
     STUB_CLASSES_DIR := $(STUB_CLASSES_DIR), \
     RUN_V12 := true, \
-    RUN_IIOP := true, \
-    RUN_IIOP_STDPKG := true))
+    RUN_IIOP := $(GENRMIIIOPCLASSES), \
+    RUN_IIOP_STDPKG := $(GENRMIIIOPCLASSES)))
 GENCLASSES += $(RMI_IIOP)
 
 # Keep generated RMI/JRMP Stub source files and copy them to RMIC_GENSRC_DIR
 # so that javadoc can include them in the API (4997471)
 $(eval $(call SetupRMICompilation,RMI_SRC, \
-    CLASSES := $(JMAN_RMI_CLASSES), \
+    CLASSES := $(JMX_RMI_CLASSES), \
     CLASSES_DIR := $(CLASSES_DIR), \
     STUB_CLASSES_DIR := $(RMIC_GENSRC_DIR), \
     RUN_V12 := true, \