8007703: Remove com.sun.servicetag API
Reviewed-by: dholmes, alanb, erikj
This commit is contained in:
parent
c3647bf3a6
commit
d414a7e832
@ -45,7 +45,7 @@ SUBDIRS_management = jmx
|
||||
SUBDIRS_desktop = image
|
||||
SUBDIRS_enterprise = crypto/provider jndi \
|
||||
org rowset net/httpserver
|
||||
SUBDIRS_misc = $(SCRIPT_SUBDIR) tracing servicetag nio demo
|
||||
SUBDIRS_misc = $(SCRIPT_SUBDIR) tracing nio demo
|
||||
|
||||
SUBDIRS_tools = tools
|
||||
|
||||
|
@ -59,8 +59,7 @@ EXCLUDE_PROPWARN_PKGS = com.sun.java.swing.plaf.windows \
|
||||
# This is an interim solution until the ct.sym is replaced
|
||||
# with a new module system (being discussed for JDK 8).
|
||||
#
|
||||
EXPORTED_PRIVATE_PKGS = com.sun.servicetag \
|
||||
com.oracle.net \
|
||||
EXPORTED_PRIVATE_PKGS = com.oracle.net \
|
||||
com.oracle.nio
|
||||
|
||||
# 64-bit solaris has a few special cases. We define the variable
|
||||
|
@ -81,17 +81,6 @@ endif
|
||||
##########################################################################################
|
||||
|
||||
LIBDIR = $(JDK_OUTPUTDIR)/lib
|
||||
SERVICETAG_LIBDIR = $(LIBDIR)/servicetag
|
||||
|
||||
$(SERVICETAG_LIBDIR)/jdk_header.png: $(JDK_TOPDIR)/src/share/classes/com/sun/servicetag/resources/jdk_header.png
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
$(CHMOD) 444 $@
|
||||
|
||||
COPY_FILES += $(SERVICETAG_LIBDIR)/jdk_header.png
|
||||
|
||||
##########################################################################################
|
||||
|
||||
MGMT_LIBDIR = $(LIBDIR)/management
|
||||
MGMT_LIB_SRC = $(JDK_TOPDIR)/src/share/lib/management
|
||||
|
@ -59,15 +59,6 @@ COPY_FILES += \
|
||||
COPY_FILES += \
|
||||
$(JDK_TOPDIR)/src/share/classes/sun/jvmstat/perfdata/resources/aliasmap
|
||||
|
||||
# Servicetag resources
|
||||
SERVICETAG_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/com/sun/servicetag/resources
|
||||
COPY_FILES += \
|
||||
$(SERVICETAG_RESOURCES_DIR)/product_registration.xsd \
|
||||
$(SERVICETAG_RESOURCES_DIR)/register.html \
|
||||
$(SERVICETAG_RESOURCES_DIR)/register_ja.html \
|
||||
$(SERVICETAG_RESOURCES_DIR)/register_zh_CN.html \
|
||||
$(wildcard $(SERVICETAG_RESOURCES_DIR)/javase_*.properties)
|
||||
|
||||
# JConsole resources
|
||||
JCONSOLE_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/resources
|
||||
COPY_FILES += \
|
||||
|
@ -866,8 +866,7 @@ EXCLUDE_PROPWARN_PKGS = com.sun.java.swing.plaf.windows \
|
||||
# This is an interim solution until the ct.sym is replaced
|
||||
# with a new module system (being discussed for JDK 8).
|
||||
#
|
||||
EXPORTED_PRIVATE_PKGS = com.sun.servicetag \
|
||||
com.oracle.net \
|
||||
EXPORTED_PRIVATE_PKGS = com.oracle.net \
|
||||
com.oracle.nio
|
||||
|
||||
$(IMAGES_OUTPUTDIR)/symbols/_the.symbols: $(IMAGES_OUTPUTDIR)/lib/rt.jar
|
||||
|
@ -194,7 +194,6 @@ $(eval $(call add_properties_to_clean,COM_SUN_ROWSET_HK,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/rowset)),\
|
||||
%zh_TW,%zh_HK))
|
||||
|
||||
#com/sun/servicetag/resources
|
||||
#com/sun/swing/internal/plaf/basic/resources
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_BASIC,\
|
||||
$(filter %.properties,\
|
||||
|
@ -222,7 +222,6 @@ FULL_JRE_LIB_FILES := \
|
||||
oblique-fonts/fonts.dir \
|
||||
psfont.properties.ja \
|
||||
psfontj2d.properties \
|
||||
servicetag/jdk_header.png \
|
||||
sound.properties
|
||||
|
||||
FULL_JRE_OTHER_FILES := \
|
||||
|
@ -186,7 +186,6 @@ FULL_JRE_RTJAR_INCLUDE_PACKAGES := \
|
||||
com/sun/media/sound \
|
||||
com/sun/org/glassfish \
|
||||
com/sun/org/omg \
|
||||
com/sun/servicetag \
|
||||
com/sun/swing \
|
||||
com/sun/xml/internal/bind \
|
||||
com/sun/xml/internal/fastinfoset \
|
||||
|
@ -518,7 +518,6 @@ jdk_other: $(call TestDirs, \
|
||||
jdk/asm \
|
||||
com/sun/org/apache/xerces \
|
||||
com/sun/corba \
|
||||
com/sun/servicetag \
|
||||
com/sun/tracing \
|
||||
sun/usagetracker)
|
||||
$(call RunAgentvmBatch)
|
||||
|
Loading…
Reference in New Issue
Block a user