--- old/jaxws/build-defs.xml	Mon Jan 30 15:01:41 2012
+++ new/jaxws/build-defs.xml	Mon Jan 30 15:01:41 2012
@@ -101,7 +101,7 @@
         <copy todir="${build.classes.dir}/META-INF"
               file="${secondary.src.dir}/META-INF/mimetypes.default"/>
         <copy todir="${build.classes.dir}/META-INF/services"
-              file="${primary.src.dir}/com/sun/tools/etc/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory"/>
+              file="${primary.src.dir}/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin"/>
         <copy todir="${build.classes.dir}/META-INF/services"
               file="${primary.src.dir}/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin"/>
         <mkdir dir="${build.classes.dir}/com/sun/tools/internal/xjc/runtime"/>
--- old/jaxws/jaxws.properties	Mon Jan 30 15:01:42 2012
+++ new/jaxws/jaxws.properties	Mon Jan 30 15:01:42 2012
@@ -25,8 +25,8 @@
 
 drops.master.copy.base=${drops.dir}
 
-jaxws_src.bundle.name=jdk8-jaxws2_2_4-b01-2011_07_22.zip
-jaxws_src.bundle.md5.checksum=f64bedd3c512e6b1ca265fda2feb0905
+jaxws_src.bundle.name=jdk8-jaxws-2_2-SNAPSHOT-2012_01_11.zip
+jaxws_src.bundle.md5.checksum=90aa4ed0818f19561f32b81e2ae02dc8
 jaxws_src.master.bundle.dir=${drops.master.copy.base}
 jaxws_src.master.bundle.url.base=http://download.java.net/glassfish/components/jax-ws/openjdk/jdk8
 
--- old/jdk/make/common/Release.gmk	Mon Jan 30 15:01:44 2012
+++ new/jdk/make/common/Release.gmk	Mon Jan 30 15:01:43 2012
@@ -362,10 +362,11 @@
 	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       \
@@ -528,10 +529,8 @@
 	$(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/" >> $@
@@ -1000,7 +999,7 @@
 	@#
 	@# 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
 	@#
--- old/jdk/make/common/internal/Defs-jaxws.gmk	Mon Jan 30 15:01:46 2012
+++ new/jdk/make/common/internal/Defs-jaxws.gmk	Mon Jan 30 15:01:46 2012
@@ -34,7 +34,6 @@
      javax/xml/ws \
      javax/jws \
      javax/annotation \
-     com/sun/istack/internal \
      com/sun/xml/internal/bind \
      com/sun/xml/internal/fastinfoset \
      com/sun/xml/internal/messaging \
@@ -42,6 +41,7 @@
      com/sun/xml/internal/txw2 \
      com/sun/xml/internal/ws \
      com/sun/xml/internal/stream/buffer
+
 NOT_USED_PACKAGES += \
      com/sun/tools/internal/txw2
 
@@ -48,7 +48,6 @@
 IMPORT_TOOLS_PACKAGES += \
      com/sun/codemodel \
      com/sun/istack/internal/tools \
-     com/sun/istack/internal/ws \
      com/sun/xml/internal/rngom \
      com/sun/xml/internal/xsom \
      com/sun/xml/internal/dtdparser \
@@ -56,6 +55,9 @@
      com/sun/tools/internal/ws \
      com/sun/tools/internal/jxc \
      org/relaxng \
-     META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory \
-     META-INF/services/com.sun.tools.internal.xjc.Plugin
+	 META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \
+	 META-INF/services/com.sun.tools.internal.xjc.Plugin \
+     com/sun/tools/internal/jxc/ap \
+     com/sun/tools/internal/ws/wscompile/plugin/at_generated
+