make/common/Release.gmk

@@ -130,11 +130,10 @@
 endif
 
 JDK_MAN_PAGES =            \
         $(JRE_MAN_PAGES)   \
         appletviewer.1     \
-        apt.1              \
         extcheck.1         \
         idlj.1             \
         jar.1              \
         jarsigner.1        \
         javac.1            \

@@ -262,11 +261,10 @@
         com/sun/image/codec/jpeg        \
         com/sun/imageio                 \
         com/sun/java/swing              \
         com/sun/javadoc                 \
         com/sun/jmx                     \
-        com/sun/mirror                  \
         com/sun/source                  \
         com/sun/naming                  \
         com/sun/security/auth           \
         com/sun/security/jgss           \
         javax/accessibility             \

@@ -344,30 +342,29 @@
         sun/applet              \
         sun/jvmstat             \
         com/sun/javadoc         \
         com/sun/jdi             \
         com/sun/jarsigner       \
-        com/sun/mirror          \
         com/sun/source          \
         com/sun/tools/classfile \
         com/sun/tools/doclets   \
         com/sun/tools/example/debug/expr \
         com/sun/tools/example/debug/tty  \
         com/sun/tools/extcheck  \
         com/sun/tools/hat       \
         com/sun/tools/javac     \
         com/sun/tools/javadoc   \
-        com/sun/tools/apt       \
         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   \

@@ -431,11 +428,10 @@
         jar$(EXE_SUFFIX) \
         jarsigner$(EXE_SUFFIX) \
         java-rmi.cgi \
         javac$(EXE_SUFFIX) \
         javadoc$(EXE_SUFFIX) \
-        apt$(EXE_SUFFIX) \
         javah$(EXE_SUFFIX) \
         javap$(EXE_SUFFIX) \
         jcmd$(EXE_SUFFIX) \
         jdb$(EXE_SUFFIX) \
         jps$(EXE_SUFFIX) \

@@ -518,17 +514,14 @@
         $(ECHO) "# List of subdirectories not in include in rt.jar" >> $@
         $(ECHO) "# Directories must contain trailing '/'." >> $@
         $(ECHO) "com/sun/javadoc/" >> $@
         $(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" >> $@

@@ -959,11 +952,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 \