Merge jdk8-b27

Sat, 18 Feb 2012 16:09:11 -0800

author
lana
date
Sat, 18 Feb 2012 16:09:11 -0800
changeset 279
38c037af4127
parent 275
329ace7198ac
parent 278
b962e9c3eba2
child 280
6a2e8a833460
child 283
c88e83be4b1a

Merge

     1.1 --- a/build-defs.xml	Thu Feb 16 13:01:33 2012 -0800
     1.2 +++ b/build-defs.xml	Sat Feb 18 16:09:11 2012 -0800
     1.3 @@ -101,7 +101,7 @@
     1.4          <copy todir="${build.classes.dir}/META-INF"
     1.5                file="${secondary.src.dir}/META-INF/mimetypes.default"/>
     1.6          <copy todir="${build.classes.dir}/META-INF/services"
     1.7 -              file="${primary.src.dir}/com/sun/tools/etc/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory"/>
     1.8 +              file="${primary.src.dir}/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin"/>
     1.9          <copy todir="${build.classes.dir}/META-INF/services"
    1.10                file="${primary.src.dir}/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin"/>
    1.11          <mkdir dir="${build.classes.dir}/com/sun/tools/internal/xjc/runtime"/>
     2.1 --- a/jaxws.properties	Thu Feb 16 13:01:33 2012 -0800
     2.2 +++ b/jaxws.properties	Sat Feb 18 16:09:11 2012 -0800
     2.3 @@ -25,8 +25,8 @@
     2.4  
     2.5  drops.master.copy.base=${drops.dir}
     2.6  
     2.7 -jaxws_src.bundle.name=jdk8-jaxws2_2_4-b01-2011_07_22.zip
     2.8 -jaxws_src.bundle.md5.checksum=f64bedd3c512e6b1ca265fda2feb0905
     2.9 +jaxws_src.bundle.name=jdk8-jaxws-2_2-SNAPSHOT-2012_01_11-patched.zip
    2.10 +jaxws_src.bundle.md5.checksum=005b93d1a2d6e66438c3c84c49c10b13
    2.11  jaxws_src.master.bundle.dir=${drops.master.copy.base}
    2.12  jaxws_src.master.bundle.url.base=http://download.java.net/glassfish/components/jax-ws/openjdk/jdk8
    2.13  

mercurial