changeset 216:9110038f379e

Merge from main OpenJDK repository
author Greg Lewis <glewis@eyesbeyond.com>
date Sat, 11 Dec 2010 09:07:10 -0800
parents 65ca2cd8acaf 03ff13d19c8f
children fc1d25fa6905
files
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sat Dec 04 08:27:41 2010 -0800
+++ b/.hgtags	Sat Dec 11 09:07:10 2010 -0800
@@ -95,3 +95,4 @@
 b2f6d9c4f12ffd307a5de40455b2b61b31a5cb79 jdk7-b118
 9ee900f01c5872551c06f33ae909662ffd8463ac jdk7-b119
 4821de0908defe647fcdaab4485f98873e24dea0 jdk7-b120
+63dae40fa19fd3bf4689ea2f3c1d9d690e1abcee jdk7-b121
--- a/jaxp.properties	Sat Dec 04 08:27:41 2010 -0800
+++ b/jaxp.properties	Sat Dec 11 09:07:10 2010 -0800
@@ -28,10 +28,10 @@
 jaxp_src.bundle.name=jaxp-1_4_4.zip
 jaxp_src.bundle.md5.checksum=2c40a758392c4abf2d59f355240df46a
 jaxp_src.master.bundle.dir=${drops.master.copy.base}
-jaxp_src.master.bundle.url.base=https://jaxp.dev.java.net/files/documents/913/152561
+jaxp_src.master.bundle.url.base=https://java.net/downloads/jaxp/jdk7
 
 #jaxp_tests.bundle.name=jaxp-unittests-1_4_4.zip
 #jaxp_tests.bundle.md5.checksum=51845e38b02920cf5374d0331ab3a4ee
 #jaxp_tests.master.bundle.dir=${drops.master.copy.base}
-#jaxp_tests.master.bundle.url.base=https://jaxp.dev.java.net/files/documents/913/152562
+#jaxp_tests.master.bundle.url.base=https://java.net/downloads/jaxp/jdk7