Mercurial > hg > release > icedtea7-forest-2.6 > jdk
changeset 5379:6ccd627b4af2 jdk7u5-b02
Merge
| author | asaha |
|---|---|
| date | Thu, 12 Apr 2012 15:53:35 -0700 |
| parents | beb0fe59609d (current diff) 81a0f71a895e (diff) |
| children | 05b7a64ee608 ea7a324102bf |
| files | .hgtags src/share/classes/sun/print/PSPrinterJob.java src/solaris/classes/sun/print/UnixPrintServiceLookup.java |
| diffstat | 61 files changed, 858 insertions(+), 185 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Apr 06 17:10:17 2012 -0700 +++ b/.hgtags Thu Apr 12 15:53:35 2012 -0700 @@ -165,3 +165,4 @@ b4401b362fd8076d705aa57acb9967b5962a795d jdk7u4-b17 084825fc677ef6adecab9400a2625eb0e5579509 jdk7u4-b18 0f9aacb27534e7bba7ba30a2700a9c828416929d jdk7u4-b19 +1a495432b42a496bde0ddfa16c6462742d7a8cf1 jdk7u4-b20
--- a/make/common/Defs-macosx.gmk Fri Apr 06 17:10:17 2012 -0700 +++ b/make/common/Defs-macosx.gmk Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2012, 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 @@ -111,10 +111,10 @@ # For all platforms, do not omit the frame pointer register usage. # We need this frame pointer to make it easy to walk the stacks. -# This should be the default on X86, but ia64 and amd64 may not have this -# as the default. -CFLAGS_REQUIRED_amd64 += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN -LDFLAGS_COMMON_amd64 += -m64 +# This should be the default on X86, but ia64, and x86_64 +# may not have this as the default. +CFLAGS_REQUIRED_x86_64 += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN +LDFLAGS_COMMON_x86_64 += -m64 CFLAGS_REQUIRED_i586 += -m32 -fno-omit-frame-pointer -D_LITTLE_ENDIAN LDFLAGS_COMMON_i586 += -m32 CFLAGS_REQUIRED_ia64 += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN @@ -168,7 +168,7 @@ PIC_CODE_SMALL = -fpic GLOBAL_KPIC = $(PIC_CODE_LARGE) CFLAGS_COMMON += $(GLOBAL_KPIC) $(GCC_WARNINGS) -ifeq ($(ARCH), amd64) +ifeq ($(ARCH), x86_64) CFLAGS_COMMON += -pipe endif
--- a/make/common/shared/Platform.gmk Fri Apr 06 17:10:17 2012 -0700 +++ b/make/common/shared/Platform.gmk Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2012, 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 @@ -262,7 +262,7 @@ echo sparc \ ;; \ x86_64) \ - echo amd64 \ + echo x86_64 \ ;; \ "Power Macintosh") \ echo ppc \
--- a/make/java/java/FILES_java.gmk Fri Apr 06 17:10:17 2012 -0700 +++ b/make/java/java/FILES_java.gmk Thu Apr 12 15:53:35 2012 -0700 @@ -51,6 +51,7 @@ java/lang/SuppressWarnings.java \ java/lang/AbstractStringBuilder.java \ java/lang/ClassLoader.java \ + java/lang/ClassLoaderHelper.java \ java/lang/AssertionStatusDirectives.java \ java/lang/Enum.java \ java/lang/StrictMath.java \
--- a/make/sun/javazic/tzdata/VERSION Fri Apr 06 17:10:17 2012 -0700 +++ b/make/sun/javazic/tzdata/VERSION Thu Apr 12 15:53:35 2012 -0700 @@ -21,4 +21,4 @@ # or visit www.oracle.com if you need additional information or have any # questions. # -tzdata2011l +tzdata2012c
--- a/make/sun/javazic/tzdata/africa Fri Apr 06 17:10:17 2012 -0700 +++ b/make/sun/javazic/tzdata/africa Thu Apr 12 15:53:35 2012 -0700 @@ -22,7 +22,7 @@ # questions. # # <pre> -# @(#)africa 8.33 +# @(#)africa 8.35 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -791,6 +791,37 @@ # wall clock time (i.e. 11pm UTC), but that's what I would assume. It has # also been like that in the past. +# From Alexander Krivenyshev (2012-03-09): +# According to Infomédiaire web site from Morocco (infomediaire.ma), +# on March 9, 2012, (in French) Heure légale: +# Le Maroc adopte officiellement l'heure d'été +# <a href="http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9"> +# http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9 +# </a> +# Governing Council adopted draft decree, that Morocco DST starts on +# the last Sunday of March (March 25, 2012) and ends on +# last Sunday of September (September 30, 2012) +# except the month of Ramadan. +# or (brief) +# <a href="http://www.worldtimezone.com/dst_news/dst_news_morocco06.html"> +# http://www.worldtimezone.com/dst_news/dst_news_morocco06.html +# </a> + +# From Arthur David Olson (2012-03-10): +# The infomediaire.ma source indicates that the system is to be in +# effect every year. It gives 03H00 as the "fall back" time of day; +# it lacks a "spring forward" time of day; assume 2:00 XXX. +# Wait on specifying the Ramadan exception for details about +# start date, start time of day, end date, and end time of day XXX. + +# From Christophe Tropamer (2012-03-16): +# Seen Morocco change again: +# <a href="http://www.le2uminutes.com/actualite.php"> +# http://www.le2uminutes.com/actualite.php +# </a> +# "...à partir du dernier dimance d'avril et non fins mars, +# comme annoncé précédemment." + # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Morocco 1939 only - Sep 12 0:00 1:00 S @@ -816,6 +847,9 @@ Rule Morocco 2010 only - Aug 8 0:00 0 - Rule Morocco 2011 only - Apr 3 0:00 1:00 S Rule Morocco 2011 only - Jul 31 0 0 - +Rule Morocco 2012 max - Apr lastSun 2:00 1:00 S +Rule Morocco 2012 max - Sep lastSun 3:00 0 - + # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 0:00 Morocco WE%sT 1984 Mar 16
--- a/make/sun/javazic/tzdata/antarctica Fri Apr 06 17:10:17 2012 -0700 +++ b/make/sun/javazic/tzdata/antarctica Thu Apr 12 15:53:35 2012 -0700 @@ -22,7 +22,7 @@ # questions. # # <pre> -# @(#)antarctica 8.9 +# @(#)antarctica 8.10 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -65,8 +65,19 @@ Rule ChileAQ 1998 only - Mar Sun>=9 3:00u 0 - Rule ChileAQ 1998 only - Sep 27 4:00u 1:00 S Rule ChileAQ 1999 only - Apr 4 3:00u 0 - -Rule ChileAQ 1999 max - Oct Sun>=9 4:00u 1:00 S -Rule ChileAQ 2000 max - Mar Sun>=9 3:00u 0 - +Rule ChileAQ 1999 2010 - Oct Sun>=9 4:00u 1:00 S +Rule ChileAQ 2000 2007 - Mar Sun>=9 3:00u 0 - +# N.B.: the end of March 29 in Chile is March 30 in Universal time, +# which is used below in specifying the transition. +Rule ChileAQ 2008 only - Mar 30 3:00u 0 - +Rule ChileAQ 2009 only - Mar Sun>=9 3:00u 0 - +Rule ChileAQ 2010 only - Apr Sun>=1 3:00u 0 - +Rule ChileAQ 2011 only - May Sun>=2 3:00u 0 - +Rule ChileAQ 2011 only - Aug Sun>=16 4:00u 1:00 S +Rule ChileAQ 2012 only - Apr Sun>=23 3:00u 0 - +Rule ChileAQ 2012 only - Sep Sun>=2 4:00u 1:00 S +Rule ChileAQ 2013 max - Mar Sun>=9 3:00u 0 - +Rule ChileAQ 2013 max - Oct Sun>=9 4:00u 1:00 S # These rules are stolen from the `australasia' file. Rule AusAQ 1917 only - Jan 1 0:01 1:00 - @@ -165,12 +176,16 @@ # Western (Aus) Standard Time 11:00 - CAST 2010 Mar 5 2:00 # Casey Time + 8:00 - WST 2011 Oct 28 2:00 + 11:00 - CAST 2012 Feb 21 17:00u 8:00 - WST Zone Antarctica/Davis 0 - zzz 1957 Jan 13 7:00 - DAVT 1964 Nov # Davis Time 0 - zzz 1969 Feb 7:00 - DAVT 2009 Oct 18 2:00 5:00 - DAVT 2010 Mar 10 20:00u + 7:00 - DAVT 2011 Oct 28 2:00 + 5:00 - DAVT 2012 Feb 21 20:00u 7:00 - DAVT Zone Antarctica/Mawson 0 - zzz 1954 Feb 13 6:00 - MAWT 2009 Oct 18 2:00
--- a/make/sun/javazic/tzdata/asia Fri Apr 06 17:10:17 2012 -0700 +++ b/make/sun/javazic/tzdata/asia Thu Apr 12 15:53:35 2012 -0700 @@ -21,7 +21,8 @@ # or visit www.oracle.com if you need additional information or have any # questions. # -# @(#)asia 8.68 +# <pre> +# @(#)asia 8.73 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -100,10 +101,6 @@ Rule RussiaAsia 1993 1995 - Sep lastSun 2:00s 0 - Rule RussiaAsia 1996 max - Oct lastSun 2:00s 0 - -# From Arthur David Olson (2011-06-15): -# While Russia abandoned DST in 2011, Armenia may choose to -# follow Russia's "old" rules. - # Afghanistan # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Kabul 4:36:48 - LMT 1890 @@ -120,6 +117,21 @@ # in 1996, though it did use DST in 1995. IATA SSIM (1991/1998) reports that # Armenia switched from 3:00 to 4:00 in 1998 and observed DST after 1991, # but started switching at 3:00s in 1998. + +# From Arthur David Olson (2011-06-15): +# While Russia abandoned DST in 2011, Armenia may choose to +# follow Russia's "old" rules. + +# From Alexander Krivenyshev (2012-02-10): +# According to News Armenia, on Feb 9, 2012, +# http://newsarmenia.ru/society/20120209/42609695.html +# +# The Armenia National Assembly adopted final reading of Amendments to the +# Law "On procedure of calculation time on the territory of the Republic of +# Armenia" according to which Armenia [is] abolishing Daylight Saving Time. +# or +# (brief) +# http://www.worldtimezone.com/dst_news/dst_news_armenia03.html # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Yerevan 2:58:00 - LMT 1924 May 2 3:00 - YERT 1957 Mar # Yerevan Time @@ -127,7 +139,8 @@ 3:00 1:00 YERST 1991 Sep 23 # independence 3:00 RussiaAsia AM%sT 1995 Sep 24 2:00s 4:00 - AMT 1997 - 4:00 RussiaAsia AM%sT + 4:00 RussiaAsia AM%sT 2012 Mar 25 2:00s + 4:00 - AMT # Azerbaijan # From Rustam Aliyev of the Azerbaijan Internet Forum (2005-10-23): @@ -2258,6 +2271,29 @@ # http://www.maannews.net/eng/ViewDetails.aspx?ID=424808 # </a> +# From Steffen Thorsen (2012-03-26): +# Palestinian news sources tell that both Gaza and West Bank will start DST +# on Friday (Thursday midnight, 2012-03-29 24:00). +# Some of many sources in Arabic: +# <a href="http://www.samanews.com/index.php?act=Show&id=122638"> +# http://www.samanews.com/index.php?act=Show&id=122638 +# </a> +# +# <a href="http://safa.ps/details/news/74352/%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-%D8%A8%D8%A7%D9%84%D8%B6%D9%81%D8%A9-%D9%88%D8%BA%D8%B2%D8%A9-%D9%84%D9%8A%D9%84%D8%A9-%D8%A7%D9%84%D8%AC%D9%85%D8%B9%D8%A9.html"> +# http://safa.ps/details/news/74352/%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-%D8%A8%D8%A7%D9%84%D8%B6%D9%81%D8%A9-%D9%88%D8%BA%D8%B2%D8%A9-%D9%84%D9%8A%D9%84%D8%A9-%D8%A7%D9%84%D8%AC%D9%85%D8%B9%D8%A9.html +# </a> +# +# Our brief summary: +# <a href="http://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html"> +# http://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html +# </a> + +# From Arthur David Olson (2012-03-27): +# The timeanddate article for 2012 says that "the end date has not yet been +# announced" and that "Last year, both...paused daylight saving time during... +# Ramadan. It is not yet known [for] 2012." +# For now, assume both switch back on the last Friday in September. XXX + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule EgyptAsia 1957 only - May 10 0:00 1:00 S Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 - @@ -2290,6 +2326,8 @@ 2:00 Jordan EE%sT 1999 2:00 Palestine EE%sT 2011 Apr 2 12:01 2:00 1:00 EEST 2011 Aug 1 + 2:00 - EET 2012 Mar 30 + 2:00 1:00 EEST 2012 Sep 28 2:00 - EET Zone Asia/Hebron 2:20:23 - LMT 1900 Oct @@ -2303,6 +2341,8 @@ 2:00 1:00 EEST 2011 Aug 1 2:00 - EET 2011 Aug 30 2:00 1:00 EEST 2011 Sep 30 3:00 + 2:00 - EET 2012 Mar 30 + 2:00 1:00 EEST 2012 Sep 28 3:00 2:00 - EET # Paracel Is @@ -2594,10 +2634,28 @@ # http://sns.sy/sns/?path=news/read/11421 (Arabic) # </a> +# From Steffen Thorsen (2012-03-26): +# Today, Syria's government announced that they will start DST early on Friday +# (00:00). This is a bit earlier than the past two years. +# +# From Syrian Arab News Agency, in Arabic: +# <a href="http://www.sana.sy/ara/2/2012/03/26/408215.htm"> +# http://www.sana.sy/ara/2/2012/03/26/408215.htm +# </a> +# +# Our brief summary: +# <a href="http://www.timeanddate.com/news/time/syria-dst-2012.html"> +# http://www.timeanddate.com/news/time/syria-dst-2012.html +# </a> + +# From Arthur David Olson (2012-03-27): +# Assume last Friday in March going forward XXX. + Rule Syria 2008 only - Apr Fri>=1 0:00 1:00 S Rule Syria 2008 only - Nov 1 0:00 0 - Rule Syria 2009 only - Mar lastFri 0:00 1:00 S -Rule Syria 2010 max - Apr Fri>=1 0:00 1:00 S +Rule Syria 2010 2011 - Apr Fri>=1 0:00 1:00 S +Rule Syria 2012 max - Mar lastFri 0:00 1:00 S Rule Syria 2009 max - Oct lastFri 0:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL]
--- a/make/sun/javazic/tzdata/australasia Fri Apr 06 17:10:17 2012 -0700 +++ b/make/sun/javazic/tzdata/australasia Thu Apr 12 15:53:35 2012 -0700 @@ -22,7 +22,7 @@ # questions. # # <pre> -# @(#)australasia 8.27 +# @(#)australasia 8.30 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -331,6 +331,20 @@ # advance at 2am to 3am on October 23, 2011 and one hour back at 3am to # 2am on February 26 next year. +# From Ken Rylander (2011-10-24) +# Another change to the Fiji DST end date. In the TZ database the end date for +# Fiji DST 2012, is currently Feb 26. This has been changed to Jan 22. +# +# <a href="http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=5017:amendments-to-daylight-savings&catid=71:press-releases&Itemid=155"> +# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=5017:amendments-to-daylight-savings&catid=71:press-releases&Itemid=155 +# </a> +# states: +# +# The end of daylight saving scheduled initially for the 26th of February 2012 +# has been brought forward to the 22nd of January 2012. +# The commencement of daylight saving will remain unchanged and start +# on the 23rd of October, 2011. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - @@ -339,7 +353,7 @@ Rule Fiji 2010 only - Oct 24 2:00 1:00 S Rule Fiji 2011 only - Mar Sun>=1 3:00 0 - Rule Fiji 2011 only - Oct 23 2:00 1:00 S -Rule Fiji 2012 only - Feb 26 3:00 0 - +Rule Fiji 2012 only - Jan 22 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Fiji 11:53:40 - LMT 1915 Oct 26 # Suva 12:00 Fiji FJ%sT # Fiji Time @@ -625,6 +639,11 @@ # Dateline Change skip Friday 30th Dec 2011 # Thursday 29th December 2011 23:59:59 Hours # Saturday 31st December 2011 00:00:00 Hours +# +# Clarification by Tim Parenti (2012-01-03): +# Although Samoa has used Daylight Saving Time in the 2010-2011 and 2011-2012 +# seasons, there is not yet any indication that this trend will continue on +# a regular basis. For now, we have explicitly listed the transitions below. Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 -11:26:56 - LMT 1911 -11:30 - SAMT 1950 # Samoa Time @@ -642,9 +661,28 @@ 11:00 - SBT # Solomon Is Time # Tokelau Is +# +# From Gwillim Law (2011-12-29) +# A correspondent informed me that Tokelau, like Samoa, will be skipping +# December 31 this year, thereby changing its time zone from UTC-10 to +# UTC+14. When I tried to verify this statement, I found a confirming +# article in Time magazine online +# <a href="http://www.time.com/time/world/article/0,8599,2103243,00.html"> +# (http://www.time.com/time/world/article/0,8599,2103243,00.html). +# </a> +# +# From Jonathan Leffler (2011-12-29) +# Information from the BBC to the same effect: +# <a href="http://www.bbc.co.uk/news/world-asia-16351377"> +# http://www.bbc.co.uk/news/world-asia-16351377 +# </a> +# +# Patch supplied by Tim Parenti (2011-12-29) + # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Fakaofo -11:24:56 - LMT 1901 - -10:00 - TKT # Tokelau Time + -10:00 - TKT 2011 Dec 30 # Tokelau Time + 14:00 - TKT # Tonga # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--- a/make/sun/javazic/tzdata/backward Fri Apr 06 17:10:17 2012 -0700 +++ b/make/sun/javazic/tzdata/backward Thu Apr 12 15:53:35 2012 -0700 @@ -22,7 +22,7 @@ # questions. # # <pre> -# @(#)backward 8.9 +# @(#)backward 8.11 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson.
--- a/make/sun/javazic/tzdata/europe Fri Apr 06 17:10:17 2012 -0700 +++ b/make/sun/javazic/tzdata/europe Thu Apr 12 15:53:35 2012 -0700 @@ -22,7 +22,7 @@ # questions. # # <pre> -# @(#)europe 8.38 +# @(#)europe 8.41 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -234,9 +234,15 @@ # the history of summer time legislation in the United Kingdom. # Since 1998 Joseph S. Myers has been updating # and extending this list, which can be found in -# <a href="http://student.cusu.cam.ac.uk/~jsm28/british-time/"> +# http://student.cusu.cam.ac.uk/~jsm28/british-time/ +# <a href="http://www.polyomino.org.uk/british-time/"> # History of legal time in Britain # </a> +# Rob Crowther (2012-01-04) reports that that URL no longer +# exists, and the article can now be found at: +# <a href="http://www.polyomino.org.uk/british-time/"> +# http://www.polyomino.org.uk/british-time/ +# </a> # From Joseph S. Myers (1998-01-06): # @@ -1174,10 +1180,10 @@ # write that they were used in Monaco and in many French locations. # Le Corre writes that the upper limit of the free zone was Arneguy, Orthez, # Mont-de-Marsan, Bazas, Langon, Lamotte-Montravel, Marouil, La -# Rochefoucault, Champagne-Mouton, La Roche-Posay, La Haye-Decartes, +# Rochefoucault, Champagne-Mouton, La Roche-Posay, La Haye-Descartes, # Loches, Montrichard, Vierzon, Bourges, Moulins, Digoin, # Paray-le-Monial, Montceau-les-Mines, Chalons-sur-Saone, Arbois, -# Dole, Morez, St-Claude, and Collognes (Haute-Savioe). +# Dole, Morez, St-Claude, and Collonges (Haute-Savoie). Rule France 1941 only - May 5 0:00 2:00 M # Midsummer # Shanks & Pottenger say this transition occurred at Oct 6 1:00, # but go with Denis Excoffier (1997-12-12), @@ -1678,6 +1684,41 @@ # But [two people] separately reported via # Jesper Norgaard that as of 2001-01-24 Tiraspol was like Chisinau. # The Tiraspol entry has therefore been removed for now. +# +# From Alexander Krivenyshev (2011-10-17): +# Pridnestrovian Moldavian Republic (PMR, also known as +# "Pridnestrovie") has abolished seasonal clock change (no transition +# to the Winter Time). +# +# News (in Russian): +# <a href="http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html"> +# http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html +# </a> +# +# <a href="http://www.allmoldova.com/moldova-news/1249064116.html"> +# http://www.allmoldova.com/moldova-news/1249064116.html +# </a> +# +# The substance of this change (reinstatement of the Tiraspol entry) +# is from a patch from Petr Machata (2011-10-17) +# +# From Tim Parenti (2011-10-19) +# In addition, being situated at +4651+2938 would give Tiraspol +# a pre-1880 LMT offset of 1:58:32. +# +# (which agrees with the earlier entry that had been removed) +# +# From Alexander Krivenyshev (2011-10-26) +# NO need to divide Moldova into two timezones at this point. +# As of today, Transnistria (Pridnestrovie)- Tiraspol reversed its own +# decision to abolish DST this winter. +# Following Moldova and neighboring Ukraine- Transnistria (Pridnestrovie)- +# Tiraspol will go back to winter time on October 30, 2011. +# News from Moldova (in russian): +# <a href="http://ru.publika.md/link_317061.html"> +# http://ru.publika.md/link_317061.html +# </a> + # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Europe/Chisinau 1:55:20 - LMT 1880 @@ -2674,6 +2715,28 @@ # <a href="http://www.pravda.com.ua/rus/news/2011/09/20/6600616/"> # http://www.pravda.com.ua/rus/news/2011/09/20/6600616/ # </a> +# +# From Philip Pizzey (2011-10-18): +# Today my Ukrainian colleagues have informed me that the +# Ukrainian parliament have decided that they will go to winter +# time this year after all. +# +# From Udo Schwedt (2011-10-18): +# As far as I understand, the recent change to the Ukranian time zone +# (Europe/Kiev) to introduce permanent daylight saving time (similar +# to Russia) was reverted today: +# +# <a href="http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995"> +# http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995 +# </a> +# +# Also reported by Alexander Bokovoy (2011-10-18) who also noted: +# The law documents themselves are at +# +# <a href="http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484"> +# http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484 +# </a> + # Zone NAME GMTOFF RULES FORMAT [UNTIL] # Most of Ukraine since 1970 has been like Kiev. @@ -2688,8 +2751,7 @@ 3:00 - MSK 1990 Jul 1 2:00 2:00 - EET 1992 2:00 E-Eur EE%sT 1995 - 2:00 EU EE%sT 2011 Mar lastSun 1:00u - 3:00 - FET # Further-eastern European Time + 2:00 EU EE%sT # Ruthenia used CET 1990/1991. # "Uzhhorod" is the transliteration of the Ukrainian name, but # "Uzhgorod" is more common in English. @@ -2703,8 +2765,7 @@ 1:00 - CET 1991 Mar 31 3:00 2:00 - EET 1992 2:00 E-Eur EE%sT 1995 - 2:00 EU EE%sT 2011 Mar lastSun 1:00u - 3:00 - FET # Further-eastern European Time + 2:00 EU EE%sT # Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991. # "Zaporizhia" is the transliteration of the Ukrainian name, but # "Zaporozh'ye" is more common in English. Use the common English @@ -2717,8 +2778,7 @@ 1:00 C-Eur CE%sT 1943 Oct 25 3:00 Russia MSK/MSD 1991 Mar 31 2:00 2:00 E-Eur EE%sT 1995 - 2:00 EU EE%sT 2011 Mar lastSun 1:00u - 3:00 - FET # Further-eastern European Time + 2:00 EU EE%sT # Central Crimea used Moscow time 1994/1997. Zone Europe/Simferopol 2:16:24 - LMT 1880 2:16 - SMT 1924 May 2 # Simferopol Mean T @@ -2743,8 +2803,7 @@ # Assume it happened in March by not changing the clocks. 3:00 Russia MSK/MSD 1997 3:00 - MSK 1997 Mar lastSun 1:00u - 2:00 EU EE%sT 2011 Mar lastSun 1:00u - 3:00 - FET # Further-eastern European Time + 2:00 EU EE%sT ###############################################################################
--- a/make/sun/javazic/tzdata/leapseconds Fri Apr 06 17:10:17 2012 -0700 +++ b/make/sun/javazic/tzdata/leapseconds Thu Apr 12 15:53:35 2012 -0700 @@ -22,7 +22,7 @@ # questions. # # <pre> -# @(#)leapseconds 8.11 +# @(#)leapseconds 8.13 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -71,40 +71,54 @@ Leap 1998 Dec 31 23:59:60 + S Leap 2005 Dec 31 23:59:60 + S Leap 2008 Dec 31 23:59:60 + S +Leap 2012 Jun 30 23:59:60 + S # INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS) # # SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE # +# # SERVICE DE LA ROTATION TERRESTRE # OBSERVATOIRE DE PARIS # 61, Av. de l'Observatoire 75014 PARIS (France) -# Tel. : 33 (0) 1 40 51 22 29 +# Tel. : 33 (0) 1 40 51 22 26 # FAX : 33 (0) 1 40 51 22 91 -# Internet : services.iers@obspm.fr +# e-mail : (E-Mail Removed) +# http://hpiers.obspm.fr/eop-pc # -# Paris, 2 February 2011 +# Paris, 5 January 2012 # -# Bulletin C 41 +# +# Bulletin C 43 # # To authorities responsible # for the measurement and # distribution of time # -# INFORMATION ON UTC - TAI +# +# UTC TIME STEP +# on the 1st of July 2012 +# # -# NO positive leap second will be introduced at the end of June 2011. -# The difference between Coordinated Universal Time UTC and the -# International Atomic Time TAI is : +# A positive leap second will be introduced at the end of June 2012. +# The sequence of dates of the UTC second markers will be: +# +# 2012 June 30, 23h 59m 59s +# 2012 June 30, 23h 59m 60s +# 2012 July 1, 0h 0m 0s # -# from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s +# The difference between UTC and the International Atomic Time TAI is: +# +# from 2009 January 1, 0h UTC, to 2012 July 1 0h UTC : UTC-TAI = - 34s +# from 2012 July 1, 0h UTC, until further notice : UTC-TAI = - 35s # # Leap seconds can be introduced in UTC at the end of the months of December -# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every -# six months, either to announce a time step in UTC, or to confirm that there +# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every +# six months, either to announce a time step in UTC or to confirm that there # will be no time step at the next possible date. # +# # Daniel GAMBIS -# Head -# Earth Orientation Center of the IERS +# Head +# Earth Orientation Center of IERS # Observatoire de Paris, France
--- a/make/sun/javazic/tzdata/northamerica Fri Apr 06 17:10:17 2012 -0700 +++ b/make/sun/javazic/tzdata/northamerica Thu Apr 12 15:53:35 2012 -0700 @@ -22,7 +22,7 @@ # questions. # # <pre> -# @(#)northamerica 8.49 +# @(#)northamerica 8.54 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -1143,9 +1143,26 @@ # For now, assume all of DST-observing Canada will fall into line with the # new US DST rules, +# From Chris Walton (2011-12-01) +# In the first of Tammy Hardwick's articles +# <a href="http://www.ilovecreston.com/?p=articles&t=spec&ar=260"> +# http://www.ilovecreston.com/?p=articles&t=spec&ar=260 +# </a> +# she quotes the Friday November 1/1918 edition of the Creston Review. +# The quote includes these two statements: +# 'Sunday the CPR went back to the old system of time...' +# '... The daylight saving scheme was dropped all over Canada at the same time,' +# These statements refer to a transition from daylight time to standard time +# that occurred nationally on Sunday October 27/1918. This transition was +# also documented in the Saturday October 26/1918 edition of the Toronto Star. + +# In light of that evidence, we alter the date from the earlier believed +# Oct 31, to Oct 27, 1918 (and Sunday is a more likely transition day +# than Thursday) in all Canadian rulesets. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Canada 1918 only - Apr 14 2:00 1:00 D -Rule Canada 1918 only - Oct 31 2:00 0 S +Rule Canada 1918 only - Oct 27 2:00 0 S Rule Canada 1942 only - Feb 9 2:00 1:00 W # War Rule Canada 1945 only - Aug 14 23:00u 1:00 P # Peace Rule Canada 1945 only - Sep 30 2:00 0 S @@ -1668,7 +1685,7 @@ Rule Winn 1916 only - Apr 23 0:00 1:00 D Rule Winn 1916 only - Sep 17 0:00 0 S Rule Winn 1918 only - Apr 14 2:00 1:00 D -Rule Winn 1918 only - Oct 31 2:00 0 S +Rule Winn 1918 only - Oct 27 2:00 0 S Rule Winn 1937 only - May 16 2:00 1:00 D Rule Winn 1937 only - Sep 26 2:00 0 S Rule Winn 1942 only - Feb 9 2:00 1:00 W # War @@ -1751,7 +1768,7 @@ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Regina 1918 only - Apr 14 2:00 1:00 D -Rule Regina 1918 only - Oct 31 2:00 0 S +Rule Regina 1918 only - Oct 27 2:00 0 S Rule Regina 1930 1934 - May Sun>=1 0:00 1:00 D Rule Regina 1930 1934 - Oct Sun>=1 0:00 0 S Rule Regina 1937 1941 - Apr Sun>=8 0:00 1:00 D @@ -1788,7 +1805,7 @@ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Edm 1918 1919 - Apr Sun>=8 2:00 1:00 D -Rule Edm 1918 only - Oct 31 2:00 0 S +Rule Edm 1918 only - Oct 27 2:00 0 S Rule Edm 1919 only - May 27 2:00 0 S Rule Edm 1920 1923 - Apr lastSun 2:00 1:00 D Rule Edm 1920 only - Oct lastSun 2:00 0 S @@ -1818,9 +1835,68 @@ # Dawson Creek uses MST. Much of east BC is like Edmonton. # Matthews and Vincent (1998) write that Creston is like Dawson Creek. +# It seems though that (re: Creston) is not entirely correct: + +# From Chris Walton (2011-12-01): +# There are two areas within the Canadian province of British Columbia +# that do not currently observe daylight saving: +# a) The Creston Valley (includes the town of Creston and surrounding area) +# b) The eastern half of the Peace River Regional District +# (includes the cities of Dawson Creek and Fort St. John) + +# Earlier this year I stumbled across a detailed article about the time +# keeping history of Creston; it was written by Tammy Hardwick who is the +# manager of the Creston & District Museum. The article was written in May 2009. +# <a href="http://www.ilovecreston.com/?p=articles&t=spec&ar=260"> +# http://www.ilovecreston.com/?p=articles&t=spec&ar=260 +# </a> +# According to the article, Creston has not changed its clocks since June 1918. +# i.e. Creston has been stuck on UTC-7 for 93 years. +# Dawson Creek, on the other hand, changed its clocks as recently as April 1972. + +# Unfortunately the exact date for the time change in June 1918 remains +# unknown and will be difficult to ascertain. I e-mailed Tammy a few months +# ago to ask if Sunday June 2 was a reasonable guess. She said it was just +# as plausible as any other date (in June). She also said that after writing the +# article she had discovered another time change in 1916; this is the subject +# of another article which she wrote in October 2010. +# <a href="http://www.creston.museum.bc.ca/index.php?module=comments&uop=view_comment&cm+id=56"> +# http://www.creston.museum.bc.ca/index.php?module=comments&uop=view_comment&cm+id=56 +# </a> + +# Here is a summary of the three clock change events in Creston's history: +# 1. 1884 or 1885: adoption of Mountain Standard Time (GMT-7) +# Exact date unknown +# 2. Oct 1916: switch to Pacific Standard Time (GMT-8) +# Exact date in October unknown; Sunday October 1 is a reasonable guess. +# 3. June 1918: switch to Pacific Daylight Time (GMT-7) +# Exact date in June unknown; Sunday June 2 is a reasonable guess. +# note#1: +# On Oct 27/1918 when daylight saving ended in the rest of Canada, +# Creston did not change its clocks. +# note#2: +# During WWII when the Federal Government legislated a mandatory clock change, +# Creston did not oblige. +# note#3: +# There is no guarantee that Creston will remain on Mountain Standard Time +# (UTC-7) forever. +# The subject was debated at least once this year by the town Council. +# <a href="http://www.bclocalnews.com/kootenay_rockies/crestonvalleyadvance/news/116760809.html"> +# http://www.bclocalnews.com/kootenay_rockies/crestonvalleyadvance/news/116760809.html +# </a> + +# During a period WWII, summer time (Daylight saying) was mandatory in Canada. +# In Creston, that was handled by shifting the area to PST (-8:00) then applying +# summer time to cause the offset to be -7:00, the same as it had been before +# the change. It can be argued that the timezone abbreviation during this +# period should be PDT rather than MST, but that doesn't seem important enough +# (to anyone) to further complicate the rules. + +# The transition dates (and times) are guesses. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Vanc 1918 only - Apr 14 2:00 1:00 D -Rule Vanc 1918 only - Oct 31 2:00 0 S +Rule Vanc 1918 only - Oct 27 2:00 0 S Rule Vanc 1942 only - Feb 9 2:00 1:00 W # War Rule Vanc 1945 only - Aug 14 23:00u 1:00 P # Peace Rule Vanc 1945 only - Sep 30 2:00 0 S @@ -1836,7 +1912,10 @@ -8:00 Canada P%sT 1947 -8:00 Vanc P%sT 1972 Aug 30 2:00 -7:00 - MST - +Zone America/Creston -7:46:04 - LMT 1884 + -7:00 - MST 1916 Oct 1 + -8:00 - PST 1918 Jun 2 + -7:00 - MST # Northwest Territories, Nunavut, Yukon @@ -2713,6 +2792,34 @@ # <a href="http://www.timeanddate.com/news/time/cuba-starts-dst-2011.html"> # http://www.timeanddate.com/news/time/cuba-starts-dst-2011.html # </a> +# +# From Steffen Thorsen (2011-10-30) +# Cuba will end DST two weeks later this year. Instead of going back +# tonight, it has been delayed to 2011-11-13 at 01:00. +# +# One source (Spanish) +# <a href="http://www.radioangulo.cu/noticias/cuba/17105-cuba-restablecera-el-horario-del-meridiano-de-greenwich.html"> +# http://www.radioangulo.cu/noticias/cuba/17105-cuba-restablecera-el-horario-del-meridiano-de-greenwich.html +# </a> +# +# Our page: +# <a href="http://www.timeanddate.com/news/time/cuba-time-changes-2011.html"> +# http://www.timeanddate.com/news/time/cuba-time-changes-2011.html +# </a> +# +# From Steffen Thorsen (2012-03-01) +# According to Radio Reloj, Cuba will start DST on Midnight between March +# 31 and April 1. +# +# Radio Reloj has the following info (Spanish): +# <a href="http://www.radioreloj.cu/index.php/noticias-radio-reloj/71-miscelaneas/7529-cuba-aplicara-el-horario-de-verano-desde-el-1-de-abril"> +# http://www.radioreloj.cu/index.php/noticias-radio-reloj/71-miscelaneas/7529-cuba-aplicara-el-horario-de-verano-desde-el-1-de-abril +# </a> +# +# Our info on it: +# <a href="http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html"> +# http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html +# </a> # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Cuba 1928 only - Jun 10 0:00 1:00 D @@ -2744,12 +2851,15 @@ Rule Cuba 1998 1999 - Mar lastSun 0:00s 1:00 D Rule Cuba 1998 2003 - Oct lastSun 0:00s 0 S Rule Cuba 2000 2004 - Apr Sun>=1 0:00s 1:00 D -Rule Cuba 2006 max - Oct lastSun 0:00s 0 S +Rule Cuba 2006 2010 - Oct lastSun 0:00s 0 S Rule Cuba 2007 only - Mar Sun>=8 0:00s 1:00 D Rule Cuba 2008 only - Mar Sun>=15 0:00s 1:00 D Rule Cuba 2009 2010 - Mar Sun>=8 0:00s 1:00 D Rule Cuba 2011 only - Mar Sun>=15 0:00s 1:00 D -Rule Cuba 2012 max - Mar Sun>=8 0:00s 1:00 D +Rule Cuba 2011 only - Nov 13 0:00s 0 S +Rule Cuba 2012 only - Apr 1 0:00s 1:00 D +Rule Cuba 2012 max - Oct lastSun 0:00s 0 S +Rule Cuba 2013 max - Mar Sun>=8 0:00s 1:00 D # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Havana -5:29:28 - LMT 1890 @@ -2883,6 +2993,29 @@ # From Stephen Colebourne (2007-02-22): # Some IATA info: Haiti won't be having DST in 2007. +# From Steffen Thorsen (2012-03-11): +# According to several news sources, Haiti will observe DST this year, +# apparently using the same start and end date as USA/Canada. +# So this means they have already changed their time. +# +# (Sources in French): +# <a href="http://www.alterpresse.org/spip.php?article12510"> +# http://www.alterpresse.org/spip.php?article12510 +# </a> +# <a href="http://radiovision2000haiti.net/home/?p=13253"> +# http://radiovision2000haiti.net/home/?p=13253 +# </a> +# +# Our coverage: +# <a href="http://www.timeanddate.com/news/time/haiti-dst-2012.html"> +# http://www.timeanddate.com/news/time/haiti-dst-2012.html +# </a> + +# From Arthur David Olson (2012-03-11): +# The alterpresse.org source seems to show a US-style leap from 2:00 a.m. to +# 3:00 a.m. rather than the traditional Haitian jump at midnight. +# Assume a US-style fall back as well XXX. +# Do not yet assume that the change carries forward past 2012 XXX. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Haiti 1983 only - May 8 0:00 1:00 D @@ -2894,6 +3027,8 @@ Rule Haiti 1988 1997 - Oct lastSun 1:00s 0 S Rule Haiti 2005 2006 - Apr Sun>=1 0:00 1:00 D Rule Haiti 2005 2006 - Oct lastSun 0:00 0 S +Rule Haiti 2012 only - Mar Sun>=8 2:00 1:00 D +Rule Haiti 2012 only - Nov Sun>=1 2:00 0 S # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Port-au-Prince -4:49:20 - LMT 1890 -4:49 - PPMT 1917 Jan 24 12:00 # P-a-P MT
--- a/make/sun/javazic/tzdata/southamerica Fri Apr 06 17:10:17 2012 -0700 +++ b/make/sun/javazic/tzdata/southamerica Thu Apr 12 15:53:35 2012 -0700 @@ -22,7 +22,7 @@ # questions. # # <pre> -# @(#)southamerica 8.50 +# @(#)southamerica 8.53 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -841,6 +841,19 @@ # oficial agency about time in Brazil, and she confirmed that the old rule is # still in force. +# From Guilherme Bernardes Rodrigues (2011-10-14) +# It's official, the President signed a decree that includes Bahia in summer +# time. +# [ and in a second message (same day): ] +# I found the decree. +# +# DECRETO No- 7.584, DE 13 DE OUTUBRO DE 2011 +# Link : +# <a href="http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6"> +# http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6 +# </a> + + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S # Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01) # Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a> (1932-01-10) @@ -1077,10 +1090,8 @@ # of America/Salvador. Zone America/Bahia -2:34:04 - LMT 1914 -3:00 Brazil BR%sT 2003 Sep 24 - -3:00 - BRT -# as noted above, not yet in operation. -# -3:00 - BRT 2011 Oct 16 -# -3:00 Brazil BR%sT + -3:00 - BRT 2011 Oct 16 + -3:00 Brazil BR%sT # # Goias (GO), Distrito Federal (DF), Minas Gerais (MG), # Espirito Santo (ES), Rio de Janeiro (RJ), Sao Paulo (SP), Parana (PR), @@ -1230,6 +1241,28 @@ # August, not in October as they have since 1968. This is a pilot plan # which will be reevaluated in 2012. +# From Mauricio Parada (2012-02-22), translated by Glenn Eychaner (2012-02-23): +# As stated in the website of the Chilean Energy Ministry +# http://www.minenergia.cl/ministerio/noticias/generales/gobierno-anuncia-fechas-de-cambio-de.html +# The Chilean Government has decided to postpone the entrance into winter time +# (to leave DST) from March 11 2012 to April 28th 2012. The decision has not +# been yet formalized but it will within the next days. +# Quote from the website communication: +# +# 6. For the year 2012, the dates of entry into winter time will be as follows: +# a. Saturday April 28, 2012, clocks should go back 60 minutes; that is, at +# 23:59:59, instead of passing to 0:00, the time should be adjusted to be 23:00 +# of the same day. +# b. Saturday, September 1, 2012, clocks should go forward 60 minutes; that is, +# at 23:59:59, instead of passing to 0:00, the time should be adjusted to be +# 01:00 on September 2. +# +# Note that...this is yet another "temporary" change that will be reevaluated +# AGAIN in 2013. + +# NOTE: ChileAQ rules for Antarctic bases are stored separately in the +# 'antarctica' file. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Chile 1927 1932 - Sep 1 0:00 1:00 S Rule Chile 1928 1932 - Apr 1 0:00 0 - @@ -1260,8 +1293,6 @@ Rule Chile 1998 only - Sep 27 4:00u 1:00 S Rule Chile 1999 only - Apr 4 3:00u 0 - Rule Chile 1999 2010 - Oct Sun>=9 4:00u 1:00 S -Rule Chile 2011 only - Aug Sun>=16 4:00u 1:00 S -Rule Chile 2012 max - Oct Sun>=9 4:00u 1:00 S Rule Chile 2000 2007 - Mar Sun>=9 3:00u 0 - # N.B.: the end of March 29 in Chile is March 30 in Universal time, # which is used below in specifying the transition. @@ -1269,7 +1300,11 @@ Rule Chile 2009 only - Mar Sun>=9 3:00u 0 - Rule Chile 2010 only - Apr Sun>=1 3:00u 0 - Rule Chile 2011 only - May Sun>=2 3:00u 0 - -Rule Chile 2012 max - Mar Sun>=9 3:00u 0 - +Rule Chile 2011 only - Aug Sun>=16 4:00u 1:00 S +Rule Chile 2012 only - Apr Sun>=23 3:00u 0 - +Rule Chile 2012 only - Sep Sun>=2 4:00u 1:00 S +Rule Chile 2013 max - Mar Sun>=9 3:00u 0 - +Rule Chile 2013 max - Oct Sun>=9 4:00u 1:00 S # IATA SSIM anomalies: (1992-02) says 1992-03-14; # (1996-09) says 1998-03-08. Ignore these. # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -1415,6 +1450,21 @@ # will not revert to local mean time, but clocks will remain on Summer # time (UTC/GMT - 3 hours) throughout the whole of 2011. Any long term # change to local time following the trial period will be notified. +# +# From Andrew Newman (2012-02-24) +# A letter from Justin McPhee, Chief Executive, +# Cable & Wireless Falkland Islands (dated 2012-02-22) +# states... +# The current Atlantic/Stanley entry under South America expects the +# clocks to go back to standard Falklands Time (FKT) on the 15th April. +# The database entry states that in 2011 Stanley was staying on fixed +# summer time on a trial basis only. FIG need to contact IANA and/or +# the maintainers of the database to inform them we're adopting +# the same policy this year and suggest recommendations for future years. +# +# For now we will assume permanent summer time for the Falklands +# until advised differently (to apply for 2012 and beyond, after the 2011 +# experiment was apparently successful.) # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Falk 1937 1938 - Sep lastSun 0:00 1:00 S Rule Falk 1938 1942 - Mar Sun>=19 0:00 0 - @@ -1427,14 +1477,14 @@ Rule Falk 1985 2000 - Sep Sun>=9 0:00 1:00 S Rule Falk 1986 2000 - Apr Sun>=16 0:00 0 - Rule Falk 2001 2010 - Apr Sun>=15 2:00 0 - -Rule Falk 2012 max - Apr Sun>=15 2:00 0 - -Rule Falk 2001 max - Sep Sun>=1 2:00 1:00 S +Rule Falk 2001 2010 - Sep Sun>=1 2:00 1:00 S # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Atlantic/Stanley -3:51:24 - LMT 1890 -3:51:24 - SMT 1912 Mar 12 # Stanley Mean Time -4:00 Falk FK%sT 1983 May # Falkland Is Time -3:00 Falk FK%sT 1985 Sep 15 - -4:00 Falk FK%sT + -4:00 Falk FK%sT 2010 Sep 5 02:00 + -3:00 - FKST # French Guiana # Zone NAME GMTOFF RULES FORMAT [UNTIL]
--- a/make/sun/javazic/tzdata/zone.tab Fri Apr 06 17:10:17 2012 -0700 +++ b/make/sun/javazic/tzdata/zone.tab Thu Apr 12 15:53:35 2012 -0700 @@ -22,7 +22,7 @@ # questions. # # <pre> -# @(#)zone.tab 8.49 +# @(#)zone.tab 8.55 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. # @@ -154,6 +154,7 @@ CA +690650-1050310 America/Cambridge_Bay Mountain Time - west Nunavut CA +6227-11421 America/Yellowknife Mountain Time - central Northwest Territories CA +682059-1334300 America/Inuvik Mountain Time - west Northwest Territories +CA +4906-11631 America/Creston Mountain Standard Time - Creston, British Columbia CA +5946-12014 America/Dawson_Creek Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia CA +4916-12307 America/Vancouver Pacific Time - west British Columbia CA +6043-13503 America/Whitehorse Pacific Time - south Yukon @@ -356,7 +357,7 @@ RU +5443+02030 Europe/Kaliningrad Moscow-01 - Kaliningrad RU +5545+03735 Europe/Moscow Moscow+00 - west Russia RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea -RU +5312+05009 Europe/Samara Moscow - Samara, Udmurtia +RU +5312+05009 Europe/Samara Moscow+00 - Samara, Udmurtia RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/macosx/bin/x86_64/jvm.cfg Thu Apr 12 15:53:35 2012 -0700 @@ -0,0 +1,39 @@ +# +# Copyright (c) 2012, 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 +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# +# List of JVMs that can be used as an option to java, javac, etc. +# Order is important -- first in this list is the default JVM. +# NOTE that this both this file and its format are UNSUPPORTED and +# WILL GO AWAY in a future release. +# +# You may also select a JVM in an arbitrary location with the +# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported +# and may not be available in a future release. +# +-server KNOWN +-client IGNORE +-hotspot ERROR +-classic WARN +-native ERROR +-green ERROR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/macosx/classes/java/lang/ClassLoaderHelper.java Thu Apr 12 15:53:35 2012 -0700 @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2012, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package java.lang; + +import java.io.File; + +class ClassLoaderHelper { + + private ClassLoaderHelper() {} + + /** + * Returns an alternate path name for the given file + * such that if the original pathname did not exist, then the + * file may be located at the alternate location. + * For mac, this replaces the final .dylib suffix with .jnilib + */ + static File mapAlternativeName(File lib) { + String name = lib.toString(); + int index = name.toLowerCase().lastIndexOf(".dylib"); + if (index < 0) { + return null; + } + return new File(name.substring(0, index) + ".jnilib"); + } +}
--- a/src/macosx/native/sun/awt/awt.m Fri Apr 06 17:10:17 2012 -0700 +++ b/src/macosx/native/sun/awt/awt.m Thu Apr 12 15:53:35 2012 -0700 @@ -307,16 +307,18 @@ if (verbose) AWT_DEBUG_LOG(@"got out of the AppKit startup mutex"); } - // Don't set the delegate until the NSApplication has been created and - // its finishLaunching has initialized it. - // ApplicationDelegate is the support code for com.apple.eawt. - void (^setDelegateBlock)() = ^(){ - OSXAPP_SetApplicationDelegate([ApplicationDelegate sharedDelegate]); - }; - if (onMainThread) { - setDelegateBlock(); - } else { - [JNFRunLoop performOnMainThreadWaiting:YES withBlock:setDelegateBlock]; + if (!headless) { + // Don't set the delegate until the NSApplication has been created and + // its finishLaunching has initialized it. + // ApplicationDelegate is the support code for com.apple.eawt. + void (^setDelegateBlock)() = ^(){ + OSXAPP_SetApplicationDelegate([ApplicationDelegate sharedDelegate]); + }; + if (onMainThread) { + setDelegateBlock(); + } else { + [JNFRunLoop performOnMainThreadWaiting:YES withBlock:setDelegateBlock]; + } } }
--- a/src/macosx/native/sun/java2d/opengl/CGLGraphicsConfig.m Fri Apr 06 17:10:17 2012 -0700 +++ b/src/macosx/native/sun/java2d/opengl/CGLGraphicsConfig.m Thu Apr 12 15:53:35 2012 -0700 @@ -312,7 +312,10 @@ GLint contextVirtualScreen = [context currentVirtualScreen]; #if USE_NSVIEW_FOR_SCRATCH - [context setView: scratchSurface]; + /* the scratch surface will be set to the view + * later on the flusher thread by OGLSD_SetScratchSurface. + */ + //[context setView: scratchSurface]; #else [context setPixelBuffer: scratchSurface
--- a/src/share/classes/java/lang/ClassLoader.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/share/classes/java/lang/ClassLoader.java Thu Apr 12 15:53:35 2012 -0700 @@ -1861,6 +1861,17 @@ } private static boolean loadLibrary0(Class fromClass, final File file) { + if (loadLibrary1(fromClass, file)) { + return true; + } + final File libfile = ClassLoaderHelper.mapAlternativeName(file); + if (libfile != null && loadLibrary1(fromClass, libfile)) { + return true; + } + return false; + } + + private static boolean loadLibrary1(Class fromClass, final File file) { boolean exists = AccessController.doPrivileged( new PrivilegedAction<Object>() { public Object run() {
--- a/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2012, 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 @@ -62,7 +62,7 @@ /** * flag set if the native connect() call not to be used */ - private final static boolean connectDisabled = os.startsWith("Mac OS"); + private final static boolean connectDisabled = os.contains("OS X"); /** * Load net library into runtime.
--- a/src/share/classes/java/nio/Bits.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/share/classes/java/nio/Bits.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2012, 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 @@ -609,7 +609,7 @@ String arch = AccessController.doPrivileged( new sun.security.action.GetPropertyAction("os.arch")); unaligned = arch.equals("i386") || arch.equals("x86") - || arch.equals("amd64"); + || arch.equals("amd64") || arch.equals("x86_64"); unalignedKnown = true; return unaligned; }
--- a/src/share/classes/java/util/prefs/Preferences.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/share/classes/java/util/prefs/Preferences.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2012, 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 @@ -295,7 +295,7 @@ String platformFactory; if (osName.startsWith("Windows")) { platformFactory = "java.util.prefs.WindowsPreferencesFactory"; - } else if (osName.startsWith("Mac OS X")) { + } else if (osName.contains("OS X")) { platformFactory = "java.util.prefs.MacOSXPreferencesFactory"; } else { platformFactory = "java.util.prefs.FileSystemPreferencesFactory";
--- a/src/share/classes/sun/awt/OSInfo.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/share/classes/sun/awt/OSInfo.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, 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 @@ -101,7 +101,7 @@ return SOLARIS; } - if (osName.startsWith("Mac OS X")) { + if (osName.contains("OS X")) { return MACOSX; }
--- a/src/share/classes/sun/font/FontUtilities.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/share/classes/sun/font/FontUtilities.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2012, 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 @@ -78,7 +78,7 @@ isLinux = osName.startsWith("Linux"); - isMacOSX = osName.startsWith("Mac OS X"); // TODO: MacOSX + isMacOSX = osName.contains("OS X"); // TODO: MacOSX String t2kStr = System.getProperty("sun.java2d.font.scaler"); if (t2kStr != null) {
--- a/src/share/classes/sun/launcher/LauncherHelper.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/share/classes/sun/launcher/LauncherHelper.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2012, 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 @@ -381,7 +381,7 @@ PrintStream ostream = (printToStderr) ? System.err : System.out; ostream.println(getLocalizedMessage("java.launcher.X.usage", File.pathSeparator)); - if (System.getProperty("os.name").startsWith("Mac OS")) { + if (System.getProperty("os.name").contains("OS X")) { ostream.println(getLocalizedMessage("java.launcher.X.macosx.usage", File.pathSeparator)); }
--- a/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2012, 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 @@ -1280,7 +1280,7 @@ String osName = AccessController.doPrivileged( new GetPropertyAction("os.name")); if ("SunOS".equals(osName) || "Linux".equals(osName) - || osName.startsWith("Mac OS")) { + || osName.contains("OS X")) { charset("x-COMPOUND_TEXT", "COMPOUND_TEXT", new String[] { "COMPOUND_TEXT", // JDK historical
--- a/src/share/classes/sun/print/PSPrinterJob.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/share/classes/sun/print/PSPrinterJob.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2012, 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 @@ -1537,7 +1537,7 @@ } String osname = System.getProperty("os.name"); - if (osname.equals("Linux") || osname.startsWith("Mac OS X")) { + if (osname.equals("Linux") || osname.contains("OS X")) { execCmd = new String[ncomps]; execCmd[n++] = "/usr/bin/lpr"; if ((pFlags & PRINTER) != 0) {
--- a/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, 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 @@ -89,7 +89,7 @@ "libgssapi_krb5.so", "libgssapi_krb5.so.2", }; - } else if (osname.startsWith("Mac OS X")) { + } else if (osname.contains("OS X")) { gssLibs = new String[]{ "/usr/lib/sasl2/libgssapiv2.2.so", };
--- a/src/share/classes/sun/security/krb5/Config.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/share/classes/sun/security/krb5/Config.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2012, 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 @@ -729,7 +729,7 @@ } } else if (osname.startsWith("SunOS")) { name = "/etc/krb5/krb5.conf"; - } else if (osname.startsWith("Mac")) { + } else if (osname.contains("OS X")) { if (isMacosLionOrBetter()) return ""; name = findMacosConfigFile(); } else {
--- a/src/share/classes/sun/security/krb5/Credentials.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/share/classes/sun/security/krb5/Credentials.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2012, 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 @@ -289,7 +289,7 @@ String os = java.security.AccessController.doPrivileged( new sun.security.action.GetPropertyAction("os.name")); if (os.toUpperCase(Locale.ENGLISH).startsWith("WINDOWS") || - os.toUpperCase(Locale.ENGLISH).startsWith("MAC")) { + os.toUpperCase(Locale.ENGLISH).contains("OS X")) { Credentials creds = acquireDefaultCreds(); if (creds == null) { if (DEBUG) { @@ -471,7 +471,7 @@ java.security.AccessController.doPrivileged( new java.security.PrivilegedAction<Void> () { public Void run() { - if (System.getProperty("os.name").startsWith("Mac")) { + if (System.getProperty("os.name").contains("OS X")) { System.loadLibrary("osxkrb5"); } else { System.loadLibrary("w2k_lsa_auth");
--- a/src/share/classes/sun/security/provider/ByteArrayAccess.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/share/classes/sun/security/provider/ByteArrayAccess.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2012, 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 @@ -95,7 +95,8 @@ private static boolean unaligned() { String arch = java.security.AccessController.doPrivileged (new sun.security.action.GetPropertyAction("os.arch", "")); - return arch.equals("i386") || arch.equals("x86") || arch.equals("amd64"); + return arch.equals("i386") || arch.equals("x86") || arch.equals("amd64") + || arch.equals("x86_64"); } /**
--- a/src/share/classes/sun/security/ssl/SSLContextImpl.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/share/classes/sun/security/ssl/SSLContextImpl.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2012, 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 @@ -770,12 +770,8 @@ // the delegated trust manager private final X509TrustManager tm; - // Cache the trusted certificate to optimize the performance. - private final Collection<X509Certificate> trustedCerts = new HashSet<>(); - AbstractTrustManagerWrapper(X509TrustManager tm) { this.tm = tm; - Collections.addAll(trustedCerts, tm.getAcceptedIssuers()); } @Override @@ -916,6 +912,13 @@ try { // Does the certificate chain end with a trusted certificate? int checkedLength = chain.length - 1; + + Collection<X509Certificate> trustedCerts = new HashSet<>(); + X509Certificate[] certs = tm.getAcceptedIssuers(); + if ((certs != null) && (certs.length > 0)){ + Collections.addAll(trustedCerts, certs); + } + if (trustedCerts.contains(chain[checkedLength])) { checkedLength--; }
--- a/src/share/classes/sun/util/resources/TimeZoneNames.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/share/classes/sun/util/resources/TimeZoneNames.java Thu Apr 12 15:53:35 2012 -0700 @@ -333,6 +333,7 @@ "French Guiana Summer Time", "GFST"}}, {"America/Cayman", EST}, {"America/Chihuahua", MST}, + {"America/Creston", MST}, {"America/Coral_Harbour", EST}, {"America/Cordoba", AGT}, {"America/Costa_Rica", CST}, @@ -678,7 +679,7 @@ {"Europe/Istanbul", EET}, {"Europe/Jersey", GMTBST}, {"Europe/Kaliningrad", FET}, - {"Europe/Kiev", FET}, + {"Europe/Kiev", EET}, {"Europe/Lisbon", WET}, {"Europe/Ljubljana", CET}, {"Europe/London", GMTBST}, @@ -699,14 +700,14 @@ "Samara Summer Time", "SAMST"}}, {"Europe/San_Marino", CET}, {"Europe/Sarajevo", CET}, - {"Europe/Simferopol", FET}, + {"Europe/Simferopol", EET}, {"Europe/Skopje", CET}, {"Europe/Sofia", EET}, {"Europe/Stockholm", CET}, {"Europe/Tallinn", EET}, {"Europe/Tirane", CET}, {"Europe/Tiraspol", EET}, - {"Europe/Uzhgorod", FET}, + {"Europe/Uzhgorod", EET}, {"Europe/Vaduz", CET}, {"Europe/Vatican", CET}, {"Europe/Vienna", CET}, @@ -715,7 +716,7 @@ "Volgograd Summer Time", "VOLST"}}, {"Europe/Warsaw", CET}, {"Europe/Zagreb", CET}, - {"Europe/Zaporozhye", FET}, + {"Europe/Zaporozhye", EET}, {"Europe/Zurich", CET}, {"GB", GMTBST}, {"GB-Eire", GMTBST},
--- a/src/share/classes/sun/util/resources/TimeZoneNames_de.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/share/classes/sun/util/resources/TimeZoneNames_de.java Thu Apr 12 15:53:35 2012 -0700 @@ -333,6 +333,7 @@ "Franz\u00f6sisch-Guiana Sommerzeit", "GFST"}}, {"America/Cayman", EST}, {"America/Chihuahua", MST}, + {"America/Creston", MST}, {"America/Coral_Harbour", EST}, {"America/Cordoba", AGT}, {"America/Costa_Rica", CST}, @@ -678,7 +679,7 @@ {"Europe/Istanbul", EET}, {"Europe/Jersey", GMTBST}, {"Europe/Kaliningrad", FET}, - {"Europe/Kiev", FET}, + {"Europe/Kiev", EET}, {"Europe/Lisbon", WET}, {"Europe/Ljubljana", CET}, {"Europe/London", GMTBST}, @@ -699,14 +700,14 @@ "Samarische Sommerzeit", "SAMST"}}, {"Europe/San_Marino", CET}, {"Europe/Sarajevo", CET}, - {"Europe/Simferopol", FET}, + {"Europe/Simferopol", EET}, {"Europe/Skopje", CET}, {"Europe/Sofia", EET}, {"Europe/Stockholm", CET}, {"Europe/Tallinn", EET}, {"Europe/Tirane", CET}, {"Europe/Tiraspol", EET}, - {"Europe/Uzhgorod", FET}, + {"Europe/Uzhgorod", EET}, {"Europe/Vaduz", CET}, {"Europe/Vatican", CET}, {"Europe/Vienna", CET}, @@ -715,7 +716,7 @@ "Wolgograder Sommerzeit", "VOLST"}}, {"Europe/Warsaw", CET}, {"Europe/Zagreb", CET}, - {"Europe/Zaporozhye", FET}, + {"Europe/Zaporozhye", EET}, {"Europe/Zurich", CET}, {"GB", GMTBST}, {"GB-Eire", GMTBST},
--- a/src/share/classes/sun/util/resources/TimeZoneNames_es.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/share/classes/sun/util/resources/TimeZoneNames_es.java Thu Apr 12 15:53:35 2012 -0700 @@ -333,6 +333,7 @@ "Hora de verano de la Guayana Francesa", "GFST"}}, {"America/Cayman", EST}, {"America/Chihuahua", MST}, + {"America/Creston", MST}, {"America/Coral_Harbour", EST}, {"America/Cordoba", AGT}, {"America/Costa_Rica", CST}, @@ -678,7 +679,7 @@ {"Europe/Istanbul", EET}, {"Europe/Jersey", GMTBST}, {"Europe/Kaliningrad", FET}, - {"Europe/Kiev", FET}, + {"Europe/Kiev", EET}, {"Europe/Lisbon", WET}, {"Europe/Ljubljana", CET}, {"Europe/London", GMTBST}, @@ -699,14 +700,14 @@ "Hora de verano de Samara", "SAMST"}}, {"Europe/San_Marino", CET}, {"Europe/Sarajevo", CET}, - {"Europe/Simferopol", FET}, + {"Europe/Simferopol", EET}, {"Europe/Skopje", CET}, {"Europe/Sofia", EET}, {"Europe/Stockholm", CET}, {"Europe/Tallinn", EET}, {"Europe/Tirane", CET}, {"Europe/Tiraspol", EET}, - {"Europe/Uzhgorod", FET}, + {"Europe/Uzhgorod", EET}, {"Europe/Vaduz", CET}, {"Europe/Vatican", CET}, {"Europe/Vienna", CET}, @@ -715,7 +716,7 @@ "Hora de verano de Volgogrado", "VOLST"}}, {"Europe/Warsaw", CET}, {"Europe/Zagreb", CET}, - {"Europe/Zaporozhye", FET}, + {"Europe/Zaporozhye", EET}, {"Europe/Zurich", CET}, {"GB", GMTBST}, {"GB-Eire", GMTBST},
--- a/src/share/classes/sun/util/resources/TimeZoneNames_fr.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/share/classes/sun/util/resources/TimeZoneNames_fr.java Thu Apr 12 15:53:35 2012 -0700 @@ -333,6 +333,7 @@ "Heure d'\u00e9t\u00e9 de Guyane fran\u00e7aise", "GFST"}}, {"America/Cayman", EST}, {"America/Chihuahua", MST}, + {"America/Creston", MST}, {"America/Coral_Harbour", EST}, {"America/Cordoba", AGT}, {"America/Costa_Rica", CST}, @@ -678,7 +679,7 @@ {"Europe/Istanbul", EET}, {"Europe/Jersey", GMTBST}, {"Europe/Kaliningrad", FET}, - {"Europe/Kiev", FET}, + {"Europe/Kiev", EET}, {"Europe/Lisbon", WET}, {"Europe/Ljubljana", CET}, {"Europe/London", GMTBST}, @@ -699,14 +700,14 @@ "Heure d'\u00e9t\u00e9 de Samara", "SAMST"}}, {"Europe/San_Marino", CET}, {"Europe/Sarajevo", CET}, - {"Europe/Simferopol", FET}, + {"Europe/Simferopol", EET}, {"Europe/Skopje", CET}, {"Europe/Sofia", EET}, {"Europe/Stockholm", CET}, {"Europe/Tallinn", EET}, {"Europe/Tirane", CET}, {"Europe/Tiraspol", EET}, - {"Europe/Uzhgorod", FET}, + {"Europe/Uzhgorod", EET}, {"Europe/Vaduz", CET}, {"Europe/Vatican", CET}, {"Europe/Vienna", CET}, @@ -715,7 +716,7 @@ "Heure d'\u00e9t\u00e9 de Volgograd", "VOLST"}}, {"Europe/Warsaw", CET}, {"Europe/Zagreb", CET}, - {"Europe/Zaporozhye", FET}, + {"Europe/Zaporozhye", EET}, {"Europe/Zurich", CET}, {"GB", GMTBST}, {"GB-Eire", GMTBST},
--- a/src/share/classes/sun/util/resources/TimeZoneNames_it.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/share/classes/sun/util/resources/TimeZoneNames_it.java Thu Apr 12 15:53:35 2012 -0700 @@ -333,6 +333,7 @@ "Ora estiva della Guyana Francese", "GFST"}}, {"America/Cayman", EST}, {"America/Chihuahua", MST}, + {"America/Creston", MST}, {"America/Coral_Harbour", EST}, {"America/Cordoba", AGT}, {"America/Costa_Rica", CST}, @@ -678,7 +679,7 @@ {"Europe/Istanbul", EET}, {"Europe/Jersey", GMTBST}, {"Europe/Kaliningrad", FET}, - {"Europe/Kiev", FET}, + {"Europe/Kiev", EET}, {"Europe/Lisbon", WET}, {"Europe/Ljubljana", CET}, {"Europe/London", GMTBST}, @@ -699,14 +700,14 @@ "Ora estiva di Samara", "SAMST"}}, {"Europe/San_Marino", CET}, {"Europe/Sarajevo", CET}, - {"Europe/Simferopol", FET}, + {"Europe/Simferopol", EET}, {"Europe/Skopje", CET}, {"Europe/Sofia", EET}, {"Europe/Stockholm", CET}, {"Europe/Tallinn", EET}, {"Europe/Tirane", CET}, {"Europe/Tiraspol", EET}, - {"Europe/Uzhgorod", FET}, + {"Europe/Uzhgorod", EET}, {"Europe/Vaduz", CET}, {"Europe/Vatican", CET}, {"Europe/Vienna", CET}, @@ -715,7 +716,7 @@ "Ora estiva di Volgograd", "VOLST"}}, {"Europe/Warsaw", CET}, {"Europe/Zagreb", CET}, - {"Europe/Zaporozhye", FET}, + {"Europe/Zaporozhye", EET}, {"Europe/Zurich", CET}, {"GB", GMTBST}, {"GB-Eire", GMTBST},
--- a/src/share/classes/sun/util/resources/TimeZoneNames_ja.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/share/classes/sun/util/resources/TimeZoneNames_ja.java Thu Apr 12 15:53:35 2012 -0700 @@ -333,6 +333,7 @@ "\u4ecf\u9818\u30ae\u30a2\u30ca\u590f\u6642\u9593", "GFST"}}, {"America/Cayman", EST}, {"America/Chihuahua", MST}, + {"America/Creston", MST}, {"America/Coral_Harbour", EST}, {"America/Cordoba", AGT}, {"America/Costa_Rica", CST}, @@ -678,7 +679,7 @@ {"Europe/Istanbul", EET}, {"Europe/Jersey", GMTBST}, {"Europe/Kaliningrad", FET}, - {"Europe/Kiev", FET}, + {"Europe/Kiev", EET}, {"Europe/Lisbon", WET}, {"Europe/Ljubljana", CET}, {"Europe/London", GMTBST}, @@ -699,14 +700,14 @@ "\u30b5\u30de\u30e9\u590f\u6642\u9593", "SAMST"}}, {"Europe/San_Marino", CET}, {"Europe/Sarajevo", CET}, - {"Europe/Simferopol", FET}, + {"Europe/Simferopol", EET}, {"Europe/Skopje", CET}, {"Europe/Sofia", EET}, {"Europe/Stockholm", CET}, {"Europe/Tallinn", EET}, {"Europe/Tirane", CET}, {"Europe/Tiraspol", EET}, - {"Europe/Uzhgorod", FET}, + {"Europe/Uzhgorod", EET}, {"Europe/Vaduz", CET}, {"Europe/Vatican", CET}, {"Europe/Vienna", CET}, @@ -715,7 +716,7 @@ "\u30dc\u30eb\u30b4\u30b0\u30e9\u30fc\u30c9\u590f\u6642\u9593", "VOLST"}}, {"Europe/Warsaw", CET}, {"Europe/Zagreb", CET}, - {"Europe/Zaporozhye", FET}, + {"Europe/Zaporozhye", EET}, {"Europe/Zurich", CET}, {"GB", GMTBST}, {"GB-Eire", GMTBST},
--- a/src/share/classes/sun/util/resources/TimeZoneNames_ko.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/share/classes/sun/util/resources/TimeZoneNames_ko.java Thu Apr 12 15:53:35 2012 -0700 @@ -333,6 +333,7 @@ "\ud504\ub791\uc2a4\ub839 \uae30\uc544\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "GFST"}}, {"America/Cayman", EST}, {"America/Chihuahua", MST}, + {"America/Creston", MST}, {"America/Coral_Harbour", EST}, {"America/Cordoba", AGT}, {"America/Costa_Rica", CST}, @@ -678,7 +679,7 @@ {"Europe/Istanbul", EET}, {"Europe/Jersey", GMTBST}, {"Europe/Kaliningrad", FET}, - {"Europe/Kiev", FET}, + {"Europe/Kiev", EET}, {"Europe/Lisbon", WET}, {"Europe/Ljubljana", CET}, {"Europe/London", GMTBST}, @@ -699,14 +700,14 @@ "\uc0ac\ub9c8\ub77c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SAMST"}}, {"Europe/San_Marino", CET}, {"Europe/Sarajevo", CET}, - {"Europe/Simferopol", FET}, + {"Europe/Simferopol", EET}, {"Europe/Skopje", CET}, {"Europe/Sofia", EET}, {"Europe/Stockholm", CET}, {"Europe/Tallinn", EET}, {"Europe/Tirane", CET}, {"Europe/Tiraspol", EET}, - {"Europe/Uzhgorod", FET}, + {"Europe/Uzhgorod", EET}, {"Europe/Vaduz", CET}, {"Europe/Vatican", CET}, {"Europe/Vienna", CET}, @@ -715,7 +716,7 @@ "\ubcfc\uace0\uadf8\ub77c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VOLST"}}, {"Europe/Warsaw", CET}, {"Europe/Zagreb", CET}, - {"Europe/Zaporozhye", FET}, + {"Europe/Zaporozhye", EET}, {"Europe/Zurich", CET}, {"GB", GMTBST}, {"GB-Eire", GMTBST},
--- a/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Thu Apr 12 15:53:35 2012 -0700 @@ -333,6 +333,7 @@ "Fuso hor\u00e1rio de ver\u00e3o da Guiana Francesa", "GFST"}}, {"America/Cayman", EST}, {"America/Chihuahua", MST}, + {"America/Creston", MST}, {"America/Coral_Harbour", EST}, {"America/Cordoba", AGT}, {"America/Costa_Rica", CST}, @@ -678,7 +679,7 @@ {"Europe/Istanbul", EET}, {"Europe/Jersey", GMTBST}, {"Europe/Kaliningrad", FET}, - {"Europe/Kiev", FET}, + {"Europe/Kiev", EET}, {"Europe/Lisbon", WET}, {"Europe/Ljubljana", CET}, {"Europe/London", GMTBST}, @@ -699,14 +700,14 @@ "Fuso hor\u00e1rio de ver\u00e3o de Samara", "SAMST"}}, {"Europe/San_Marino", CET}, {"Europe/Sarajevo", CET}, - {"Europe/Simferopol", FET}, + {"Europe/Simferopol", EET}, {"Europe/Skopje", CET}, {"Europe/Sofia", EET}, {"Europe/Stockholm", CET}, {"Europe/Tallinn", EET}, {"Europe/Tirane", CET}, {"Europe/Tiraspol", EET}, - {"Europe/Uzhgorod", FET}, + {"Europe/Uzhgorod", EET}, {"Europe/Vaduz", CET}, {"Europe/Vatican", CET}, {"Europe/Vienna", CET}, @@ -715,7 +716,7 @@ "Fuso hor\u00e1rio de ver\u00e3o de Volgogrado", "VOLST"}}, {"Europe/Warsaw", CET}, {"Europe/Zagreb", CET}, - {"Europe/Zaporozhye", FET}, + {"Europe/Zaporozhye", EET}, {"Europe/Zurich", CET}, {"GB", GMTBST}, {"GB-Eire", GMTBST},
--- a/src/share/classes/sun/util/resources/TimeZoneNames_sv.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/share/classes/sun/util/resources/TimeZoneNames_sv.java Thu Apr 12 15:53:35 2012 -0700 @@ -333,6 +333,7 @@ "Franska Guyana, sommartid", "GFST"}}, {"America/Cayman", EST}, {"America/Chihuahua", MST}, + {"America/Creston", MST}, {"America/Coral_Harbour", EST}, {"America/Cordoba", AGT}, {"America/Costa_Rica", CST}, @@ -678,7 +679,7 @@ {"Europe/Istanbul", EET}, {"Europe/Jersey", GMTBST}, {"Europe/Kaliningrad", FET}, - {"Europe/Kiev", FET}, + {"Europe/Kiev", EET}, {"Europe/Lisbon", WET}, {"Europe/Ljubljana", CET}, {"Europe/London", GMTBST}, @@ -699,14 +700,14 @@ "Samara, sommartid", "SAMST"}}, {"Europe/San_Marino", CET}, {"Europe/Sarajevo", CET}, - {"Europe/Simferopol", FET}, + {"Europe/Simferopol", EET}, {"Europe/Skopje", CET}, {"Europe/Sofia", EET}, {"Europe/Stockholm", CET}, {"Europe/Tallinn", EET}, {"Europe/Tirane", CET}, {"Europe/Tiraspol", EET}, - {"Europe/Uzhgorod", FET}, + {"Europe/Uzhgorod", EET}, {"Europe/Vaduz", CET}, {"Europe/Vatican", CET}, {"Europe/Vienna", CET}, @@ -715,7 +716,7 @@ "Volgograd, sommartid", "VOLST"}}, {"Europe/Warsaw", CET}, {"Europe/Zagreb", CET}, - {"Europe/Zaporozhye", FET}, + {"Europe/Zaporozhye", EET}, {"Europe/Zurich", CET}, {"GB", GMTBST}, {"GB-Eire", GMTBST},
--- a/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java Thu Apr 12 15:53:35 2012 -0700 @@ -333,6 +333,7 @@ "\u6cd5\u5c5e\u572d\u4e9a\u90a3\u590f\u4ee4\u65f6", "GFST"}}, {"America/Cayman", EST}, {"America/Chihuahua", MST}, + {"America/Creston", MST}, {"America/Coral_Harbour", EST}, {"America/Cordoba", AGT}, {"America/Costa_Rica", CST}, @@ -678,7 +679,7 @@ {"Europe/Istanbul", EET}, {"Europe/Jersey", GMTBST}, {"Europe/Kaliningrad", FET}, - {"Europe/Kiev", FET}, + {"Europe/Kiev", EET}, {"Europe/Lisbon", WET}, {"Europe/Ljubljana", CET}, {"Europe/London", GMTBST}, @@ -699,14 +700,14 @@ "\u6c99\u9a6c\u62c9\u590f\u4ee4\u65f6", "SAMST"}}, {"Europe/San_Marino", CET}, {"Europe/Sarajevo", CET}, - {"Europe/Simferopol", FET}, + {"Europe/Simferopol", EET}, {"Europe/Skopje", CET}, {"Europe/Sofia", EET}, {"Europe/Stockholm", CET}, {"Europe/Tallinn", EET}, {"Europe/Tirane", CET}, {"Europe/Tiraspol", EET}, - {"Europe/Uzhgorod", FET}, + {"Europe/Uzhgorod", EET}, {"Europe/Vaduz", CET}, {"Europe/Vatican", CET}, {"Europe/Vienna", CET}, @@ -715,7 +716,7 @@ "\u4f0f\u5c14\u52a0\u683c\u52d2\u590f\u4ee4\u65f6", "VOLST"}}, {"Europe/Warsaw", CET}, {"Europe/Zagreb", CET}, - {"Europe/Zaporozhye", FET}, + {"Europe/Zaporozhye", EET}, {"Europe/Zurich", CET}, {"GB", GMTBST}, {"GB-Eire", GMTBST},
--- a/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java Thu Apr 12 15:53:35 2012 -0700 @@ -333,6 +333,7 @@ "\u6cd5\u5c6c\u572d\u4e9e\u90a3\u590f\u4ee4\u6642\u9593", "GFST"}}, {"America/Cayman", EST}, {"America/Chihuahua", MST}, + {"America/Creston", MST}, {"America/Coral_Harbour", EST}, {"America/Cordoba", AGT}, {"America/Costa_Rica", CST}, @@ -679,7 +680,7 @@ {"Europe/Istanbul", EET}, {"Europe/Jersey", GMTBST}, {"Europe/Kaliningrad", FET}, - {"Europe/Kiev", FET}, + {"Europe/Kiev", EET}, {"Europe/Lisbon", WET}, {"Europe/Ljubljana", CET}, {"Europe/London", GMTBST}, @@ -700,14 +701,14 @@ "\u6c99\u99ac\u62c9\u590f\u4ee4\u6642\u9593", "SAMST"}}, {"Europe/San_Marino", CET}, {"Europe/Sarajevo", CET}, - {"Europe/Simferopol", FET}, + {"Europe/Simferopol", EET}, {"Europe/Skopje", CET}, {"Europe/Sofia", EET}, {"Europe/Stockholm", CET}, {"Europe/Tallinn", EET}, {"Europe/Tirane", CET}, {"Europe/Tiraspol", EET}, - {"Europe/Uzhgorod", FET}, + {"Europe/Uzhgorod", EET}, {"Europe/Vaduz", CET}, {"Europe/Vatican", CET}, {"Europe/Vienna", CET}, @@ -716,7 +717,7 @@ "\u4f0f\u723e\u52a0\u683c\u52d2\u590f\u4ee4\u6642\u9593", "VOLST"}}, {"Europe/Warsaw", CET}, {"Europe/Zagreb", CET}, - {"Europe/Zaporozhye", FET}, + {"Europe/Zaporozhye", EET}, {"Europe/Zurich", CET}, {"GB", GMTBST}, {"GB-Eire", GMTBST},
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/solaris/classes/java/lang/ClassLoaderHelper.java Thu Apr 12 15:53:35 2012 -0700 @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2012, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package java.lang; + +import java.io.File; + +class ClassLoaderHelper { + + private ClassLoaderHelper() {} + + /** + * Returns an alternate path name for the given file + * such that if the original pathname did not exist, then the + * file may be located at the alternate location. + * For most platforms, this behavior is not supported and returns null. + */ + static File mapAlternativeName(File lib) { + return null; + } +}
--- a/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2012, 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 @@ -50,7 +50,7 @@ return new SolarisAsynchronousChannelProvider(); if (osname.equals("Linux")) return new LinuxAsynchronousChannelProvider(); - if (osname.startsWith("Mac OS")) + if (osname.contains("OS X")) return new BsdAsynchronousChannelProvider(); throw new InternalError("platform not recognized"); }
--- a/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2012, 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 @@ -68,7 +68,7 @@ return createProvider("sun.nio.fs.SolarisFileSystemProvider"); if (osname.equals("Linux")) return createProvider("sun.nio.fs.LinuxFileSystemProvider"); - if (osname.equals("Darwin") || osname.startsWith("Mac OS X")) + if (osname.equals("Darwin") || osname.contains("OS X")) return createProvider("sun.nio.fs.BsdFileSystemProvider"); throw new AssertionError("Platform not recognized"); }
--- a/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Fri Apr 06 17:10:17 2012 -0700 +++ b/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2012, 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 @@ -121,7 +121,7 @@ static boolean isBSD() { return (osname.equals("Linux") || - osname.startsWith("Mac OS X")); + osname.contains("OS X")); } static final int UNINITIALIZED = -1;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/windows/classes/java/lang/ClassLoaderHelper.java Thu Apr 12 15:53:35 2012 -0700 @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2012, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package java.lang; + +import java.io.File; + +class ClassLoaderHelper { + + private ClassLoaderHelper() {} + + /** + * Returns an alternate path name for the given file + * such that if the original pathname did not exist, then the + * file may be located at the alternate location. + * For most platforms, this behavior is not supported and returns null. + */ + static File mapAlternativeName(File lib) { + return null; + } +}
--- a/test/demo/jvmti/DemoRun.java Fri Apr 06 17:10:17 2012 -0700 +++ b/test/demo/jvmti/DemoRun.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2012, 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 @@ -124,7 +124,7 @@ String os_name = System.getProperty("os.name"); String libprefix = os_name.contains("Windows")?"":"lib"; String libsuffix = os_name.contains("Windows")?".dll": - os_name.startsWith("Mac OS")?".dylib":".so"; + os_name.contains("OS X")?".dylib":".so"; boolean d64 = ( os_name.contains("Solaris") || os_name.contains("SunOS") ) && ( os_arch.equals("sparcv9") ||
--- a/test/java/io/File/GetXSpace.java Fri Apr 06 17:10:17 2012 -0700 +++ b/test/java/io/File/GetXSpace.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, 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 @@ -51,7 +51,7 @@ private static final String dfFormat; static { if (name.equals("SunOS") || name.equals("Linux") - || name.startsWith("Mac OS")) { + || name.contains("OS X")) { // FileSystem Total Used Available Use% MountedOn dfFormat = "([^\\s]+)\\s+(\\d+)\\s+\\d+\\s+(\\d+)\\s+\\d+%\\s+([^\\s]+)"; } else if (name.startsWith("Windows")) {
--- a/test/java/lang/ProcessBuilder/Basic.java Fri Apr 06 17:10:17 2012 -0700 +++ b/test/java/lang/ProcessBuilder/Basic.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2012, 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 @@ -597,7 +597,7 @@ static class MacOSX { public static boolean is() { return is; } private static final String osName = System.getProperty("os.name"); - private static final boolean is = osName.startsWith("Mac OS"); + private static final boolean is = osName.contains("OS X"); } static class True {
--- a/test/java/lang/ProcessBuilder/Zombies.java Fri Apr 06 17:10:17 2012 -0700 +++ b/test/java/lang/ProcessBuilder/Zombies.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2012, 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 @@ -34,7 +34,7 @@ static final String os = System.getProperty("os.name"); - static final String TrueCommand = os.startsWith("Mac OS")? + static final String TrueCommand = os.contains("OS X")? "/usr/bin/true" : "/bin/true"; public static void main(String[] args) throws Throwable {
--- a/test/java/lang/invoke/InvokeGenericTest.java Fri Apr 06 17:10:17 2012 -0700 +++ b/test/java/lang/invoke/InvokeGenericTest.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2012, 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 @@ -75,7 +75,7 @@ String name = properties.getProperty("java.vm.name"); String arch = properties.getProperty("os.arch"); if ((arch.equals("amd64") || arch.equals("i386") || arch.equals("x86") || - arch.equals("sparc") || arch.equals("sparcv9")) && + arch.equals("x86_64") || arch.equals("sparc") || arch.equals("sparcv9")) && (name.contains("Client") || name.contains("Server")) ) { platformOK = true;
--- a/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java Fri Apr 06 17:10:17 2012 -0700 +++ b/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, 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 @@ -80,7 +80,7 @@ } private static String LOAD_AVERAGE_TEXT - = System.getProperty("os.name").startsWith("Mac OS") + = System.getProperty("os.name").contains("OS X") ? "load averages:" : "load average:"; @@ -99,7 +99,7 @@ System.out.println("Load average returned from uptime = " + output); System.out.println("getSystemLoadAverage() returned " + loadavg); - String[] lavg = System.getProperty("os.name").startsWith("Mac OS") + String[] lavg = System.getProperty("os.name").contains("OS X") ? output.split(" ") : output.split(","); double expected = Double.parseDouble(lavg[0]);
--- a/test/java/nio/channels/FileChannel/Size.java Fri Apr 06 17:10:17 2012 -0700 +++ b/test/java/nio/channels/FileChannel/Size.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2012, 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 @@ -69,7 +69,7 @@ // Windows and Linux can't handle the really large file sizes for a truncate // or a positional write required by the test for 4563125 String osName = System.getProperty("os.name"); - if (osName.startsWith("SunOS") || osName.startsWith("Mac OS")) { + if (osName.startsWith("SunOS") || osName.contains("OS X")) { blah = File.createTempFile("blah", null); long testSize = ((long)Integer.MAX_VALUE) * 2; initTestFile(blah, 10);
--- a/test/java/nio/channels/FileChannel/Transfer.java Fri Apr 06 17:10:17 2012 -0700 +++ b/test/java/nio/channels/FileChannel/Transfer.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2012, 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 @@ -228,7 +228,7 @@ // Windows and Linux can't handle the really large file sizes for a // truncate or a positional write required by the test for 4563125 String osName = System.getProperty("os.name"); - if (!(osName.startsWith("SunOS") || osName.startsWith("Mac OS"))) + if (!(osName.startsWith("SunOS") || osName.contains("OS X"))) return; File source = File.createTempFile("blah", null); source.deleteOnExit();
--- a/test/java/nio/file/FileSystem/Basic.java Fri Apr 06 17:10:17 2012 -0700 +++ b/test/java/nio/file/FileSystem/Basic.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2012, 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 @@ -76,7 +76,7 @@ checkSupported(fs, "posix", "unix", "owner", "acl", "user"); if (os.equals("Linux")) checkSupported(fs, "posix", "unix", "owner", "dos", "user"); - if (os.startsWith("Mac OS")) + if (os.contains("OS X")) checkSupported(fs, "posix", "unix", "owner"); if (os.equals("Windows")) checkSupported(fs, "owner", "dos", "acl", "user");
--- a/test/sun/nio/ch/SelProvider.java Fri Apr 06 17:10:17 2012 -0700 +++ b/test/sun/nio/ch/SelProvider.java Thu Apr 12 15:53:35 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, 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 @@ -50,7 +50,7 @@ } else { throw new RuntimeException("Test does not recognize this operating system"); } - } else if (osname.startsWith("Mac OS")) { + } else if (osname.contains("OS X")) { expected = "sun.nio.ch.PollSelectorProvider"; } else return;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/NullGetAcceptedIssuers.java Thu Apr 12 15:53:35 2012 -0700 @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2012, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 7142172 + * @summary Custom TrustManagers that return null for getAcceptedIssuers + * will NPE. + * SunJSSE does not support dynamic system properties, no way to + * re-use system properties in samevm/agentvm mode. + * @run main/othervm NullGetAcceptedIssuers + */ + +import javax.net.ssl.*; + +public class NullGetAcceptedIssuers { + + public static void main(String[] args) throws Exception { + SSLContext sslContext; + + // Create a trust manager that does not validate certificate chains + TrustManager[] trustAllCerts = + new TrustManager[] {new X509TrustManager() { + + public void checkClientTrusted( + java.security.cert.X509Certificate[] certs, + String authType) { + } + + public void checkServerTrusted( + java.security.cert.X509Certificate[] certs, + String authType) { + } + + // API says empty array, but some custom TMs are + // returning null. + public java.security.cert.X509Certificate[] + getAcceptedIssuers() { + return null; + } + }}; + + sslContext = javax.net.ssl.SSLContext.getInstance("SSL"); + sslContext.init(null, trustAllCerts, null); + } +}
--- a/test/tools/launcher/TestHelper.java Fri Apr 06 17:10:17 2012 -0700 +++ b/test/tools/launcher/TestHelper.java Thu Apr 12 15:53:35 2012 -0700 @@ -58,7 +58,7 @@ static final boolean isWindows = System.getProperty("os.name", "unknown").startsWith("Windows"); static final boolean isMacOSX = - System.getProperty("os.name", "unknown").startsWith("Mac"); + System.getProperty("os.name", "unknown").contains("OS X"); static final boolean is64Bit = System.getProperty("sun.arch.data.model").equals("64"); static final boolean is32Bit =