jdk/make/common/Release.gmk

@@ -360,14 +360,15 @@
         com/sun/tools/javah     \
         com/sun/tools/javap     \
         com/sun/tools/corba     \
         com/sun/tools/internal/xjc       \
         com/sun/tools/internal/ws       \
-        META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory \
-        META-INF/services/com.sun.tools.xjc.Plugin \
+        META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \
+        META-INF/services/com.sun.tools.internal.xjc.Plugin \
         com/sun/istack/internal/tools       \
-        com/sun/istack/internal/ws       \
+    com/sun/tools/internal/jxc/ap   \
+    com/sun/tools/internal/ws/wscompile/plugin/at_generated \
         com/sun/codemodel       \
         com/sun/tools/internal/jxc             \
         com/sun/xml/internal/rngom       \
         com/sun/xml/internal/xsom       \
         org/relaxng/datatype   \

@@ -526,14 +527,12 @@
         $(ECHO) "com/sun/jdi/" >> $@
         $(ECHO) "com/sun/jarsigner/" >> $@
         $(ECHO) "com/sun/mirror/" >> $@
         $(ECHO) "com/sun/source/" >> $@
         $(ECHO) "com/sun/istack/internal/tools/" >> $@
-        $(ECHO) "com/sun/istack/internal/ws/" >> $@
         $(ECHO) "META-INF/services/com.sun.jdi.connect.Connector" >> $@
         $(ECHO) "META-INF/services/com.sun.jdi.connect.spi.TransportService" >> $@
-        $(ECHO) "META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory" >> $@
         $(ECHO) "META-INF/services/com.sun.tools.xjc.Plugin" >> $@
         $(ECHO) "com/sun/tools/" >> $@
         $(ECHO) "sun/jvmstat/" >> $@
         $(ECHO) "sun/nio/cs/ext/" >> $@
         $(ECHO) "sun/awt/HKSCS.class" >> $@

@@ -998,11 +997,11 @@
             ($(CD) $(JDK_IMAGE_DIR) && $(TAR) xf -)
   endif # PLATFORM
         @#
         @# files that might not exist need to be touched.
         @#
-        $(TOUCH) $(CLASSBINDIR)/META-INF/services/com.sun.tools.xjc.Plugin
+        $(TOUCH) $(CLASSBINDIR)/META-INF/services/com.sun.tools.internal.xjc.Plugin
         @#
         @# lib/tools.jar
         @#
         $(CD) $(CLASSBINDIR) && \
             $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS_NOMANIFEST) $(ABS_LIBDIR)/tools.jar \