Merge
authorlana
Thu, 09 Feb 2012 22:53:25 -0800
changeset 11859 71611f5496d6
parent 11858 20e46927b54d (diff)
parent 11746 6c805d8ed4e5 (current diff)
child 11860 e50af542fdbe
Merge
jdk/test/tools/launcher/ChangeDataModel.sh
jdk/test/tools/launcher/CreatePlatformFile.java
jdk/test/tools/launcher/SomeException.java
jdk/test/tools/launcher/UnicodeCleanup.java
jdk/test/tools/launcher/UnicodeTest.sh
jdk/test/tools/launcher/deleteI18n.sh
jdk/test/tools/launcher/i18nTest.sh
jdk/test/tools/launcher/unresolvedExceptions.sh
--- a/jaxws/build-defs.xml	Wed Jul 05 18:02:34 2017 +0200
+++ b/jaxws/build-defs.xml	Thu Feb 09 22:53:25 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	Wed Jul 05 18:02:34 2017 +0200
+++ b/jaxws/jaxws.properties	Thu Feb 09 22:53:25 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.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