changeset 207:17aa584100e9

Merge
author andrew
date Mon, 10 Jan 2011 16:57:21 +0000
parents 43658f98c582 57ed1f3bec72
children b6f201c0649a
files .hgtags build.properties jaxp.properties make/Makefile
diffstat 4 files changed, 11 insertions(+), 4 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 @@
 d57197d22c2bfc39d1a860040f655b466ab46f52 jdk7-b114
 dc1612e1d3ac08eb8fcad764daff21c9247d33c9 jdk7-b115
 f8d4e6c6cfce1cda23fcbd144628a9791a9e1a63 jdk7-b116
+9ee4d96e893436a48607924227dadd2d93b9b00d jdk7-b117
+b2f6d9c4f12ffd307a5de40455b2b61b31a5cb79 jdk7-b118
+9ee900f01c5872551c06f33ae909662ffd8463ac jdk7-b119
+4821de0908defe647fcdaab4485f98873e24dea0 jdk7-b120
+63dae40fa19fd3bf4689ea2f3c1d9d690e1abcee jdk7-b121
+03ff13d19c8fa983cbab6542930a7f352e9b5b33 jdk7-b122
+e2aedea6495d61557326928de20dbb2d78fdd9aa 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/jaxp.properties	Wed Nov 10 19:06:59 2010 +0000
+++ b/jaxp.properties	Mon Jan 10 16:57:21 2011 +0000
@@ -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
 
--- 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