Merge
authorlana
Sat, 18 Feb 2012 16:09:11 -0800
changeset 11861 0b1b48f6f78d
parent 11857 fb2fa6f6c9df (current diff)
parent 11860 e50af542fdbe (diff)
child 11862 7465a700d481
Merge
--- a/jaxws/build-defs.xml	Thu Feb 16 13:01:33 2012 -0800
+++ b/jaxws/build-defs.xml	Sat Feb 18 16:09:11 2012 -0800
@@ -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"/>
--- a/jaxws/jaxws.properties	Thu Feb 16 13:01:33 2012 -0800
+++ b/jaxws/jaxws.properties	Sat Feb 18 16:09:11 2012 -0800
@@ -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-patched.zip
+jaxws_src.bundle.md5.checksum=005b93d1a2d6e66438c3c84c49c10b13
 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