Mercurial > hg > release > icedtea7-forest-2.3 > jaxws
changeset 325:d26ff33070cb icedtea-2.1-branchpoint
Merge
author | andrew |
---|---|
date | Thu, 22 Dec 2011 15:45:09 +0000 |
parents | a2ebfdc9db7e (current diff) ad63f21ce17a (diff) |
children | 9d6ac592aa24 |
files | .hgtags jaxws.properties sources/jaxws_src/src/com/sun/tools/internal/xjc/MessageBundle.properties |
diffstat | 5 files changed, 39 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Oct 14 03:00:35 2011 +0100 +++ b/.hgtags Thu Dec 22 15:45:09 2011 +0000 @@ -124,5 +124,24 @@ 6bd683f2d527c9afd47beac1cbf614506929598d jdk7-b144 42bfba80beb7d3260b7b135b9a39202b512eb8c2 jdk7-b145 05469dd4c3662c454f8a019e492543add60795cc jdk7-b146 +c01bfd68d0528bc88348813c4d75d7f5c62bc4e2 jdk7u1-b01 d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147 e6cd09c7ef22bbabe31c9f2a32c7e13cfa713fd3 icedtea-2.0-branchpoint +4c24f7019ce939a452154a83151294ad7da66a9d jdk7u1-b02 +272778f529d11081f548f37fcd6a7aec0b11a8dd jdk7u1-b03 +48b06a6e6f46e5bcd610f4bed57cd5067cf31f8c jdk7u1-b04 +7d31bc168b6b5c2d910148f18a6e9876c2b4b74e jdk7u1-b05 +2605f832dfbfcea8342133b9ec6ab1017674d56f jdk7u2-b01 +e94a8b7a96290ade0eef51ea113ee53a95c0c9c9 jdk7u2-b04 +aec267c02523c33d277b7157a702d5a853c6ed1d jdk7u2-b05 +286a65169fdac9b63ce4bf92d0eec9a4b81aa6fc jdk7u2-b06 +a62afe22e560e0c79977f3c9e8526c2947e63bb8 jdk7u2-b07 +f6ba2486fbcf1230ba7e1133cb7c56ff336047e8 jdk7u2-b08 +6499a5ada6c1d9c27221d935fe55afb2d0a5e9b6 jdk7u2-b09 +345e7bd6be139663d5c197ec92afadf9b5f7bd28 jdk7u1-b06 +617f83244f3d539e342674d667dad8a1a7a01b52 jdk7u1-b07 +97365155cf6df7a7bed4d9e288eab8b7b58f72d7 jdk7u1-b08 +f3bb1066a71f2a64c7bcf45a7ba0a8de63657696 jdk7u2-b11 +21131044a61353ac20e360bce52d8f480e08d7a2 jdk7u2-b12 +9728fd833e01faa5e51484aeaf3c51d32d1175fb jdk7u2-b13 +d6db86a7ca32e6d97844f633badc0d516e55694f jdk7u2-b21
--- a/.jcheck/conf Fri Oct 14 03:00:35 2011 +0100 +++ b/.jcheck/conf Thu Dec 22 15:45:09 2011 +0000 @@ -1,1 +1,2 @@ project=jdk7 +bugids=dup
--- a/THIRD_PARTY_README Fri Oct 14 03:00:35 2011 +0100 +++ b/THIRD_PARTY_README Thu Dec 22 15:45:09 2011 +0000 @@ -216,15 +216,16 @@ is included with JRE 7, JDK 7, and OpenJDK 7. You are receiving a copy of the Elliptic Curve Cryptography library in source -form with the JDK 7 source distribution and object code in the JRE 7 & JDK 7 -runtime. - -The terms of the Oracle license do NOT apply to the Elliptic Curve -Cryptography library program; it is licensed under the following license, -separately from the Oracle programs you receive. If you do not wish to install -this program, you may delete the library named libsunec.so (on Solaris and -Linux systems) or sunec.dll (on Windows systems) from the JRE bin directory -reserved for native libraries. +form with the JDK 7 and OpenJDK7 source distributions, and as object code in +the JRE 7 & JDK 7 runtimes. + +In the case of the JRE 7 & JDK 7 runtimes, the terms of the Oracle license do +NOT apply to the Elliptic Curve Cryptography library; it is licensed under the +following license, separately from Oracle's JDK & JRE. If you do not wish to +install the Elliptic Curve Cryptography library, you may delete the library +named libsunec.so (on Solaris and Linux systems) or sunec.dll (on Windows +systems) from the JRE bin directory reserved for native libraries. + --- begin of LICENSE --- @@ -1000,7 +1001,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to libpng 1.2.18, which is +%% This notice is provided with respect to libpng 1.5.4, which is included with JRE 7, JDK 7, and OpenJDK 7. --- begin of LICENSE --- @@ -1014,8 +1015,10 @@ If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.2.6, August 15, 2004, through 1.2.18, May 15, 2007, are -Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are +This code is released under the libpng license. + +libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are +Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -1112,7 +1115,7 @@ Glenn Randers-Pehrson glennrp at users.sourceforge.net -May 15, 2007 +July 7, 2011 --- end of LICENSE ---
--- a/jaxws.properties Fri Oct 14 03:00:35 2011 +0100 +++ b/jaxws.properties Thu Dec 22 15:45:09 2011 +0000 @@ -25,8 +25,8 @@ drops.master.copy.base=${drops.dir} -jaxws_src.bundle.name=jdk7-jaxws2_2_4-b03-2011_05_27.zip -jaxws_src.bundle.md5.checksum=2f5b829ade70f67fe272d0b322e3e702 +jaxws_src.bundle.name=jdk7-jaxws2_2_4-b04-2011_06_01.zip +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/jdk7
--- a/sources/jaxws_src/src/com/sun/tools/internal/xjc/MessageBundle.properties Fri Oct 14 03:00:35 2011 +0100 +++ b/sources/jaxws_src/src/com/sun/tools/internal/xjc/MessageBundle.properties Thu Dec 22 15:45:09 2011 +0000 @@ -163,7 +163,7 @@ xjc 2.2.4 Driver.FullVersion = \ - xjc full version "2.2.4-1b7" + xjc full version "2.2.4-1b10" Driver.BuildID = 2.2.4