# HG changeset patch
# User mchung
# Date 1276551840 25200
# Node ID 246b84dc50d954eb917270324a0450c713b4c810
# Parent  a0af7b8e80ede53c962fb601702753f0749f4e79
6960789: com.sun.servicetag API needs to be added in ct.sym
Summary: Include com.sun.servicetag classes when generating ct.sym
Reviewed-by: alanb, jjg

diff -r a0af7b8e80ed -r 246b84dc50d9 jdk/make/common/Release.gmk
--- a/jdk/make/common/Release.gmk	Sun Jun 13 17:19:22 2010 -0700
+++ b/jdk/make/common/Release.gmk	Mon Jun 14 14:44:00 2010 -0700
@@ -55,6 +55,13 @@
 # This is a stopgap until 6839872 is fixed.
 EXCLUDE_PROPWARN_PKGS += sun.dyn
 
+#
+# Include the exported private packages in ct.sym.
+# This is an interim solution until the ct.sym is replaced
+# with a new module system (being discussed for JDK 7).
+#
+EXPORTED_PRIVATE_PKGS = com.sun.servicetag
+
 # 64-bit solaris has a few special cases. We define the variable
 # SOLARIS64 for use in this Makefile to easily test those cases
 ifeq ($(PLATFORM), solaris)
@@ -981,7 +988,7 @@
 	    -processor com.sun.tools.javac.sym.CreateSymbols \
 	    -Acom.sun.tools.javac.sym.Jar=$(RT_JAR) \
 	    -Acom.sun.tools.javac.sym.Dest=$(OUTPUTDIR)/symbols/META-INF/sym/rt.jar \
-	    $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS)
+	    $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) $(EXPORTED_PRIVATE_PKGS)
 	$(BOOT_JAR_CMD) c0f $(LIBDIR)/ct.sym \
 	    -C $(OUTPUTDIR)/symbols META-INF $(BOOT_JAR_JFLAGS)
 	@$(java-vm-cleanup)
diff -r a0af7b8e80ed -r 246b84dc50d9 jdk/test/ProblemList.txt
--- a/jdk/test/ProblemList.txt	Sun Jun 13 17:19:22 2010 -0700
+++ b/jdk/test/ProblemList.txt	Mon Jun 14 14:44:00 2010 -0700
@@ -1181,21 +1181,6 @@
 # Server name error, port 2098 problem?
 sun/tools/jstatd/jstatdServerName.sh				generic-all
 
-# These tests fail on solaris sparc, all the time
-com/sun/servicetag/DeleteServiceTag.java			generic-all
-com/sun/servicetag/DuplicateNotFound.java			generic-all
-com/sun/servicetag/FindServiceTags.java				generic-all
-com/sun/servicetag/InstanceUrnCheck.java			generic-all
-com/sun/servicetag/InvalidRegistrationData.java			generic-all
-com/sun/servicetag/InvalidServiceTag.java			generic-all
-com/sun/servicetag/JavaServiceTagTest.java			generic-all
-com/sun/servicetag/JavaServiceTagTest1.java			generic-all
-com/sun/servicetag/NewRegistrationData.java			generic-all
-com/sun/servicetag/SystemRegistryTest.java			generic-all
-com/sun/servicetag/TestLoadFromXML.java				generic-all
-com/sun/servicetag/UpdateServiceTagTest.java			generic-all
-com/sun/servicetag/ValidRegistrationData.java			generic-all
-
 # Problems on windows, jmap.exe hangs?
 com/sun/tools/attach/BasicTests.sh				windows-all