changeset 8064:5e383a73386a

8007703: Remove com.sun.servicetag API Reviewed-by: dholmes, alanb, erikj
author mchung
date Mon, 25 Mar 2013 17:19:16 -0700
parents 5d0c891264bf
children 335d2156222e
files make/com/sun/Makefile make/common/Release.gmk makefiles/CopyFiles.gmk makefiles/CopyIntoClasses.gmk makefiles/CreateJars.gmk makefiles/GensrcProperties.gmk makefiles/profile-includes.txt makefiles/profile-rtjar-includes.txt test/Makefile
diffstat 9 files changed, 3 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/make/com/sun/Makefile	Mon Mar 25 14:29:13 2013 +0000
+++ b/make/com/sun/Makefile	Mon Mar 25 17:19:16 2013 -0700
@@ -45,7 +45,7 @@
 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
 
--- a/make/common/Release.gmk	Mon Mar 25 14:29:13 2013 +0000
+++ b/make/common/Release.gmk	Mon Mar 25 17:19:16 2013 -0700
@@ -59,8 +59,7 @@
 # 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
--- a/makefiles/CopyFiles.gmk	Mon Mar 25 14:29:13 2013 +0000
+++ b/makefiles/CopyFiles.gmk	Mon Mar 25 17:19:16 2013 -0700
@@ -81,17 +81,6 @@
 ##########################################################################################
 
 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
--- a/makefiles/CopyIntoClasses.gmk	Mon Mar 25 14:29:13 2013 +0000
+++ b/makefiles/CopyIntoClasses.gmk	Mon Mar 25 17:19:16 2013 -0700
@@ -59,15 +59,6 @@
 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 += \
--- a/makefiles/CreateJars.gmk	Mon Mar 25 14:29:13 2013 +0000
+++ b/makefiles/CreateJars.gmk	Mon Mar 25 17:19:16 2013 -0700
@@ -866,8 +866,7 @@
 # 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
--- a/makefiles/GensrcProperties.gmk	Mon Mar 25 14:29:13 2013 +0000
+++ b/makefiles/GensrcProperties.gmk	Mon Mar 25 17:19:16 2013 -0700
@@ -194,7 +194,6 @@
 	$(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,\
--- a/makefiles/profile-includes.txt	Mon Mar 25 14:29:13 2013 +0000
+++ b/makefiles/profile-includes.txt	Mon Mar 25 17:19:16 2013 -0700
@@ -222,7 +222,6 @@
     oblique-fonts/fonts.dir \
     psfont.properties.ja \
     psfontj2d.properties \
-    servicetag/jdk_header.png \
     sound.properties
 
 FULL_JRE_OTHER_FILES := \
--- a/makefiles/profile-rtjar-includes.txt	Mon Mar 25 14:29:13 2013 +0000
+++ b/makefiles/profile-rtjar-includes.txt	Mon Mar 25 17:19:16 2013 -0700
@@ -186,7 +186,6 @@
     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 \
--- a/test/Makefile	Mon Mar 25 14:29:13 2013 +0000
+++ b/test/Makefile	Mon Mar 25 17:19:16 2013 -0700
@@ -518,7 +518,6 @@
 	  jdk/asm \
 	  com/sun/org/apache/xerces \
           com/sun/corba \
-	  com/sun/servicetag \
 	  com/sun/tracing \
 	  sun/usagetracker)
 	$(call RunAgentvmBatch)