Mercurial > hg > icedtea9-forest > jaxws
changeset 334:456621c5d797
Merge
| author | asaha |
|---|---|
| date | Fri, 17 Feb 2012 14:59:21 -0800 |
| parents | 329ace7198ac (diff) 4289a81ba085 (current diff) |
| children | c88e83be4b1a |
| files | |
| diffstat | 7 files changed, 35 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Feb 14 10:22:15 2012 -0800 +++ b/.hgtags Fri Feb 17 14:59:21 2012 -0800 @@ -133,3 +133,18 @@ 70172e57cf29efe271b068987eefb601c2a77780 jdk8-b09 8e7fdc8e3c758644ca6d0fd70bb255e9d2e64cda jdk8-b10 a12ab897a249feb7859a6e6cd84b49411f4c06ac jdk8-b11 +e6eed2ff5d5f62bdc815beb5276d23347600c760 jdk8-b12 +adf2a6b5fde14090beb9ebc40c4114132ddee731 jdk8-b13 +54c4bf4b83ecc191351747d5d28da849d34c0243 jdk8-b14 +c9ab96ff23d52d85d5dcce1f9c0fd7a3de418c74 jdk8-b15 +3d45ab79643d5b4cc7e050ae2d9c08b4d89d665e jdk8-b17 +3d45ab79643d5b4cc7e050ae2d9c08b4d89d665e jdk8-b16 +54928c8850f5498670dd43d6c9299f36de1a6746 jdk8-b18 +b73b733214aa43648d69a2da51e6b48fda902a2d jdk8-b19 +2b2818e3386f4510c390f6aea90d77e1c6a5bf9e jdk8-b20 +c266cab0e3fff05f2048c23046c14d60f7102175 jdk8-b21 +8d3df89b0f2d3c603b2edb0f5e24af1245397cc6 jdk8-b22 +25ce7a0004874273f6aeda14e7c3538cba34bdf1 jdk8-b23 +e0d90803439b174fe0b0033e09d50444ba12498f jdk8-b24 +b376d901e006cd9e0c59733c84e190aace23eec6 jdk8-b25 +3518639eab6ce5c7b482bdb0a60342c392ab97a8 jdk8-b26
--- a/build-defs.xml Tue Feb 14 10:22:15 2012 -0800 +++ b/build-defs.xml Fri Feb 17 14:59:21 2012 -0800 @@ -96,6 +96,10 @@ </replaceregexp> <mkdir dir="${build.classes.dir}/META-INF/services"/> + <copy todir="${build.classes.dir}/META-INF" + file="${secondary.src.dir}/META-INF/mailcap.default"/> + <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"/> <copy todir="${build.classes.dir}/META-INF/services" @@ -118,6 +122,7 @@ <!-- Set up source to use drop.dir. --> <target name="-use-drop" depends="-set-props"> <property name="primary.src.dir" value="${jaxws_src.src.dir}"/> + <property name="secondary.src.dir" value="${jaf_src.src.dir}"/> <path id="src.dir.id"> <pathelement path="${primary.src.dir}"/> <pathelement path="${jaf_src.src.dir}"/>
--- a/build.properties Tue Feb 14 10:22:15 2012 -0800 +++ b/build.properties Fri Feb 17 14:59:21 2012 -0800 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ # Base locations where bundles are located slashjava=/java -drops.dir=${slashjava}/devtools/share/jdk7-drops +drops.dir=${slashjava}/devtools/share/jdk8-drops # This is the JDK used to build and run the bootstrap version of javac. # The bootstrap javac is used to compile both boostrap versions of the
--- a/build.xml Tue Feb 14 10:22:15 2012 -0800 +++ b/build.xml Fri Feb 17 14:59:21 2012 -0800 @@ -43,14 +43,6 @@ Run 'make help' for help using the Makefile. </description> - <!-- Mac is special, need to downgrade these before build.properties. --> - <condition property="javac.source" value="1.5"> - <os family="mac"/> - </condition> - <condition property="javac.target" value="1.5"> - <os family="mac"/> - </condition> - <!-- Project build properties. --> <property file="build.properties"/>
--- a/jaxws.properties Tue Feb 14 10:22:15 2012 -0800 +++ b/jaxws.properties Fri Feb 17 14:59:21 2012 -0800 @@ -26,14 +26,14 @@ 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.md5.checksum=f64bedd3c512e6b1ca265fda2feb0905 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 jaf_src.bundle.name=jdk8-jaf-2011_07_22.zip jaf_src.bundle.md5.checksum=18d15dfd71117daadb332af003d08212 jaf_src.master.bundle.dir=${drops.master.copy.base} -jaf_src.master.bundle.url.base=https://java.net/downloads/jax-ws/jdk8 +jaf_src.master.bundle.url.base=http://download.java.net/glassfish/components/jax-ws/openjdk/jdk8 #jaxws_tests.bundle.name=jdk7-jaxws-tests-2009_08_28.zip #jaxws_tests.master.bundle.dir=${drops.master.copy.base}
--- a/make/Makefile Tue Feb 14 10:22:15 2012 -0800 +++ b/make/Makefile Fri Feb 17 14:59:21 2012 -0800 @@ -99,9 +99,9 @@ DROPS_DIR = $(ALT_DROPS_DIR) else ifdef ALT_JDK_DEVTOOLS_DIR - DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk7-drops + DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk8-drops else - DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk7-drops + DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk8-drops endif endif
--- a/make/jprt.properties Tue Feb 14 10:22:15 2012 -0800 +++ b/make/jprt.properties Fri Feb 17 14:59:21 2012 -0800 @@ -25,21 +25,21 @@ # Properties for jprt -# The release to build +# Locked down to jdk8 jprt.tools.default.release=jdk8 # The different build flavors we want, we override here so we just get these 2 jprt.build.flavors=product,fastdebug # Standard list of jprt build targets for this source tree -jprt.build.targets= \ - solaris_sparc_5.10-{product|fastdebug}, \ - solaris_sparcv9_5.10-{product|fastdebug}, \ - solaris_i586_5.10-{product|fastdebug}, \ - solaris_x64_5.10-{product|fastdebug}, \ - linux_i586_2.6-{product|fastdebug}, \ - linux_x64_2.6-{product|fastdebug}, \ - windows_i586_5.1-{product|fastdebug}, \ +jprt.build.targets= \ + solaris_sparc_5.10-{product|fastdebug}, \ + solaris_sparcv9_5.10-{product|fastdebug}, \ + solaris_i586_5.10-{product|fastdebug}, \ + solaris_x64_5.10-{product|fastdebug}, \ + linux_i586_2.6-{product|fastdebug}, \ + linux_x64_2.6-{product|fastdebug}, \ + windows_i586_5.1-{product|fastdebug}, \ windows_x64_5.2-{product|fastdebug} # Directories to be excluded from the source bundles