Mercurial > hg > openjdk > lambda > jaxws

changeset 192:3344673321b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with jdk7-b131
author mcimadamore
date Tue, 01 Mar 2011 15:04:07 +0000
parents 07ce64c8fc30 (current diff) 0e57c3272d37 (diff)
children 7a0e244bd1ca
files
diffstat 3 files changed, 16 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Jan 05 10:05:31 2011 +0000
+++ b/.hgtags	Tue Mar 01 15:04:07 2011 +0000
@@ -98,3 +98,11 @@
 0fa950117faac7bdbc94e6c46b88f6f892031c17 jdk7-b121
 17b6c48a344968880925dcef1178fec282feb335 jdk7-b122
 5a8e43bcce56b7cd5576419067a929b74575ae71 jdk7-b123
+86f60e5b3975840968f3147ddce047a27a9fc83e jdk7-b124
+d72eea121c3bc2b649272a37b80d9417855b7146 jdk7-b125
+6d772c5119d5e247bc98a57ce8b1be121554ee0a jdk7-b126
+ef19f173578c804772d586a959fa3ab8a12c0598 jdk7-b127
+88d74afc55938033e744b537a22714bb2c82c9c0 jdk7-b128
+0f7b39ad902424e949e3d2dca8411b884888a76f jdk7-b129
+ba1fac1c2083196422a12130db174334179a4d44 jdk7-b130
+438abc0356cd97d91b25f67cd1abc9883e22f6ed jdk7-b131
--- a/LICENSE	Wed Jan 05 10:05:31 2011 +0000
+++ b/LICENSE	Tue Mar 01 15:04:07 2011 +0000
@@ -325,11 +325,11 @@
 
 "CLASSPATH" EXCEPTION TO THE GPL
 
-Certain source files distributed by Sun Microsystems, Inc.  are subject to
-the following clarification and special exception to the GPL, but only where
-Sun has expressly included in the particular source file's header the words
-"Sun designates this particular file as subject to the "Classpath" exception
-as provided by Sun in the LICENSE file that accompanied this code."
+Certain source files distributed by Oracle America and/or its affiliates are
+subject to the following clarification and special exception to the GPL, but
+only where Oracle has expressly included in the particular source file's header
+the words "Oracle designates this particular file as subject to the "Classpath"
+exception as provided by Oracle in the LICENSE file that accompanied this code."
 
     Linking this library statically or dynamically with other modules is making
     a combined work based on this library.  Thus, the terms and conditions of
--- a/jaxws.properties	Wed Jan 05 10:05:31 2011 +0000
+++ b/jaxws.properties	Tue Mar 01 15:04:07 2011 +0000
@@ -25,10 +25,10 @@
 
 drops.master.copy.base=${drops.dir}
 
-jaxws_src.bundle.name= jdk7-jaxws2_2-2010_08_19.zip
-jaxws_src.bundle.md5.checksum=8775ccefd3b4fa2dde5155ec4b7e4ceb
+jaxws_src.bundle.name=jdk7-jaxws2_2_2-2010_12_14.zip
+jaxws_src.bundle.md5.checksum=fee9ac72fabc96719eefc66ecaff4bc3
 jaxws_src.master.bundle.dir=${drops.master.copy.base}
-jaxws_src.master.bundle.url.base=https://java.net/downloads/jax-ws/JDK7
+jaxws_src.master.bundle.url.base=http://download.java.net/glassfish/components/jax-ws/openjdk/jdk7
 
 jaf_src.bundle.name=jdk7-jaf-2010_08_19.zip
 jaf_src.bundle.md5.checksum=18d15dfd71117daadb332af003d08212