changeset 215:98bca2ec154b

Merge
author andrew
date Mon, 10 Jan 2011 16:57:21 +0000
parents f3444af18aff (current diff) 86f60e5b3975 (diff)
children 4c04de31900b
files .hgtags build.properties jaxws.properties make/Makefile
diffstat 4 files changed, 13 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Nov 10 19:06:59 2010 +0000
+++ b/.hgtags	Mon Jan 10 16:57:21 2011 +0000
@@ -93,3 +93,10 @@
 400f494c81c5ec87714b705648afbb3cb680bf73 jdk7-b114
 824cc44bd6eba9abae07cc420f7fe3926c1adbd9 jdk7-b115
 376ac153078dd3b5f6d4a0981feee092c1492c96 jdk7-b116
+1320fb3bb588298c79716bd2d10b5b4afacb9370 jdk7-b117
+19a2fab3f91a275f90791c15d1c21a24e820ff2d jdk7-b118
+41fa02b3663795ddf529690df7aa6714210093ec jdk7-b119
+a4f2e1ca67163ef79555082809d7cd719893c338 jdk7-b120
+0fa950117faac7bdbc94e6c46b88f6f892031c17 jdk7-b121
+17b6c48a344968880925dcef1178fec282feb335 jdk7-b122
+5a8e43bcce56b7cd5576419067a929b74575ae71 jdk7-b123
--- a/build.properties	Wed Nov 10 19:06:59 2010 +0000
+++ b/build.properties	Mon Jan 10 16:57:21 2011 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
--- a/jaxws.properties	Wed Nov 10 19:06:59 2010 +0000
+++ b/jaxws.properties	Mon Jan 10 16:57:21 2011 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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
@@ -28,14 +28,14 @@
 jaxws_src.bundle.name= jdk7-jaxws2_2-2010_08_19.zip
 jaxws_src.bundle.md5.checksum=8775ccefd3b4fa2dde5155ec4b7e4ceb
 jaxws_src.master.bundle.dir=${drops.master.copy.base}
-jaxws_src.master.bundle.url.base=https://jax-ws.dev.java.net/files/documents/4202/152532
+jaxws_src.master.bundle.url.base=https://java.net/downloads/jax-ws/JDK7
 
 jaf_src.bundle.name=jdk7-jaf-2010_08_19.zip
 jaf_src.bundle.md5.checksum=18d15dfd71117daadb332af003d08212
 jaf_src.master.bundle.dir=${drops.master.copy.base}
-jaf_src.master.bundle.url.base=https://jax-ws.dev.java.net/files/documents/4202/152336
+jaf_src.master.bundle.url.base=https://java.net/downloads/jax-ws/JDK7
 
 #jaxws_tests.bundle.name=jdk7-jaxws-tests-2009_08_28.zip
 #jaxws_tests.master.bundle.dir=${drops.master.copy.base}
-#jaxws_tests.master.bundle.url.base=http://kenai.com/projects/jdk7-drops/downloads/download
+#jaxws_tests.master.bundle.url.base=https://java.net/downloads/jax-ws/JDK7
 
--- a/make/Makefile	Wed Nov 10 19:06:59 2010 +0000
+++ b/make/Makefile	Mon Jan 10 16:57:21 2011 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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