stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8007703: Remove com.sun.servicetag API

Browse Source 
Reviewed-by: dholmes, alanb, erikj
This commit is contained in:
Mandy Chung 2013-03-25 17:19:16 -07:00
parent c3647bf3a6
commit d414a7e832
9 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/make/com/sun/Makefile
View File

@ -45,7 +45,7 @@ SUBDIRS_management = jmx
SUBDIRS_desktop = image SUBDIRS_desktop = image
SUBDIRS_enterprise = crypto/provider jndi \ SUBDIRS_enterprise = crypto/provider jndi \
org rowset net/httpserver org rowset net/httpserver
SUBDIRS_misc = $(SCRIPT_SUBDIR) tracing servicetag nio demo SUBDIRS_misc = $(SCRIPT_SUBDIR) tracing nio demo
SUBDIRS_tools = tools SUBDIRS_tools = tools

3
jdk/make/common/Release.gmk
View File

@ -59,8 +59,7 @@ EXCLUDE_PROPWARN_PKGS = com.sun.java.swing.plaf.windows \
# This is an interim solution until the ct.sym is replaced # This is an interim solution until the ct.sym is replaced
# with a new module system (being discussed for JDK 8). # with a new module system (being discussed for JDK 8).
# #
EXPORTED_PRIVATE_PKGS = com.sun.servicetag \ EXPORTED_PRIVATE_PKGS = com.oracle.net \
com.oracle.net \
com.oracle.nio com.oracle.nio
# 64-bit solaris has a few special cases. We define the variable # 64-bit solaris has a few special cases. We define the variable

11
jdk/makefiles/CopyFiles.gmk
View File

@ -81,17 +81,6 @@ endif
########################################################################################## ##########################################################################################
LIBDIR = $(JDK_OUTPUTDIR)/lib 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_LIBDIR = $(LIBDIR)/management
MGMT_LIB_SRC = $(JDK_TOPDIR)/src/share/lib/management MGMT_LIB_SRC = $(JDK_TOPDIR)/src/share/lib/management

9
jdk/makefiles/CopyIntoClasses.gmk
View File

@ -59,15 +59,6 @@ COPY_FILES += \
COPY_FILES += \ COPY_FILES += \
$(JDK_TOPDIR)/src/share/classes/sun/jvmstat/perfdata/resources/aliasmap $(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
JCONSOLE_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/resources JCONSOLE_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/resources
COPY_FILES += \ COPY_FILES += \

3
jdk/makefiles/CreateJars.gmk
View File

@ -866,8 +866,7 @@ EXCLUDE_PROPWARN_PKGS = com.sun.java.swing.plaf.windows \
# This is an interim solution until the ct.sym is replaced # This is an interim solution until the ct.sym is replaced
# with a new module system (being discussed for JDK 8). # with a new module system (being discussed for JDK 8).
# #
EXPORTED_PRIVATE_PKGS = com.sun.servicetag \ EXPORTED_PRIVATE_PKGS = com.oracle.net \
com.oracle.net \
com.oracle.nio com.oracle.nio
$(IMAGES_OUTPUTDIR)/symbols/_the.symbols: $(IMAGES_OUTPUTDIR)/lib/rt.jar $(IMAGES_OUTPUTDIR)/symbols/_the.symbols: $(IMAGES_OUTPUTDIR)/lib/rt.jar

1
jdk/makefiles/GensrcProperties.gmk
View File

@ -194,7 +194,6 @@ $(eval $(call add_properties_to_clean,COM_SUN_ROWSET_HK,\
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/rowset)),\ $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/rowset)),\
%zh_TW,%zh_HK)) %zh_TW,%zh_HK))
#com/sun/servicetag/resources
#com/sun/swing/internal/plaf/basic/resources #com/sun/swing/internal/plaf/basic/resources
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_BASIC,\ $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_BASIC,\
$(filter %.properties,\ $(filter %.properties,\

1
jdk/makefiles/profile-includes.txt
View File

@ -222,7 +222,6 @@ FULL_JRE_LIB_FILES := \
oblique-fonts/fonts.dir \ oblique-fonts/fonts.dir \
psfont.properties.ja \ psfont.properties.ja \
psfontj2d.properties \ psfontj2d.properties \
servicetag/jdk_header.png \
sound.properties sound.properties
FULL_JRE_OTHER_FILES := \ FULL_JRE_OTHER_FILES := \

1
jdk/makefiles/profile-rtjar-includes.txt
View File

@ -186,7 +186,6 @@ FULL_JRE_RTJAR_INCLUDE_PACKAGES := \
com/sun/media/sound \ com/sun/media/sound \
com/sun/org/glassfish \ com/sun/org/glassfish \
com/sun/org/omg \ com/sun/org/omg \
com/sun/servicetag \
com/sun/swing \ com/sun/swing \
com/sun/xml/internal/bind \ com/sun/xml/internal/bind \
com/sun/xml/internal/fastinfoset \ com/sun/xml/internal/fastinfoset \

1
jdk/test/Makefile
View File

@ -518,7 +518,6 @@ jdk_other: $(call TestDirs, \
jdk/asm \ jdk/asm \
com/sun/org/apache/xerces \ com/sun/org/apache/xerces \
com/sun/corba \ com/sun/corba \
com/sun/servicetag \
com/sun/tracing \ com/sun/tracing \
sun/usagetracker) sun/usagetracker)
$(call RunAgentvmBatch) $(call RunAgentvmBatch)