changeset 6325:27b32b049c89

Merge
author mduigou
date Tue, 16 Oct 2012 09:37:23 -0700
parents c6ca097f901c 61ddb3fd000a
children a2eb3f40a6bf
files .hgtags make/Makefile make/common/Defs-embedded.gmk make/common/Defs.gmk make/common/Release-embedded.gmk make/common/Release.gmk make/common/shared/Defs-java.gmk make/java/java/FILES_java.gmk make/java/java/Makefile make/java/nio/Makefile make/sun/beans/Makefile make/sun/util/Makefile src/macosx/classes/sun/awt/SunToolkitSubclass.java src/share/classes/java/lang/AbstractStringBuilder.java src/share/classes/java/lang/String.java src/share/classes/java/lang/ThreadLocal.java src/share/classes/java/lang/annotation/ContainerAnnotation.java src/share/classes/java/text/BreakDictionary.java src/share/classes/java/text/CollationRules.java src/share/classes/java/text/DictionaryBasedBreakIterator.java src/share/classes/java/text/RuleBasedBreakIterator.java src/share/classes/java/util/Arrays.java src/share/classes/java/util/HashMap.java src/share/classes/sun/beans/editors/BooleanEditor.java src/share/classes/sun/beans/editors/ByteEditor.java src/share/classes/sun/beans/editors/ColorEditor.java src/share/classes/sun/beans/editors/DoubleEditor.java src/share/classes/sun/beans/editors/EnumEditor.java src/share/classes/sun/beans/editors/FloatEditor.java src/share/classes/sun/beans/editors/FontEditor.java src/share/classes/sun/beans/editors/IntegerEditor.java src/share/classes/sun/beans/editors/LongEditor.java src/share/classes/sun/beans/editors/NumberEditor.java src/share/classes/sun/beans/editors/ShortEditor.java src/share/classes/sun/beans/editors/StringEditor.java src/share/classes/sun/beans/infos/ComponentBeanInfo.java src/share/classes/sun/management/LockDataConverter.java src/share/classes/sun/management/LockDataConverterMXBean.java src/share/classes/sun/security/provider/certpath/PKIX.java src/share/classes/sun/security/x509/CertificateIssuerUniqueIdentity.java src/share/classes/sun/security/x509/CertificateSubjectUniqueIdentity.java src/share/classes/sun/text/resources/BreakIteratorInfo_th.java src/share/classes/sun/text/resources/BreakIteratorRules_th.java src/share/classes/sun/text/resources/CollationData_ar.java src/share/classes/sun/text/resources/CollationData_be.java src/share/classes/sun/text/resources/CollationData_bg.java src/share/classes/sun/text/resources/CollationData_ca.java src/share/classes/sun/text/resources/CollationData_cs.java src/share/classes/sun/text/resources/CollationData_da.java src/share/classes/sun/text/resources/CollationData_de.java src/share/classes/sun/text/resources/CollationData_el.java src/share/classes/sun/text/resources/CollationData_en.java src/share/classes/sun/text/resources/CollationData_es.java src/share/classes/sun/text/resources/CollationData_et.java src/share/classes/sun/text/resources/CollationData_fi.java src/share/classes/sun/text/resources/CollationData_fr.java src/share/classes/sun/text/resources/CollationData_hi.java src/share/classes/sun/text/resources/CollationData_hr.java src/share/classes/sun/text/resources/CollationData_hu.java src/share/classes/sun/text/resources/CollationData_is.java src/share/classes/sun/text/resources/CollationData_it.java src/share/classes/sun/text/resources/CollationData_iw.java src/share/classes/sun/text/resources/CollationData_ja.java src/share/classes/sun/text/resources/CollationData_ko.java src/share/classes/sun/text/resources/CollationData_lt.java src/share/classes/sun/text/resources/CollationData_lv.java src/share/classes/sun/text/resources/CollationData_mk.java src/share/classes/sun/text/resources/CollationData_nl.java src/share/classes/sun/text/resources/CollationData_no.java src/share/classes/sun/text/resources/CollationData_pl.java src/share/classes/sun/text/resources/CollationData_pt.java src/share/classes/sun/text/resources/CollationData_ro.java src/share/classes/sun/text/resources/CollationData_ru.java src/share/classes/sun/text/resources/CollationData_sk.java src/share/classes/sun/text/resources/CollationData_sl.java src/share/classes/sun/text/resources/CollationData_sq.java src/share/classes/sun/text/resources/CollationData_sr.java src/share/classes/sun/text/resources/CollationData_sr_Latn.java src/share/classes/sun/text/resources/CollationData_sv.java src/share/classes/sun/text/resources/CollationData_th.java src/share/classes/sun/text/resources/CollationData_tr.java src/share/classes/sun/text/resources/CollationData_uk.java src/share/classes/sun/text/resources/CollationData_vi.java src/share/classes/sun/text/resources/CollationData_zh.java src/share/classes/sun/text/resources/CollationData_zh_HK.java src/share/classes/sun/text/resources/CollationData_zh_TW.java src/share/classes/sun/text/resources/FormatData_ar.java src/share/classes/sun/text/resources/FormatData_ar_AE.java src/share/classes/sun/text/resources/FormatData_ar_BH.java src/share/classes/sun/text/resources/FormatData_ar_DZ.java src/share/classes/sun/text/resources/FormatData_ar_EG.java src/share/classes/sun/text/resources/FormatData_ar_IQ.java src/share/classes/sun/text/resources/FormatData_ar_JO.java src/share/classes/sun/text/resources/FormatData_ar_KW.java src/share/classes/sun/text/resources/FormatData_ar_LB.java src/share/classes/sun/text/resources/FormatData_ar_LY.java src/share/classes/sun/text/resources/FormatData_ar_MA.java src/share/classes/sun/text/resources/FormatData_ar_OM.java src/share/classes/sun/text/resources/FormatData_ar_QA.java src/share/classes/sun/text/resources/FormatData_ar_SA.java src/share/classes/sun/text/resources/FormatData_ar_SD.java src/share/classes/sun/text/resources/FormatData_ar_SY.java src/share/classes/sun/text/resources/FormatData_ar_TN.java src/share/classes/sun/text/resources/FormatData_ar_YE.java src/share/classes/sun/text/resources/FormatData_be.java src/share/classes/sun/text/resources/FormatData_be_BY.java src/share/classes/sun/text/resources/FormatData_bg.java src/share/classes/sun/text/resources/FormatData_bg_BG.java src/share/classes/sun/text/resources/FormatData_ca.java src/share/classes/sun/text/resources/FormatData_ca_ES.java src/share/classes/sun/text/resources/FormatData_cs.java src/share/classes/sun/text/resources/FormatData_cs_CZ.java src/share/classes/sun/text/resources/FormatData_da.java src/share/classes/sun/text/resources/FormatData_da_DK.java src/share/classes/sun/text/resources/FormatData_de.java src/share/classes/sun/text/resources/FormatData_de_AT.java src/share/classes/sun/text/resources/FormatData_de_CH.java src/share/classes/sun/text/resources/FormatData_de_DE.java src/share/classes/sun/text/resources/FormatData_de_LU.java src/share/classes/sun/text/resources/FormatData_el.java src/share/classes/sun/text/resources/FormatData_el_CY.java src/share/classes/sun/text/resources/FormatData_el_GR.java src/share/classes/sun/text/resources/FormatData_en.java src/share/classes/sun/text/resources/FormatData_en_AU.java src/share/classes/sun/text/resources/FormatData_en_CA.java src/share/classes/sun/text/resources/FormatData_en_GB.java src/share/classes/sun/text/resources/FormatData_en_IE.java src/share/classes/sun/text/resources/FormatData_en_IN.java src/share/classes/sun/text/resources/FormatData_en_MT.java src/share/classes/sun/text/resources/FormatData_en_NZ.java src/share/classes/sun/text/resources/FormatData_en_PH.java src/share/classes/sun/text/resources/FormatData_en_SG.java src/share/classes/sun/text/resources/FormatData_en_US.java src/share/classes/sun/text/resources/FormatData_en_ZA.java src/share/classes/sun/text/resources/FormatData_es.java src/share/classes/sun/text/resources/FormatData_es_AR.java src/share/classes/sun/text/resources/FormatData_es_BO.java src/share/classes/sun/text/resources/FormatData_es_CL.java src/share/classes/sun/text/resources/FormatData_es_CO.java src/share/classes/sun/text/resources/FormatData_es_CR.java src/share/classes/sun/text/resources/FormatData_es_DO.java src/share/classes/sun/text/resources/FormatData_es_EC.java src/share/classes/sun/text/resources/FormatData_es_ES.java src/share/classes/sun/text/resources/FormatData_es_GT.java src/share/classes/sun/text/resources/FormatData_es_HN.java src/share/classes/sun/text/resources/FormatData_es_MX.java src/share/classes/sun/text/resources/FormatData_es_NI.java src/share/classes/sun/text/resources/FormatData_es_PA.java src/share/classes/sun/text/resources/FormatData_es_PE.java src/share/classes/sun/text/resources/FormatData_es_PR.java src/share/classes/sun/text/resources/FormatData_es_PY.java src/share/classes/sun/text/resources/FormatData_es_SV.java src/share/classes/sun/text/resources/FormatData_es_US.java src/share/classes/sun/text/resources/FormatData_es_UY.java src/share/classes/sun/text/resources/FormatData_es_VE.java src/share/classes/sun/text/resources/FormatData_et.java src/share/classes/sun/text/resources/FormatData_et_EE.java src/share/classes/sun/text/resources/FormatData_fi.java src/share/classes/sun/text/resources/FormatData_fi_FI.java src/share/classes/sun/text/resources/FormatData_fr.java src/share/classes/sun/text/resources/FormatData_fr_BE.java src/share/classes/sun/text/resources/FormatData_fr_CA.java src/share/classes/sun/text/resources/FormatData_fr_CH.java src/share/classes/sun/text/resources/FormatData_fr_FR.java src/share/classes/sun/text/resources/FormatData_fr_LU.java src/share/classes/sun/text/resources/FormatData_ga.java src/share/classes/sun/text/resources/FormatData_ga_IE.java src/share/classes/sun/text/resources/FormatData_hi_IN.java src/share/classes/sun/text/resources/FormatData_hr.java src/share/classes/sun/text/resources/FormatData_hr_HR.java src/share/classes/sun/text/resources/FormatData_hu.java src/share/classes/sun/text/resources/FormatData_hu_HU.java src/share/classes/sun/text/resources/FormatData_in.java src/share/classes/sun/text/resources/FormatData_in_ID.java src/share/classes/sun/text/resources/FormatData_is.java src/share/classes/sun/text/resources/FormatData_is_IS.java src/share/classes/sun/text/resources/FormatData_it.java src/share/classes/sun/text/resources/FormatData_it_CH.java src/share/classes/sun/text/resources/FormatData_it_IT.java src/share/classes/sun/text/resources/FormatData_iw.java src/share/classes/sun/text/resources/FormatData_iw_IL.java src/share/classes/sun/text/resources/FormatData_ja.java src/share/classes/sun/text/resources/FormatData_ja_JP.java src/share/classes/sun/text/resources/FormatData_ja_JP_JP.java src/share/classes/sun/text/resources/FormatData_ko.java src/share/classes/sun/text/resources/FormatData_ko_KR.java src/share/classes/sun/text/resources/FormatData_lt.java src/share/classes/sun/text/resources/FormatData_lt_LT.java src/share/classes/sun/text/resources/FormatData_lv.java src/share/classes/sun/text/resources/FormatData_lv_LV.java src/share/classes/sun/text/resources/FormatData_mk.java src/share/classes/sun/text/resources/FormatData_mk_MK.java src/share/classes/sun/text/resources/FormatData_ms.java src/share/classes/sun/text/resources/FormatData_ms_MY.java src/share/classes/sun/text/resources/FormatData_mt.java src/share/classes/sun/text/resources/FormatData_mt_MT.java src/share/classes/sun/text/resources/FormatData_nl.java src/share/classes/sun/text/resources/FormatData_nl_BE.java src/share/classes/sun/text/resources/FormatData_nl_NL.java src/share/classes/sun/text/resources/FormatData_no.java src/share/classes/sun/text/resources/FormatData_no_NO.java src/share/classes/sun/text/resources/FormatData_no_NO_NY.java src/share/classes/sun/text/resources/FormatData_pl.java src/share/classes/sun/text/resources/FormatData_pl_PL.java src/share/classes/sun/text/resources/FormatData_pt.java src/share/classes/sun/text/resources/FormatData_pt_BR.java src/share/classes/sun/text/resources/FormatData_pt_PT.java src/share/classes/sun/text/resources/FormatData_ro.java src/share/classes/sun/text/resources/FormatData_ro_RO.java src/share/classes/sun/text/resources/FormatData_ru.java src/share/classes/sun/text/resources/FormatData_ru_RU.java src/share/classes/sun/text/resources/FormatData_sk.java src/share/classes/sun/text/resources/FormatData_sk_SK.java src/share/classes/sun/text/resources/FormatData_sl.java src/share/classes/sun/text/resources/FormatData_sl_SI.java src/share/classes/sun/text/resources/FormatData_sq.java src/share/classes/sun/text/resources/FormatData_sq_AL.java src/share/classes/sun/text/resources/FormatData_sr.java src/share/classes/sun/text/resources/FormatData_sr_BA.java src/share/classes/sun/text/resources/FormatData_sr_CS.java src/share/classes/sun/text/resources/FormatData_sr_Latn.java src/share/classes/sun/text/resources/FormatData_sr_Latn_BA.java src/share/classes/sun/text/resources/FormatData_sr_Latn_ME.java src/share/classes/sun/text/resources/FormatData_sr_Latn_RS.java src/share/classes/sun/text/resources/FormatData_sr_ME.java src/share/classes/sun/text/resources/FormatData_sr_RS.java src/share/classes/sun/text/resources/FormatData_sv.java src/share/classes/sun/text/resources/FormatData_sv_SE.java src/share/classes/sun/text/resources/FormatData_th.java src/share/classes/sun/text/resources/FormatData_th_TH.java src/share/classes/sun/text/resources/FormatData_th_TH_TH.java src/share/classes/sun/text/resources/FormatData_tr.java src/share/classes/sun/text/resources/FormatData_tr_TR.java src/share/classes/sun/text/resources/FormatData_uk.java src/share/classes/sun/text/resources/FormatData_uk_UA.java src/share/classes/sun/text/resources/FormatData_vi.java src/share/classes/sun/text/resources/FormatData_vi_VN.java src/share/classes/sun/text/resources/FormatData_zh.java src/share/classes/sun/text/resources/FormatData_zh_CN.java src/share/classes/sun/text/resources/FormatData_zh_HK.java src/share/classes/sun/text/resources/FormatData_zh_SG.java src/share/classes/sun/text/resources/FormatData_zh_TW.java src/share/classes/sun/text/resources/thai_dict src/share/classes/sun/util/EmptyListResourceBundle.java src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java.template src/share/classes/sun/util/LocaleServiceProviderPool.java src/share/classes/sun/util/PreHashedMap.java src/share/classes/sun/util/TimeZoneNameUtility.java src/share/classes/sun/util/resources/CalendarData_ar.properties src/share/classes/sun/util/resources/CalendarData_be.properties src/share/classes/sun/util/resources/CalendarData_bg.properties src/share/classes/sun/util/resources/CalendarData_ca.properties src/share/classes/sun/util/resources/CalendarData_cs.properties src/share/classes/sun/util/resources/CalendarData_da.properties src/share/classes/sun/util/resources/CalendarData_de.properties src/share/classes/sun/util/resources/CalendarData_el.properties src/share/classes/sun/util/resources/CalendarData_el_CY.properties src/share/classes/sun/util/resources/CalendarData_en.properties src/share/classes/sun/util/resources/CalendarData_en_GB.properties src/share/classes/sun/util/resources/CalendarData_en_IE.properties src/share/classes/sun/util/resources/CalendarData_en_MT.properties src/share/classes/sun/util/resources/CalendarData_es.properties src/share/classes/sun/util/resources/CalendarData_es_ES.properties src/share/classes/sun/util/resources/CalendarData_es_US.properties src/share/classes/sun/util/resources/CalendarData_et.properties src/share/classes/sun/util/resources/CalendarData_fi.properties src/share/classes/sun/util/resources/CalendarData_fr.properties src/share/classes/sun/util/resources/CalendarData_fr_CA.properties src/share/classes/sun/util/resources/CalendarData_hi.properties src/share/classes/sun/util/resources/CalendarData_hr.properties src/share/classes/sun/util/resources/CalendarData_hu.properties src/share/classes/sun/util/resources/CalendarData_in_ID.properties src/share/classes/sun/util/resources/CalendarData_is.properties src/share/classes/sun/util/resources/CalendarData_it.properties src/share/classes/sun/util/resources/CalendarData_iw.properties src/share/classes/sun/util/resources/CalendarData_ja.properties src/share/classes/sun/util/resources/CalendarData_ko.properties src/share/classes/sun/util/resources/CalendarData_lt.properties src/share/classes/sun/util/resources/CalendarData_lv.properties src/share/classes/sun/util/resources/CalendarData_mk.properties src/share/classes/sun/util/resources/CalendarData_ms_MY.properties src/share/classes/sun/util/resources/CalendarData_mt.properties src/share/classes/sun/util/resources/CalendarData_mt_MT.properties src/share/classes/sun/util/resources/CalendarData_nl.properties src/share/classes/sun/util/resources/CalendarData_no.properties src/share/classes/sun/util/resources/CalendarData_pl.properties src/share/classes/sun/util/resources/CalendarData_pt.properties src/share/classes/sun/util/resources/CalendarData_pt_PT.properties src/share/classes/sun/util/resources/CalendarData_ro.properties src/share/classes/sun/util/resources/CalendarData_ru.properties src/share/classes/sun/util/resources/CalendarData_sk.properties src/share/classes/sun/util/resources/CalendarData_sl.properties src/share/classes/sun/util/resources/CalendarData_sq.properties src/share/classes/sun/util/resources/CalendarData_sr.properties src/share/classes/sun/util/resources/CalendarData_sr_Latn_BA.properties src/share/classes/sun/util/resources/CalendarData_sr_Latn_ME.properties src/share/classes/sun/util/resources/CalendarData_sr_Latn_RS.properties src/share/classes/sun/util/resources/CalendarData_sv.properties src/share/classes/sun/util/resources/CalendarData_th.properties src/share/classes/sun/util/resources/CalendarData_tr.properties src/share/classes/sun/util/resources/CalendarData_uk.properties src/share/classes/sun/util/resources/CalendarData_vi.properties src/share/classes/sun/util/resources/CalendarData_zh.properties src/share/classes/sun/util/resources/CurrencyNames_ar_AE.properties src/share/classes/sun/util/resources/CurrencyNames_ar_BH.properties src/share/classes/sun/util/resources/CurrencyNames_ar_DZ.properties src/share/classes/sun/util/resources/CurrencyNames_ar_EG.properties src/share/classes/sun/util/resources/CurrencyNames_ar_IQ.properties src/share/classes/sun/util/resources/CurrencyNames_ar_JO.properties src/share/classes/sun/util/resources/CurrencyNames_ar_KW.properties src/share/classes/sun/util/resources/CurrencyNames_ar_LB.properties src/share/classes/sun/util/resources/CurrencyNames_ar_LY.properties src/share/classes/sun/util/resources/CurrencyNames_ar_MA.properties src/share/classes/sun/util/resources/CurrencyNames_ar_OM.properties src/share/classes/sun/util/resources/CurrencyNames_ar_QA.properties src/share/classes/sun/util/resources/CurrencyNames_ar_SA.properties src/share/classes/sun/util/resources/CurrencyNames_ar_SD.properties src/share/classes/sun/util/resources/CurrencyNames_ar_SY.properties src/share/classes/sun/util/resources/CurrencyNames_ar_TN.properties src/share/classes/sun/util/resources/CurrencyNames_ar_YE.properties src/share/classes/sun/util/resources/CurrencyNames_be_BY.properties src/share/classes/sun/util/resources/CurrencyNames_bg_BG.properties src/share/classes/sun/util/resources/CurrencyNames_ca_ES.properties src/share/classes/sun/util/resources/CurrencyNames_cs_CZ.properties src/share/classes/sun/util/resources/CurrencyNames_da_DK.properties src/share/classes/sun/util/resources/CurrencyNames_de.properties src/share/classes/sun/util/resources/CurrencyNames_de_AT.properties src/share/classes/sun/util/resources/CurrencyNames_de_CH.properties src/share/classes/sun/util/resources/CurrencyNames_de_DE.properties src/share/classes/sun/util/resources/CurrencyNames_de_GR.properties src/share/classes/sun/util/resources/CurrencyNames_de_LU.properties src/share/classes/sun/util/resources/CurrencyNames_el_CY.properties src/share/classes/sun/util/resources/CurrencyNames_el_GR.properties src/share/classes/sun/util/resources/CurrencyNames_en_AU.properties src/share/classes/sun/util/resources/CurrencyNames_en_CA.properties src/share/classes/sun/util/resources/CurrencyNames_en_GB.properties src/share/classes/sun/util/resources/CurrencyNames_en_IE.properties src/share/classes/sun/util/resources/CurrencyNames_en_IN.properties src/share/classes/sun/util/resources/CurrencyNames_en_MT.properties src/share/classes/sun/util/resources/CurrencyNames_en_NZ.properties src/share/classes/sun/util/resources/CurrencyNames_en_PH.properties src/share/classes/sun/util/resources/CurrencyNames_en_SG.properties src/share/classes/sun/util/resources/CurrencyNames_en_US.properties src/share/classes/sun/util/resources/CurrencyNames_en_ZA.properties src/share/classes/sun/util/resources/CurrencyNames_es.properties src/share/classes/sun/util/resources/CurrencyNames_es_AR.properties src/share/classes/sun/util/resources/CurrencyNames_es_BO.properties src/share/classes/sun/util/resources/CurrencyNames_es_CL.properties src/share/classes/sun/util/resources/CurrencyNames_es_CO.properties src/share/classes/sun/util/resources/CurrencyNames_es_CR.properties src/share/classes/sun/util/resources/CurrencyNames_es_CU.properties src/share/classes/sun/util/resources/CurrencyNames_es_DO.properties src/share/classes/sun/util/resources/CurrencyNames_es_EC.properties src/share/classes/sun/util/resources/CurrencyNames_es_ES.properties src/share/classes/sun/util/resources/CurrencyNames_es_GT.properties src/share/classes/sun/util/resources/CurrencyNames_es_HN.properties src/share/classes/sun/util/resources/CurrencyNames_es_MX.properties src/share/classes/sun/util/resources/CurrencyNames_es_NI.properties src/share/classes/sun/util/resources/CurrencyNames_es_PA.properties src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties src/share/classes/sun/util/resources/CurrencyNames_es_PR.properties src/share/classes/sun/util/resources/CurrencyNames_es_PY.properties src/share/classes/sun/util/resources/CurrencyNames_es_SV.properties src/share/classes/sun/util/resources/CurrencyNames_es_US.properties src/share/classes/sun/util/resources/CurrencyNames_es_UY.properties src/share/classes/sun/util/resources/CurrencyNames_es_VE.properties src/share/classes/sun/util/resources/CurrencyNames_et_EE.properties src/share/classes/sun/util/resources/CurrencyNames_fi_FI.properties src/share/classes/sun/util/resources/CurrencyNames_fr.properties src/share/classes/sun/util/resources/CurrencyNames_fr_BE.properties src/share/classes/sun/util/resources/CurrencyNames_fr_CA.properties src/share/classes/sun/util/resources/CurrencyNames_fr_CH.properties src/share/classes/sun/util/resources/CurrencyNames_fr_FR.properties src/share/classes/sun/util/resources/CurrencyNames_fr_LU.properties src/share/classes/sun/util/resources/CurrencyNames_ga_IE.properties src/share/classes/sun/util/resources/CurrencyNames_hi_IN.properties src/share/classes/sun/util/resources/CurrencyNames_hr_HR.properties src/share/classes/sun/util/resources/CurrencyNames_hu_HU.properties src/share/classes/sun/util/resources/CurrencyNames_in_ID.properties src/share/classes/sun/util/resources/CurrencyNames_is_IS.properties src/share/classes/sun/util/resources/CurrencyNames_it.properties src/share/classes/sun/util/resources/CurrencyNames_it_CH.properties src/share/classes/sun/util/resources/CurrencyNames_it_IT.properties src/share/classes/sun/util/resources/CurrencyNames_iw_IL.properties src/share/classes/sun/util/resources/CurrencyNames_ja.properties src/share/classes/sun/util/resources/CurrencyNames_ja_JP.properties src/share/classes/sun/util/resources/CurrencyNames_ko.properties src/share/classes/sun/util/resources/CurrencyNames_ko_KR.properties src/share/classes/sun/util/resources/CurrencyNames_lt_LT.properties src/share/classes/sun/util/resources/CurrencyNames_lv_LV.properties src/share/classes/sun/util/resources/CurrencyNames_mk_MK.properties src/share/classes/sun/util/resources/CurrencyNames_ms_MY.properties src/share/classes/sun/util/resources/CurrencyNames_mt_MT.properties src/share/classes/sun/util/resources/CurrencyNames_nl_BE.properties src/share/classes/sun/util/resources/CurrencyNames_nl_NL.properties src/share/classes/sun/util/resources/CurrencyNames_no_NO.properties src/share/classes/sun/util/resources/CurrencyNames_pl_PL.properties src/share/classes/sun/util/resources/CurrencyNames_pt.properties src/share/classes/sun/util/resources/CurrencyNames_pt_BR.properties src/share/classes/sun/util/resources/CurrencyNames_pt_PT.properties src/share/classes/sun/util/resources/CurrencyNames_ro_RO.properties src/share/classes/sun/util/resources/CurrencyNames_ru_RU.properties src/share/classes/sun/util/resources/CurrencyNames_sk_SK.properties src/share/classes/sun/util/resources/CurrencyNames_sl_SI.properties src/share/classes/sun/util/resources/CurrencyNames_sq_AL.properties src/share/classes/sun/util/resources/CurrencyNames_sr_BA.properties src/share/classes/sun/util/resources/CurrencyNames_sr_CS.properties src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_BA.properties src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_ME.properties src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_RS.properties src/share/classes/sun/util/resources/CurrencyNames_sr_ME.properties src/share/classes/sun/util/resources/CurrencyNames_sr_RS.properties src/share/classes/sun/util/resources/CurrencyNames_sv.properties src/share/classes/sun/util/resources/CurrencyNames_sv_SE.properties src/share/classes/sun/util/resources/CurrencyNames_th_TH.properties src/share/classes/sun/util/resources/CurrencyNames_tr_TR.properties src/share/classes/sun/util/resources/CurrencyNames_uk_UA.properties src/share/classes/sun/util/resources/CurrencyNames_vi_VN.properties src/share/classes/sun/util/resources/CurrencyNames_zh_CN.properties src/share/classes/sun/util/resources/CurrencyNames_zh_HK.java src/share/classes/sun/util/resources/CurrencyNames_zh_SG.java src/share/classes/sun/util/resources/CurrencyNames_zh_TW.properties src/share/classes/sun/util/resources/LocaleNames_ar.properties src/share/classes/sun/util/resources/LocaleNames_be.properties src/share/classes/sun/util/resources/LocaleNames_bg.properties src/share/classes/sun/util/resources/LocaleNames_ca.properties src/share/classes/sun/util/resources/LocaleNames_cs.properties src/share/classes/sun/util/resources/LocaleNames_da.properties src/share/classes/sun/util/resources/LocaleNames_de.properties src/share/classes/sun/util/resources/LocaleNames_el.properties src/share/classes/sun/util/resources/LocaleNames_el_CY.properties src/share/classes/sun/util/resources/LocaleNames_en.properties src/share/classes/sun/util/resources/LocaleNames_en_MT.properties src/share/classes/sun/util/resources/LocaleNames_en_PH.properties src/share/classes/sun/util/resources/LocaleNames_en_SG.properties src/share/classes/sun/util/resources/LocaleNames_es.properties src/share/classes/sun/util/resources/LocaleNames_es_US.properties src/share/classes/sun/util/resources/LocaleNames_et.properties src/share/classes/sun/util/resources/LocaleNames_fi.properties src/share/classes/sun/util/resources/LocaleNames_fr.properties src/share/classes/sun/util/resources/LocaleNames_ga.properties src/share/classes/sun/util/resources/LocaleNames_hi.properties src/share/classes/sun/util/resources/LocaleNames_hr.properties src/share/classes/sun/util/resources/LocaleNames_hu.properties src/share/classes/sun/util/resources/LocaleNames_in.properties src/share/classes/sun/util/resources/LocaleNames_is.properties src/share/classes/sun/util/resources/LocaleNames_it.properties src/share/classes/sun/util/resources/LocaleNames_iw.properties src/share/classes/sun/util/resources/LocaleNames_ja.properties src/share/classes/sun/util/resources/LocaleNames_ko.properties src/share/classes/sun/util/resources/LocaleNames_lt.properties src/share/classes/sun/util/resources/LocaleNames_lv.properties src/share/classes/sun/util/resources/LocaleNames_mk.properties src/share/classes/sun/util/resources/LocaleNames_ms.properties src/share/classes/sun/util/resources/LocaleNames_mt.properties src/share/classes/sun/util/resources/LocaleNames_nl.properties src/share/classes/sun/util/resources/LocaleNames_no.properties src/share/classes/sun/util/resources/LocaleNames_no_NO_NY.properties src/share/classes/sun/util/resources/LocaleNames_pl.properties src/share/classes/sun/util/resources/LocaleNames_pt.properties src/share/classes/sun/util/resources/LocaleNames_pt_BR.properties src/share/classes/sun/util/resources/LocaleNames_pt_PT.properties src/share/classes/sun/util/resources/LocaleNames_ro.properties src/share/classes/sun/util/resources/LocaleNames_ru.properties src/share/classes/sun/util/resources/LocaleNames_sk.properties src/share/classes/sun/util/resources/LocaleNames_sl.properties src/share/classes/sun/util/resources/LocaleNames_sq.properties src/share/classes/sun/util/resources/LocaleNames_sr.properties src/share/classes/sun/util/resources/LocaleNames_sr_Latn.properties src/share/classes/sun/util/resources/LocaleNames_sv.properties src/share/classes/sun/util/resources/LocaleNames_th.properties src/share/classes/sun/util/resources/LocaleNames_tr.properties src/share/classes/sun/util/resources/LocaleNames_uk.properties src/share/classes/sun/util/resources/LocaleNames_vi.properties src/share/classes/sun/util/resources/LocaleNames_zh.properties src/share/classes/sun/util/resources/LocaleNames_zh_HK.java src/share/classes/sun/util/resources/LocaleNames_zh_SG.properties src/share/classes/sun/util/resources/LocaleNames_zh_TW.properties src/share/classes/sun/util/resources/TimeZoneNames_de.java src/share/classes/sun/util/resources/TimeZoneNames_en.java src/share/classes/sun/util/resources/TimeZoneNames_en_CA.java src/share/classes/sun/util/resources/TimeZoneNames_en_GB.java src/share/classes/sun/util/resources/TimeZoneNames_en_IE.java src/share/classes/sun/util/resources/TimeZoneNames_es.java src/share/classes/sun/util/resources/TimeZoneNames_fr.java src/share/classes/sun/util/resources/TimeZoneNames_hi.java src/share/classes/sun/util/resources/TimeZoneNames_it.java src/share/classes/sun/util/resources/TimeZoneNames_ja.java src/share/classes/sun/util/resources/TimeZoneNames_ko.java src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java src/share/classes/sun/util/resources/TimeZoneNames_sv.java src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java src/share/classes/sun/util/resources/TimeZoneNames_zh_HK.java src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java src/share/classes/sun/util/xml/XMLUtils.java src/share/test/pack200/pack.conf src/solaris/classes/sun/awt/X11/XTextTransferHelper.java test/java/lang/invoke/MaxTest.java test/javax/swing/JColorChooser/Test4380468.html test/javax/swing/JColorChooser/Test4380468.java test/sun/misc/URLClassPath/ClassnameCharTest.sh test/sun/net/www/httptest/HttpServer.java test/sun/security/ssl/sun/net/www/httpstest/HttpServer.java
diffstat 2269 files changed, 540153 insertions(+), 76784 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Oct 15 15:48:45 2012 -0700
+++ b/.hgtags	Tue Oct 16 09:37:23 2012 -0700
@@ -179,5 +179,11 @@
 e8569a473cee7f4955bd9e76a9bdf6c6a07ced27 jdk8-b52
 2c6933c5106b81a8578b70996fe5b735fb3adb60 jdk8-b53
 70ad0ed1d6cef0e7712690d1bab21e4769708aad jdk8-b54
+1f3f4b333341873f00da3dee85e4879f0e89c9bb jdk8-b55
+2e6170973d921fe4b8d2dfd6032f5aaf4150a542 lambda-b56
+2e9eeef2909b33c9224a024afddb61ccb0b77f14 jdk8-b56
+51594d095a4bcffac4a314bf6e148214501399e0 jdk8-b57
+d94613ac03d8de375ef60493e2bb76dbd30d875d jdk8-b58
+abad1f417bd3df4296631fc943cd3b7f5062c88a jdk8-b59
+cec8fa02f15634acd7d02d04b0b2d8c044cdbaaa jdk8-b60
 
-2e6170973d921fe4b8d2dfd6032f5aaf4150a542 lambda-b56
--- a/make/Makefile	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/Makefile	Tue Oct 16 09:37:23 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 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
@@ -29,6 +29,7 @@
 #
 
 BUILDDIR=.
+
 include $(BUILDDIR)/common/Defs.gmk
 
 #
@@ -273,6 +274,7 @@
 # Release engineering targets.
 #
 include $(BUILDDIR)/common/Release.gmk
+-include $(CUSTOM_MAKE_DIR)/Release.gmk
 
 #
 # Cscope targets.
--- a/make/com/sun/java/pack/Makefile	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/com/sun/java/pack/Makefile	Tue Oct 16 09:37:23 2012 -0700
@@ -77,8 +77,8 @@
   OTHER_CXXFLAGS += $(ZINCLUDE)
   LDDFLAGS += $(ZIPOBJS)
  else
-  LDDFLAGS += -lz
-  OTHER_CXXFLAGS += -DSYSTEM_ZLIB
+  LDDFLAGS += $(ZLIB_LIBS)
+  OTHER_CXXFLAGS += $(ZLIB_CFLAGS) -DSYSTEM_ZLIB
  endif
 else
   OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
@@ -159,7 +159,7 @@
 	$(prep-target)
 	$(RM) $(TEMPDIR)/mapfile-vers
 	$(CP) mapfile-vers-unpack200 $(TEMPDIR)/mapfile-vers
-	$(LINKER)  $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
+	$(LINKER)  $(LDDFLAGS) $(sort $(UNPACK_EXE_FILES_o)) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
 ifdef MT
 	$(MT) /manifest $(OBJDIR)/unpack200$(EXE_SUFFIX).manifest /outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1
 endif
--- a/make/common/Defs-embedded.gmk	Mon Oct 15 15:48:45 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-#
-# Copyright (c) 2011, 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.
-#
-
-#
-# Variable definitions for SE Embedded builds.  This file should
-# not contain rules.
-#
-ifdef JAVASE_EMBEDDED
-
-# Compress jar files
-COMPRESS_JARS = true
-
-# Don't mmap zip files
-LIBZIP_CAN_USE_MMAP = false
-
-# Disable ALSA version check
-REQUIRED_ALSA_VERSION =
-
-# Compilation settings
-OTHER_CPPFLAGS += -DJAVASE_EMBEDDED
-
-# Product naming
-PRODUCT_SUFFIX = SE Embedded Runtime Environment
-RUNTIME_NAME = $(PRODUCT_NAME) $(PRODUCT_SUFFIX)
-
-# Reduced JRE locations
-JRE_REDUCED_HEADLESS_IMAGE_DIR = $(ABS_OUTPUTDIR)/j2re-reduced-headless-image
-JRE_REDUCED_IMAGE_DIR = $(ABS_OUTPUTDIR)/j2re-reduced-image
-
-# Override on linux to further reduce binary/lib sizes in product build
-ifeq ($(PLATFORM), linux)
-  ifeq ($(VARIANT), OPT)
-    ifneq ($(NO_STRIP), true)
-      ifneq ($(DEBUG_BINARIES), true)
-        POST_STRIP_PROCESS = $(STRIP) --strip-unneeded
-      endif
-    endif
-  endif
-endif
-
-# NIO Platform specific source file location
-ifdef CROSS_COMPILE_ARCH
-  NIO_PLATFORM_CLASSES_ROOT_DIR = $(CLOSED_PLATFORM_SRC)/classes/
-endif
-
-# For ARM sflt we need to link to a library with improved FP accuracy
-# and it must be linked after fdlibm - this places it at the end after libc
-# -z muldefs avoids linker errors for duplicate symbols.
-ifeq ($(CROSS_COMPILE_ARCH), arm)
-  EXTRA_LIBS +=  $(EXT_LIBS_PATH)/sflt_glibc_jdk.a -Xlinker -z -Xlinker muldefs
-endif
-
-endif # JAVASE_EMBEDDED
-
--- a/make/common/Defs.gmk	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/common/Defs.gmk	Tue Oct 16 09:37:23 2012 -0700
@@ -109,6 +109,21 @@
   endif
 endif
 
+# We allow for potential specialization of build files. This has to be
+# done on a file-by-file, case-by-case basis. Here we define the basic control
+# over where custom files are being used. Later we will -include the custom
+# Defs.gmk if present. This works best because all Makefiles include defs.gmk.
+# In other cases we can either have foo.gmk include custom/foo.gmk, or
+# a Makefile can do:
+#  include foo.gmk
+#  -include $CUSTOM_MAKE_DIR/foo.gmk
+#
+# For non-OpenJDK builds the default location is the make/closed repository.
+# For OpenJDK builds a real value has to be supplied externally.
+ifneq ($(OPENJDK),true)
+  CUSTOM_MAKE_DIR = $(BUILDDIR)/closed
+endif
+
 #
 # Get platform definitions
 #
@@ -116,12 +131,6 @@
 include $(JDK_TOPDIR)/make/common/Defs-$(PLATFORM).gmk
 
 #
-# SE-Embedded support, if enabled
-#
-
-include $(JDK_TOPDIR)/make/common/Defs-embedded.gmk
-
-#
 # Cross-compilation Settings
 #
 ifdef CROSS_COMPILE_ARCH
@@ -542,6 +551,21 @@
 CXXFLAGS_$(VARIANT)/BYFILE  = $(CXXFLAGS_$(VARIANT)/$(@F)) \
                               $(CXXFLAGS_$(VARIANT)$(CXXFLAGS_$(VARIANT)/$(@F)))
 
+# Command line define to provide basename of file being compiled to source.
+#   The C macro THIS_FILE can replace the use of __FILE__ in the source
+#   files for the current filename being compiled.
+#   The value of the __FILE__ macro is unpredictable and can be anything
+#   from a relative path to a full path, THIS_FILE will be more consistent..
+#   The THIS_FILE macro will always be just the basename of the file being
+#   compiled.
+#   Different string literals in the the object files makes it difficult to
+#   compare shared libraries from different builds.
+#
+#   NOTE: If the THIS_FILE macro is actually expanded while in an included
+#         source file, it will not return the name of the included file.
+#
+CPP_THIS_FILE = -DTHIS_FILE='"$(<F)"'
+
 #
 # Tool flags
 #
@@ -551,7 +575,7 @@
 CFLAGS          = $(CFLAGS_$(VARIANT)/BYFILE)   $(CFLAGS_COMMON) $(OTHER_CFLAGS) $(EXTRA_CFLAGS)
 CXXFLAGS        = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) $(EXTRA_CFLAGS)
 CPPFLAGS        = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \
-		  $(DEFINES) $(OPTIONS:%=-D%)
+		  $(DEFINES) $(OPTIONS:%=-D%) $(CPP_THIS_FILE)
 LDFLAGS         = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS)
 LDLIBS          = $(OTHER_LDLIBS) $(LDLIBS_$(VARIANT)) $(LDLIBS_COMMON)
 LINTFLAGS       = $(LINTFLAGS_$(VARIANT)) $(LINTFLAGS_COMMON) \
@@ -596,4 +620,6 @@
 $(install-importonly-file)
 endef
 
+-include $(CUSTOM_MAKE_DIR)/Defs.gmk
+
 .PHONY: all build clean clobber
--- a/make/common/Demo.gmk	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/common/Demo.gmk	Tue Oct 16 09:37:23 2012 -0700
@@ -320,10 +320,10 @@
   ifeq ($(PLATFORM),windows)
 	$(RC) $(RC_FLAGS) $(CC_OBJECT_OUTPUT_FLAG)$(DEMO_VERSION_INFO) $(VERSIONINFO_RESOURCE)
 	$(LINK.demo) $(SHARED_LIBRARY_FLAG) -Fe$@ \
-	    $(DEMO_FULL_OBJECTS) $(LDLIBS.demo)
+	    $(sort $(DEMO_FULL_OBJECTS)) $(LDLIBS.demo)
   else
 	$(LINK.demo) $(SHARED_LIBRARY_FLAG) -o $@ \
-	    $(DEMO_FULL_OBJECTS) $(LDLIBS.demo)
+	    $(sort $(DEMO_FULL_OBJECTS)) $(LDLIBS.demo)
   endif
 	@$(call binary_file_verification,$@)
 
--- a/make/common/Library.gmk	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/common/Library.gmk	Tue Oct 16 09:37:23 2012 -0700
@@ -199,7 +199,7 @@
 $(OBJDIR)/$(LIBRARY).lcf: $(OBJDIR)/$(LIBRARY).res $(COMPILE_FILES_o) $(FILES_m)
 	@$(prep-target)
 	@$(MKDIR) -p $(TEMPDIR)
-	@$(ECHO) $(FILES_o) > $@ 
+	@$(ECHO) $(sort $(FILES_o)) > $@ 
 ifndef LOCAL_RESOURCE_FILE
 	@$(ECHO) $(OBJDIR)/$(LIBRARY).res >> $@
 endif
@@ -256,9 +256,9 @@
 	@$(ECHO) "STATS: LIBRARY=$(LIBRARY), PRODUCT=$(PRODUCT), OPTIMIZATION_LEVEL=$(OPTIMIZATION_LEVEL)"
 	@$(ECHO) "Rebuilding $@ because of $?"
 ifeq ($(LIBRARY), fdlibm)
-	$(AR) $(ARFLAGS) $@ $(FILES_o)
+	$(AR) $(ARFLAGS) $@ $(sort $(FILES_o))
 else # LIBRARY
-	$(LINKER) $(SHARED_LIBRARY_FLAG) -o $@ $(FILES_o) $(LDLIBS)
+	$(LINKER) $(SHARED_LIBRARY_FLAG) -o $@ $(sort $(FILES_o)) $(LDLIBS)
 	@$(call binary_file_verification,$@)
 ifeq ($(WRITE_LIBVERSION),true)
 	$(MCS) -d -a "$(FULL_VERSION)" $@
--- a/make/common/Program.gmk	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/common/Program.gmk	Tue Oct 16 09:37:23 2012 -0700
@@ -91,7 +91,7 @@
   LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a
 
   ifeq ($(SYSTEM_ZLIB),true)
-    OTHER_LDLIBS += -lz
+    OTHER_LDLIBS += $(ZLIB_LIBS)
   endif
 endif
 
@@ -126,6 +126,26 @@
 endif
 
 #
+# Applications expect to be able to link against libjawt without invoking
+# System.loadLibrary("jawt") first. This was the behaviour described in the
+# devloper documentation of JAWT and what worked with OpenJDK6.
+#
+ifeq ($(PLATFORM), solaris)
+  ifeq ($(ARCH_DATA_MODEL), 32)
+    LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)
+    LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH)
+  else # ! ARCH_DATA_MODEL 64-bit
+    LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)
+    LDFLAGS += -R \$$ORIGIN/../../jre/lib/$(LIBARCH)
+  endif # ARCH_DATA_MODEL
+endif # PLATFORM SOLARIS
+ifeq ($(PLATFORM), linux)
+  LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)
+  LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)
+endif # PLATFORM LINUX
+
+
+#
 # Launcher specific files.
 #
 FILES_o = $(OBJDIR)/main.$(OBJECT_SUFFIX)
@@ -242,7 +262,7 @@
 	$(ECHO) Rebuilding $@ because of $$1 $$2 $$3 $$4 $$5 $$6 $${7:+...};
 	@$(MKDIR) -p $(TEMPDIR)
 	$(LINK_PRE_CMD) $(CC) $(CC_OBJECT_OUTPUT_FLAG)$@ $(LDFLAGS) \
-	$(FILES_o) $(THREADLIBS) $(LDLIBS)
+	$(sort $(FILES_o)) $(THREADLIBS) $(LDLIBS)
   ifeq ($(findstring privileged, $(INFO_PLIST_FILE)), privileged)
 	-codesign -s openjdk_codesign $@
   endif
@@ -372,8 +392,6 @@
 VERSION_DEFINES += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
                    -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"'
 
-
-
 $(OBJDIR)/main.$(OBJECT_SUFFIX): $(LAUNCHER_SHARE_SRC)/bin/main.c
 	@$(prep-target)
 	$(COMPILE.c) $(CC_OBJECT_OUTPUT_FLAG)$(OBJDIR)/main.$(OBJECT_SUFFIX) \
--- a/make/common/Release-embedded.gmk	Mon Oct 15 15:48:45 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,230 +0,0 @@
-#
-# Copyright (c) 2011, 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.
-#
-
-#
-# SE-Embedded Reduced JRE targets
-#
-ifdef JAVASE_EMBEDDED
-
-reduced-image-jre reduced-headless-image-jre ::
-	@$(ECHO) ">>>Making "$@" @ `$(DATE)` ..."
-
-# Add the reduced-jre images as pre-reqs. These will be processed last
-images:: reduced-image-jre reduced-headless-image-jre
-
-
-######################################################
-# Create the headless rt.jar
-######################################################
-
-NOT_HEADLESS_RT_JAR_LIST = $(ABS_TEMPDIR)/not_hl_rt_jar.list
-HEADLESS_RT_JAR_FILELIST=$(JARFILELISTS_TEMPDIR)/hl_rt_jar_list
-TOTAL_HEADLESS_JAR_FILELIST=$(REORDER_TEMPDIR)/hl_file_list
-HEADLESS_CLASSLIST=$(ABS_TEMPDIR)/headless_classlist
-
-# Add the jar file directories that we don't want in the
-# headless JRE.  If you want to remove most classes in a
-# directory, put the directory in the NOT_HEADLESS_RT_JAR_LIST
-# and put the individual classes you want to keep in the 
-# HEADLESS_CLASSLIST file. 
-$(NOT_HEADLESS_RT_JAR_LIST): $(NOT_RT_JAR_LIST)
-	$(RM) $(HEADLESS_CLASSLIST)
-	$(RM) $(NOT_HEADLESS_RT_JAR_LIST)
-	$(CP) $(NOT_RT_JAR_LIST) $(NOT_HEADLESS_RT_JAR_LIST)
-# List all the packages to be excluded
-	$(ECHO) "sun/awt/motif/" >> $@
-	$(ECHO) "sun/awt/X11/" >> $@
-	$(ECHO) "sun/applet/" >> $@
-	$(ECHO) "sun/java2d/opengl/" >> $@
-	$(ECHO) "com/sun/java/swing/plaf/" >> $@
-# List all the individual classes to be included
-	$(ECHO) "sun/awt/motif/MFontConfiguration.class" >$(HEADLESS_CLASSLIST)
-	$(ECHO) "sun/applet/AppContextCreator.class" >>$(HEADLESS_CLASSLIST)
-	$(ECHO) "sun/applet/AppletAudioClip.class" >>$(HEADLESS_CLASSLIST)
-	$(ECHO) "sun/java2d/opengl/GLXSurfaceData.class" >>$(HEADLESS_CLASSLIST)
-	$(ECHO) "sun/java2d/opengl/GLXSurfaceData"\$$"GLXOffScreenSurfaceData.class" >>$(HEADLESS_CLASSLIST)
-	$(ECHO) "sun/java2d/opengl/GLXVolatileSurfaceManager.class" >>$(HEADLESS_CLASSLIST)
-	$(ECHO) "sun/java2d/opengl/OGLSurfaceData.class" >>$(HEADLESS_CLASSLIST)
-
-
-$(TOTAL_HEADLESS_JAR_FILELIST): $(JARREORDER_JARFILE) $(NOT_HEADLESS_RT_JAR_LIST)
-	$(prep-target)
-	$(RM) $@.temp
-	$(CD) $(CLASSBINDIR) ; \
-		$(BOOT_JAVA_CMD) -jar $(JARREORDER_JARFILE) \
-		-o  $@.temp - $(NOT_HEADLESS_RT_JAR_LIST)  .
-# Add on the explicitly included class files from the otherwise excluded packages
-	$(CAT) $(HEADLESS_CLASSLIST) >> $@.temp
-	$(MV) $@.temp $@
-	@$(CD) $(CLASSBINDIR); $(java-vm-cleanup)
-
-# Create the headless rt.jar file list & non-class files list
-MakeHeadlessJarFileList: $(TOTAL_HEADLESS_JAR_FILELIST) $(JARSPLIT_JARFILE)
-	@$(RM) $(HEADLESS_RT_JAR_FILELIST) $(RES_JAR_FILELIST)
-	$(BOOT_JAVA_CMD) -jar $(JARSPLIT_JARFILE) $(TOTAL_HEADLESS_JAR_FILELIST) \
-		-o  $(HEADLESS_RT_JAR_FILELIST) $(RES_JAR_FILELIST)
-	@$(java-vm-cleanup)
-
-# Create headless rt.jar
-HL_RT_JAR=$(ABS_TEMPDIR)/rt-hl-orig.jar
-$(HL_RT_JAR): MakeHeadlessJarFileList $(RT_JAR_MANIFEST_FILE)
-	$(prep-target)
-	$(CD) $(CLASSBINDIR) ; \
-		$(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(RT_JAR_MANIFEST_FILE) $@ @$(HEADLESS_RT_JAR_FILELIST) \
-		 $(JAR_JFLAGS)
-	@$(CD) $(CLASSBINDIR); $(java-vm-cleanup)
-
-
-#
-# Produce a reduced Headful JRE for Embedded Devices
-#
-# The deployment binaries are added during the deployment build process
-#
-
-# Binaries that don't get included in reduced jre image bin directory
-NOT_REDUCEDJRE_BIN = \
- java_vm \
- kinit \
- klist \
- ktab \
- orbd \
- policytool \
- rmid \
- rmiregistry \
- servertool \
- tnameserv \
- pack200 \
- unpack200
-
-# jars/resources/libs that don't get included in reduced jre image lib directory
-NOT_REDUCEDJRE_LIB = \
- charsets.jar \
- ext/dnsns.jar \
- ext/localedata.jar \
- $(LIBARCH)/client/classes.jsa \
- $(LIBARCH)/libjavaplugin_jni.so \
- $(LIBARCH)/libjavaplugin_nscp_gcc29.so \
- $(LIBARCH)/libjavaplugin_nscp.so \
- $(LIBARCH)/libjavaplugin_oji.so
-
-# JRE docs that don't get included in reduced jre image top directory
-NOT_REDUCEDJRE_DOC = \
- Welcome.html
-
-reduced-image-jre::
-	@$(ECHO) Starting to Produce Reduced JRE
-	@#
-	@# First make a copy of the full JRE
-	@#
-	$(RM) -r $(JRE_REDUCED_IMAGE_DIR)
-	$(MKDIR) -p $(JRE_REDUCED_IMAGE_DIR)
-	$(CD) $(JRE_IMAGE_DIR); \
-	    $(TAR) cf - . | ($(CD) $(JRE_REDUCED_IMAGE_DIR); $(TAR) xf - ); 
-
-	@#
-	@# Remove all of the files that are not needed for the
-	@# reduced JRE
-	@#
-	for l in $(NOT_REDUCEDJRE_BIN) ; do \
-	    $(RM) $(JRE_REDUCED_IMAGE_DIR)/bin/$$l ; \
-	done
-	for l in $(NOT_REDUCEDJRE_LIB) ; do \
-	    $(RM) $(JRE_REDUCED_IMAGE_DIR)/lib/$$l ; \
-	done
-	for l in $(NOT_REDUCEDJRE_DOC) ; do \
-	    $(RM) $(JRE_REDUCED_IMAGE_DIR)/$$l ; \
-	done
-
-	@# Remove misc. other files
-	$(RM) -r $(JRE_REDUCED_IMAGE_DIR)/man
-	$(RM) -f $(JRE_REDUCED_IMAGE_DIR)/CHANGES
-
-	@$(ECHO) Done Creating Reduced JRE
-
-#
-# Produce a reduced Headless JRE
-#
-reduced-headless-image-jre:: $(RT_JAR) $(RESOURCES_JAR) $(BUILD_META_INDEX) $(HL_RT_JAR)
-	@$(ECHO) Starting to Produce Reduced Headless JRE
-	@#
-	@# First make a copy of the reduced JRE we just built
-	@#
-	$(RM) -r $(JRE_REDUCED_HEADLESS_IMAGE_DIR)
-	$(MKDIR) -p $(JRE_REDUCED_HEADLESS_IMAGE_DIR)
-	$(CD) $(JRE_REDUCED_IMAGE_DIR); \
-	    $(TAR) cf - . | ($(CD) $(JRE_REDUCED_HEADLESS_IMAGE_DIR); $(TAR) xf - ); 
-
-	@# Replace the full rt.jar with the headless rt.jar
-	$(RM) -f $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/rt.jar
-	$(CP) $(HL_RT_JAR) $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/rt.jar
-
-	@#
-	@# Remove all of the files that are not needed for the
-	@# reduced Headless JRE
-	@#
-	$(RM) -f $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/$(LIBARCH)/gtkhelper
-	$(RM)  $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/$(LIBARCH)/libjsoundalsa.so
-	$(RM) -r $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/audio
-	$(RM) -fr $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/applet
-	$(RM)  $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/$(LIBARCH)/awt_robot
-	$(RM)  $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/$(LIBARCH)/libawt_xawt.so
-	$(RM) -r $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/$(LIBARCH)/libsplashscreen.so
-	@# Remove oblique fonts and reduce font support to LucidaSansRegular only
-	$(RM) -fr $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/oblique-fonts
-	$(RM) -f $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/LucidaBrightDemiBold.ttf
-	$(RM) -f $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/LucidaBrightDemiItalic.ttf
-	$(RM) -f $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/LucidaBrightItalic.ttf
-	$(RM) -f $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/LucidaBrightRegular.ttf
-	$(RM) -f $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/LucidaSansDemiBold.ttf
-	$(RM) -f $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/LucidaTypewriterBold.ttf
-	$(RM) -f $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/LucidaTypewriterRegular.ttf
-
-ifeq ($(PLATFORM), linux)
-# put out minimal fonts.dir file for the remaining font
-	$(RM) -f $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/fonts.dir
-	$(ECHO) 6>$(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/fonts.dir
-	$(ECHO) "LucidaSansRegular.ttf -b&h-lucidasans-medium-r-normal-sans-0-0-0-0-p-0-iso8859-1">>$(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/fonts.dir
-	$(ECHO) "LucidaSansRegular.ttf -b&h-lucidasans-medium-r-normal-sans-0-0-0-0-p-0-iso8859-2">>$(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/fonts.dir
-	$(ECHO) "LucidaSansRegular.ttf -b&h-lucidasans-medium-r-normal-sans-0-0-0-0-p-0-iso8859-4">>$(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/fonts.dir
-	$(ECHO) "LucidaSansRegular.ttf -b&h-lucidasans-medium-r-normal-sans-0-0-0-0-p-0-iso8859-5">>$(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/fonts.dir
-	$(ECHO) "LucidaSansRegular.ttf -b&h-lucidasans-medium-r-normal-sans-0-0-0-0-p-0-iso8859-7">>$(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/fonts.dir
-	$(ECHO) "LucidaSansRegular.ttf -b&h-lucidasans-medium-r-normal-sans-0-0-0-0-p-0-iso8859-9">>$(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/fonts/fonts.dir
-
-endif # Linux
-
-	@#
-	@# all done with JRE reduced headless image
-	@#
-
-	@$(ECHO) Done Creating Reduced Headless JRE
-
-images-clobber::
-	$(RM) -r $(JRE_REDUCED_IMAGE_DIR)
-	$(RM) -r $(JRE_REDUCED_HEADLESS_IMAGE_DIR)
-
-.PHONY: reduced-image-jre reduced-headless-image-jre 
-
-endif # JAVASE_EMBEDDED
-
--- a/make/common/Release.gmk	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/common/Release.gmk	Tue Oct 16 09:37:23 2012 -0700
@@ -750,10 +750,6 @@
 
 BUILDMETAINDEX_JARFILE = $(ABS_BUILDTOOLJARDIR)/buildmetaindex.jar
 
-# SE-Embedded targets if enabled
-include $(JDK_TOPDIR)/make/common/Release-embedded.gmk
-
-
 ######################################################
 # JRE Image
 ######################################################
--- a/make/common/shared/Defs-java.gmk	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/common/shared/Defs-java.gmk	Tue Oct 16 09:37:23 2012 -0700
@@ -160,7 +160,7 @@
 
 # Needed for javadoc to ensure it builds documentation
 # against the newly built classes
-JAVADOCFLAGS += -bootclasspath $(CLASSBINDIR)
+JAVADOCFLAGS += -bootclasspath "$(CLASSBINDIR)$(JCE_PATH)"
 
 # Needed for JAVADOC and BOOT_JAVACFLAGS
 NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true
--- a/make/common/shared/Defs-linux.gmk	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/common/shared/Defs-linux.gmk	Tue Oct 16 09:37:23 2012 -0700
@@ -129,6 +129,11 @@
 BUILD_HEADLESS = true
 LIBM=-lm
 
+# Set ZLIB_LIBS if not already set
+ifeq ("$(ZLIB_LIBS)", "")
+  ZLIB_LIBS=-lz
+endif
+
 # GCC29_COMPILER_PATH: is the path to where the gcc 2.9 compiler is installed
 #  NOTE: Must end with / so that it could be empty, allowing PATH usage.
 ifdef ALT_GCC29_COMPILER_PATH
--- a/make/common/shared/Defs-macosx.gmk	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/common/shared/Defs-macosx.gmk	Tue Oct 16 09:37:23 2012 -0700
@@ -143,6 +143,11 @@
   _CUPS_HEADERS_PATH=$(PACKAGE_PATH)/include
 endif
 
+# Set ZLIB_LIBS if not already set
+ifeq ("$(ZLIB_LIBS)", "")
+  ZLIB_LIBS=-lz
+endif
+
 # Import JDK images allow for partial builds, components not built are
 #    imported (or copied from) these import areas when needed.
 
--- a/make/common/shared/Defs-solaris.gmk	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/common/shared/Defs-solaris.gmk	Tue Oct 16 09:37:23 2012 -0700
@@ -140,6 +140,11 @@
 
 _CUPS_HEADERS_PATH=/opt/sfw/cups/include
 
+# Set ZLIB_LIBS if not already set
+ifeq ("$(ZLIB_LIBS)", "")
+  ZLIB_LIBS=-lz
+endif
+
 # Import JDK images allow for partial builds, components not built are
 #    imported (or copied from) these import areas when needed.
 
--- a/make/common/shared/Defs.gmk	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/common/shared/Defs.gmk	Tue Oct 16 09:37:23 2012 -0700
@@ -609,14 +609,18 @@
 #  2) ant attempts to detect JDK location based on java.exe location
 #     This is fragile as developer may have JRE first on the PATH. 
 #     To workaround this we will specify JAVA_HOME explicitly
+#  3) Sometimes we need to run ant with the boot jdk, sometimes with the import
+#     jdk, sometimes with the jdk we are building (see deploy repo).
 
 ANT_TMPDIR = $(ABS_OUTPUTDIR)/tmp
-ANT_WORKAROUNDS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR)' JAVA_HOME='$(BOOTDIR)'
+ANT_WORKAROUNDS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR)'
 
 ifeq ($(ANT_HOME),)
-  ANT = $(ANT_WORKAROUNDS) ant
+  ANT = $(ANT_WORKAROUNDS) JAVA_HOME='$(BOOTDIR)' ant
+  ANT_WITH_IMPORT = $(ANT_WORKAROUNDS) JAVA_HOME='$(JDK_IMPORT_PATH)' ant
 else
-  ANT = $(ANT_WORKAROUNDS) $(ANT_HOME)/bin/ant
+  ANT = $(ANT_WORKAROUNDS) JAVA_HOME='$(BOOTDIR)' $(ANT_HOME)/bin/ant
+  ANT_WITH_IMPORT = $(ANT_WORKAROUNDS) JAVA_HOME='$(JDK_IMPORT_PATH)' $(ANT_HOME)/bin/ant
 endif
 
 ifdef ALT_COPYRIGHT_YEAR
--- a/make/java/java/Exportedfiles.gmk	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/java/java/Exportedfiles.gmk	Tue Oct 16 09:37:23 2012 -0700
@@ -93,7 +93,8 @@
     sun/reflect/ConstantPool.java \
     sun/reflect/NativeConstructorAccessorImpl.java \
     sun/reflect/NativeMethodAccessorImpl.java \
-    sun/reflect/Reflection.java
+    sun/reflect/Reflection.java \
+    sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
 
 EXPORTED_inner = \
     java.lang.ClassLoader$$NativeLibrary
@@ -170,7 +171,8 @@
     sun/reflect/NativeMethodAccessorImpl.java \
     sun/reflect/Reflection.java \
     sun/security/provider/NativeSeedGenerator.java \
-    sun/io/Win32ErrorMode.java
+    sun/io/Win32ErrorMode.java \
+    sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
 
 EXPORTED_inner = \
     java.lang.ClassLoader$$NativeLibrary
--- a/make/java/java/FILES_c.gmk	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/java/java/FILES_c.gmk	Tue Oct 16 09:37:23 2012 -0700
@@ -78,4 +78,5 @@
 	AtomicLong.c \
 	Version.c \
 	VM.c \
-	VMSupport.c 
+	VMSupport.c \
+	HostLocaleProviderAdapter_md.c
--- a/make/java/java/FILES_java.gmk	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/java/java/FILES_java.gmk	Tue Oct 16 09:37:23 2012 -0700
@@ -189,7 +189,6 @@
     java/util/IllformedLocaleException.java \
     java/util/FormatterClosedException.java \
     java/util/ListResourceBundle.java \
-        sun/util/EmptyListResourceBundle.java \
     java/util/Locale.java \
         sun/util/locale/BaseLocale.java \
         sun/util/locale/Extension.java \
@@ -202,15 +201,43 @@
         sun/util/locale/ParseStatus.java \
         sun/util/locale/StringTokenIterator.java \
         sun/util/locale/UnicodeLocaleExtension.java \
+            sun/util/locale/provider/AuxLocaleProviderAdapter.java \
+            sun/util/locale/provider/AvailableLanguageTags.java \
+            sun/util/locale/provider/BreakDictionary.java \
+            sun/util/locale/provider/BreakIteratorProviderImpl.java \
+            sun/util/locale/provider/CalendarDataProviderImpl.java \
+            sun/util/locale/provider/CalendarDataUtility.java \
+            sun/util/locale/provider/CollationRules.java \
+            sun/util/locale/provider/CollatorProviderImpl.java \
+            sun/util/locale/provider/CurrencyNameProviderImpl.java \
+            sun/util/locale/provider/DateFormatProviderImpl.java \
+            sun/util/locale/provider/DateFormatSymbolsProviderImpl.java \
+            sun/util/locale/provider/DecimalFormatSymbolsProviderImpl.java \
+            sun/util/locale/provider/DictionaryBasedBreakIterator.java \
+            sun/util/locale/provider/FallbackLocaleProviderAdapter.java \
+            sun/util/locale/provider/HostLocaleProviderAdapter.java \
+            sun/util/locale/provider/HostLocaleProviderAdapterImpl.java \
+            sun/util/locale/provider/JRELocaleConstants.java \
+            sun/util/locale/provider/JRELocaleProviderAdapter.java \
+            sun/util/locale/provider/LocaleServiceProviderPool.java \
+            sun/util/locale/provider/LocaleProviderAdapter.java \
+	    sun/util/locale/provider/LocaleDataMetaInfo.java \
+            sun/util/locale/provider/LocaleNameProviderImpl.java \
+            sun/util/locale/provider/LocaleResources.java \
+            sun/util/locale/provider/NumberFormatProviderImpl.java \
+            sun/util/locale/provider/RuleBasedBreakIterator.java \
+            sun/util/locale/provider/SPILocaleProviderAdapter.java \
+            sun/util/locale/provider/TimeZoneNameProviderImpl.java \
+            sun/util/locale/provider/TimeZoneNameUtility.java \
     java/util/LocaleISOData.java \
-        sun/util/LocaleServiceProviderPool.java \
-	sun/util/LocaleDataMetaInfo.java \
+        sun/util/cldr/CLDRLocaleProviderAdapter.java \
     java/util/MissingResourceException.java \
     java/util/NoSuchElementException.java \
     java/util/Observable.java \
     java/util/Observer.java \
     java/util/Properties.java \
         java/util/InvalidPropertiesFormatException.java \
+	sun/util/spi/XmlPropertiesProvider.java \
     java/util/PropertyPermission.java \
     java/util/PropertyResourceBundle.java \
     java/util/Random.java \
@@ -224,7 +251,6 @@
     java/util/StringTokenizer.java \
     java/util/TimeZone.java \
         java/util/SimpleTimeZone.java \
-        sun/util/TimeZoneNameUtility.java \
         sun/util/calendar/ZoneInfo.java \
         sun/util/calendar/ZoneInfoFile.java \
         sun/util/calendar/TzIDOldMapping.java \
@@ -462,12 +488,7 @@
     java/util/prefs/PreferencesFactory.java \
     java/util/prefs/Base64.java \
     java/util/prefs/XmlSupport.java \
-    java/util/regex/Pattern.java \
-    java/util/regex/Matcher.java \
-    java/util/regex/MatchResult.java \
-    java/util/regex/ASCII.java \
-    java/util/regex/UnicodeProp.java \
-    java/util/regex/PatternSyntaxException.java \
+    java/util/spi/CalendarDataProvider.java \
     java/util/spi/CurrencyNameProvider.java \
     java/util/spi/LocaleNameProvider.java \
     java/util/spi/LocaleServiceProvider.java \
--- a/make/java/java/Makefile	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/java/java/Makefile	Tue Oct 16 09:37:23 2012 -0700
@@ -156,6 +156,11 @@
 vpath %.c $(PLATFORM_SRC)/native/java/util
 vpath %.c $(PLATFORM_SRC)/native/sun/security/provider
 vpath %.c $(PLATFORM_SRC)/native/sun/io
+ifeq ($(PLATFORM),macosx)
+vpath %.c $(PLATFORM_SRC_MACOS)/native/sun/util/locale/provider
+else # PLATFORM
+vpath %.c $(PLATFORM_SRC)/native/sun/util/locale/provider
+endif # PLATFORM
 
 #
 # Includes the fdlibm header file.
--- a/make/java/java/genlocales.gmk	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/java/java/genlocales.gmk	Tue Oct 16 09:37:23 2012 -0700
@@ -68,8 +68,8 @@
 FILES_java := $(FILES_java_orig)
 FILES_compiled_properties := $(FILES_compiled_properties_orig)
 
-LocaleDataMetaInfo_Src=$(SHARE_SRC)/classes/sun/util/LocaleDataMetaInfo-XLocales.java.template
-LocaleDataMetaInfo_Dest=$(GENSRCDIR)/sun/util/LocaleDataMetaInfo.java
+LocaleDataMetaInfo_Src=$(SHARE_SRC)/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
+LocaleDataMetaInfo_Dest=$(GENSRCDIR)/sun/util/locale/provider/LocaleDataMetaInfo.java
 LOCALEGEN_SH=localegen.sh
 RESOURCE_NAMES="FormatData CollationData TimeZoneNames LocaleNames CurrencyNames CalendarData"
 
--- a/make/java/java/localegen.sh	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/java/java/localegen.sh	Tue Oct 16 09:37:23 2012 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2005, 2008, 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
@@ -47,20 +47,29 @@
 localelist=
 getlocalelist() {
     localelist=""
-    localelist=`$NAWK -F$1_ '{print $2}' $2 | $SORT`
+    localelist=`$NAWK -F$1_ '{print $2}' $2 | $SORT | $SED -e 's/_/-/g'`
 }
 
-sed_script="$SED -e \"s@^#warn .*@// -- This file was mechanically generated: Do not edit! -- //@\" " 
+sed_script="$SED -e \"s@^#warn .*@// -- This file was mechanically generated: Do not edit! -- //@\" "
 
-for FILE in $RESOURCE_NAMES 
+# ja-JP-JP and th-TH-TH need to be manually added, as they don't have any resource files.
+noneuroall=" ja-JP-JP th-TH-TH "
+
+for FILE in $RESOURCE_NAMES
 do
     getlocalelist $FILE $EURO_FILES_LIST
     sed_script=$sed_script"-e \"s@#"$FILE"_EuroLocales#@$localelist@g\" "
+    euroall=$euroall" "$localelist
     getlocalelist $FILE $NONEURO_FILES_LIST
     sed_script=$sed_script"-e \"s@#"$FILE"_NonEuroLocales#@$localelist@g\" "
+    noneuroall=$noneuroall" "$localelist
 done
 
+euroall=`(for LOC in $euroall; do echo $LOC;done) |$SORT -u`
+noneuroall=`(for LOC in $noneuroall; do echo $LOC;done) |$SORT -u`
+
+sed_script=$sed_script"-e \"s@#AvailableLocales_EuroLocales#@$euroall@g\" "
+sed_script=$sed_script"-e \"s@#AvailableLocales_NonEuroLocales#@$noneuroall@g\" "
+
 sed_script=$sed_script"$INPUT_FILE > $OUTPUT_FILE"
 eval $sed_script
-
-
--- a/make/java/java/mapfile-vers	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/java/java/mapfile-vers	Tue Oct 16 09:37:23 2012 -0700
@@ -285,6 +285,8 @@
 #		Java_sun_misc_VM_unsuspendSomeThreads;		threads.c
 #		Java_sun_misc_VM_unsuspendThreads;		threads.c
 
+		Java_sun_util_locale_provider_HostLocaleProviderAdapterImpl_getPattern;
+
 	# Outcalls from libjvm done using dlsym().
 
 		VerifyClassCodes;
--- a/make/java/jli/Makefile	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/java/jli/Makefile	Tue Oct 16 09:37:23 2012 -0700
@@ -46,6 +46,8 @@
 
 ifneq ($(SYSTEM_ZLIB),true)
   ZIP_SRC = $(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+else # SYSTEM_ZLIB
+  OTHER_CFLAGS += $(ZLIB_CFLAGS)
 endif #SYSTEM_ZLIB
 LAUNCHER_SHARE_SRC = $(SHARE_SRC)/bin
 
@@ -162,7 +164,7 @@
 ifneq ($(SYSTEM_ZLIB),true)
   OTHER_INCLUDES += -I$(ZIP_SRC)
 else # !SYSTEM_ZLIB
-  LDLIBS += -lz
+  LDLIBS += $(ZLIB_LIBS)
 endif # SYSTEM_ZLIB
 
 #
@@ -188,7 +190,7 @@
 
   $(STATIC_LIBRARY): $(FILES_o)
 	@$(prep-target)
-	$(LIBEXE) -nologo -out:$@ $(FILES_o)
+	$(LIBEXE) -nologo -out:$@ $(sort $(FILES_o))
 
   library:: $(STATIC_LIBRARY)
 endif # PLATFORM
@@ -214,7 +216,7 @@
 
 $(STATIC_LIBRARY): $(STATIC_LIBRARY_DIR)
 	@$(prep-target)
-	$(AR) $(ARFLAGS) $@ $(FILES_o)
+	$(AR) $(ARFLAGS) $@ $(sort $(FILES_o))
 
 library:: $(STATIC_LIBRARY)
 
--- a/make/java/jobjc/Makefile	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/java/jobjc/Makefile	Tue Oct 16 09:37:23 2012 -0700
@@ -62,15 +62,22 @@
 ABS_OUTPUTDIR=$(realpath $(OUTPUTDIR))
 ABS_STABLE_GEN_DIR=$(realpath $(STABLE_GEN_DIR))
 
+# How to run ant
+ifdef LANGTOOLS_DIST
+  ANT_CMD = $(ANT)
+else
+  ANT_CMD = $(ANT_WITH_IMPORT)
+endif
+
 $(BUILT_DYLIB) $(BUILT_JAR): $(STABLE_METADATA_FILES) $(CORE_SRC) $(GENERATOR_SRC) $(ADDITIONS_SRC) $(BUILD_SRC)
 	@echo JObjC dylib or jar out of data wrt FRAMEWORKS '(' $(FRAMEWORKS) ')' or JObjC source '(' core, generator, additions, build ')'
 	@echo Running ant with java_home set to ${ALT_BOOTDIR}
-	(cd $(SRCDIR); OBJROOT="$(ABS_OUTPUTDIR)/JObjC.build" DSTROOT="$(ABS_OUTPUTDIR)/JObjC.dst" JAVA_HOME=${ALT_BOOTDIR} STABLE_GEN_DIR="$(ABS_STABLE_GEN_DIR)" /usr/bin/ant -verbose all)
+	(cd $(SRCDIR); OBJROOT="$(ABS_OUTPUTDIR)/JObjC.build" DSTROOT="$(ABS_OUTPUTDIR)/JObjC.dst" JAVA_HOME=${ALT_BOOTDIR} STABLE_GEN_DIR="$(ABS_STABLE_GEN_DIR)" $(ANT_CMD) -verbose all)
 
 all: $(BUILD_DYLIB) $(BUILT_JAR)
 	$(CP) $(BUILT_DYLIB) $(LIB_LOCATION)/libJObjC.dylib
 
 clean clobber::
-	(cd $(SRCDIR); export OBJROOT=$(OUTPUTDIR)/JObjC.build; export DSTROOT=$(OUTPUTDIR)/JObjC.dst; /usr/bin/ant clean)
+	(cd $(SRCDIR); export OBJROOT=$(OUTPUTDIR)/JObjC.build; export DSTROOT=$(OUTPUTDIR)/JObjC.dst; $(ANT_CMD) clean)
 
 endif
--- a/make/java/nio/Makefile	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/java/nio/Makefile	Tue Oct 16 09:37:23 2012 -0700
@@ -277,7 +277,6 @@
 	sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java \
 	sun/nio/ch/UnixAsynchronousSocketChannelImpl.java \
 	\
-	sun/nio/fs/GnomeFileTypeDetector.java \
 	sun/nio/fs/BsdFileStore.java \
 	sun/nio/fs/BsdFileSystem.java \
 	sun/nio/fs/BsdFileSystemProvider.java \
@@ -312,7 +311,6 @@
 	UnixAsynchronousServerSocketChannelImpl.c \
 	UnixAsynchronousSocketChannelImpl.c \
 	\
-	GnomeFileTypeDetector.c \
 	BsdNativeDispatcher.c \
 	MacOSXNativeDispatcher.c \
 	UnixCopyFile.c \
@@ -329,7 +327,6 @@
 	sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java \
 	sun/nio/ch/UnixAsynchronousSocketChannelImpl.java \
 	\
-	sun/nio/fs/GnomeFileTypeDetector.java \
 	sun/nio/fs/BsdNativeDispatcher.java \
 	sun/nio/fs/UnixCopyFile.java \
 	sun/nio/fs/UnixNativeDispatcher.java
--- a/make/java/nio/mapfile-bsd	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/java/nio/mapfile-bsd	Tue Oct 16 09:37:23 2012 -0700
@@ -108,6 +108,7 @@
 		Java_sun_nio_ch_Net_setInterface6;
 		Java_sun_nio_ch_Net_getInterface6;
 		Java_sun_nio_ch_Net_shutdown;
+		Java_sun_nio_ch_Net_poll;
                 Java_sun_nio_ch_PollArrayWrapper_interrupt;
                 Java_sun_nio_ch_PollArrayWrapper_poll0;
                 Java_sun_nio_ch_ServerSocketChannelImpl_accept0;
@@ -121,10 +122,6 @@
 		Java_sun_nio_fs_BsdNativeDispatcher_getfsstat;
 		Java_sun_nio_fs_BsdNativeDispatcher_fsstatEntry;
 		Java_sun_nio_fs_BsdNativeDispatcher_endfsstat;
-		Java_sun_nio_fs_GnomeFileTypeDetector_initializeGio;
-		Java_sun_nio_fs_GnomeFileTypeDetector_probeUsingGio;
-		Java_sun_nio_fs_GnomeFileTypeDetector_initializeGnomeVfs;
-		Java_sun_nio_fs_GnomeFileTypeDetector_probeUsingGnomeVfs;
 		Java_sun_nio_fs_UnixNativeDispatcher_init;
 		Java_sun_nio_fs_UnixNativeDispatcher_getcwd;
 		Java_sun_nio_fs_UnixNativeDispatcher_strerror;
@@ -170,7 +167,6 @@
 		Java_sun_nio_fs_UnixNativeDispatcher_getgrgid;
 		Java_sun_nio_fs_UnixNativeDispatcher_getpwnam0;
 		Java_sun_nio_fs_UnixNativeDispatcher_getgrnam0;
-		Java_sun_nio_fs_UnixNativeDispatcher_getextmntent;
 		Java_sun_nio_fs_UnixCopyFile_transfer;
 		handleSocketError;
 
--- a/make/java/nio/mapfile-linux	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/java/nio/mapfile-linux	Tue Oct 16 09:37:23 2012 -0700
@@ -116,6 +116,7 @@
 		Java_sun_nio_ch_Net_setInterface6;
 		Java_sun_nio_ch_Net_getInterface6;
 		Java_sun_nio_ch_Net_shutdown;
+		Java_sun_nio_ch_Net_poll;
                 Java_sun_nio_ch_PollArrayWrapper_interrupt;
                 Java_sun_nio_ch_PollArrayWrapper_poll0;
                 Java_sun_nio_ch_ServerSocketChannelImpl_accept0;
@@ -143,6 +144,7 @@
 		Java_sun_nio_fs_LinuxNativeDispatcher_fsetxattr0;
 		Java_sun_nio_fs_LinuxNativeDispatcher_fremovexattr0;
 		Java_sun_nio_fs_LinuxNativeDispatcher_setmntent0;
+                Java_sun_nio_fs_LinuxNativeDispatcher_getmntent;
 		Java_sun_nio_fs_LinuxNativeDispatcher_endmntent;
 		Java_sun_nio_fs_UnixNativeDispatcher_init;
 		Java_sun_nio_fs_UnixNativeDispatcher_getcwd;
@@ -189,7 +191,6 @@
 		Java_sun_nio_fs_UnixNativeDispatcher_getgrgid;
 		Java_sun_nio_fs_UnixNativeDispatcher_getpwnam0;
 		Java_sun_nio_fs_UnixNativeDispatcher_getgrnam0;
-		Java_sun_nio_fs_UnixNativeDispatcher_getextmntent;
 		Java_sun_nio_fs_UnixCopyFile_transfer;
 		handleSocketError;
 
--- a/make/java/nio/mapfile-solaris	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/java/nio/mapfile-solaris	Tue Oct 16 09:37:23 2012 -0700
@@ -104,6 +104,7 @@
 		Java_sun_nio_ch_Net_setInterface6;
 		Java_sun_nio_ch_Net_getInterface6;
 		Java_sun_nio_ch_Net_shutdown;
+		Java_sun_nio_ch_Net_poll;
                 Java_sun_nio_ch_PollArrayWrapper_interrupt;
                 Java_sun_nio_ch_PollArrayWrapper_poll0;
                 Java_sun_nio_ch_ServerSocketChannelImpl_accept0;
@@ -169,10 +170,10 @@
 		Java_sun_nio_fs_UnixNativeDispatcher_getgrgid;
 		Java_sun_nio_fs_UnixNativeDispatcher_getpwnam0;
 		Java_sun_nio_fs_UnixNativeDispatcher_getgrnam0;
-		Java_sun_nio_fs_UnixNativeDispatcher_getextmntent;
 		Java_sun_nio_fs_UnixCopyFile_transfer;
 		Java_sun_nio_fs_SolarisNativeDispatcher_init;
 		Java_sun_nio_fs_SolarisNativeDispatcher_facl;
+		Java_sun_nio_fs_SolarisNativeDispatcher_getextmntent;
 		Java_sun_nio_fs_SolarisWatchService_init;
 		Java_sun_nio_fs_SolarisWatchService_portCreate;
 		Java_sun_nio_fs_SolarisWatchService_portAssociate;
--- a/make/java/text/base/FILES_java.gmk	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/java/text/base/FILES_java.gmk	Tue Oct 16 09:37:23 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
@@ -27,7 +27,6 @@
     java/text/Annotation.java \
     java/text/AttributedCharacterIterator.java \
     java/text/AttributedString.java \
-    java/text/BreakDictionary.java \
     java/text/BreakIterator.java \
     java/text/CalendarBuilder.java \
     java/text/CharacterIterator.java \
@@ -36,11 +35,9 @@
     java/text/Collator.java \
     java/text/CollationElementIterator.java \
     java/text/CollationKey.java \
-    java/text/CollationRules.java \
     java/text/DateFormat.java \
     java/text/DateFormatSymbols.java \
     java/text/DecimalFormat.java \
-    java/text/DictionaryBasedBreakIterator.java \
     java/text/DigitList.java \
     java/text/EntryPair.java \
     java/text/Format.java \
@@ -56,7 +53,6 @@
     java/text/PatternEntry.java \
     java/text/RBCollationTables.java \
     java/text/RBTableBuilder.java \
-    java/text/RuleBasedBreakIterator.java \
     java/text/RuleBasedCollator.java \
     java/text/RuleBasedCollationKey.java \
     java/text/SimpleDateFormat.java \
@@ -107,158 +103,150 @@
         sun/text/resources/BreakIteratorInfo.java \
 	\
         sun/text/resources/CollationData.java \
-        sun/text/resources/CollationData_be.java \
-        sun/text/resources/CollationData_bg.java \
-        sun/text/resources/CollationData_ca.java \
-        sun/text/resources/CollationData_cs.java \
-        sun/text/resources/CollationData_da.java \
-        sun/text/resources/CollationData_de.java \
-        sun/text/resources/CollationData_el.java \
-        sun/text/resources/CollationData_en.java \
-        sun/text/resources/CollationData_es.java \
-        sun/text/resources/CollationData_et.java \
-        sun/text/resources/CollationData_fi.java \
-        sun/text/resources/CollationData_fr.java \
-        sun/text/resources/CollationData_hr.java \
-        sun/text/resources/CollationData_hu.java \
-        sun/text/resources/CollationData_is.java \
-        sun/text/resources/CollationData_it.java \
-        sun/text/resources/CollationData_lt.java \
-        sun/text/resources/CollationData_lv.java \
-        sun/text/resources/CollationData_mk.java \
-        sun/text/resources/CollationData_nl.java \
-        sun/text/resources/CollationData_no.java \
-        sun/text/resources/CollationData_pl.java \
-        sun/text/resources/CollationData_pt.java \
-        sun/text/resources/CollationData_ro.java \
-        sun/text/resources/CollationData_ru.java \
-        sun/text/resources/CollationData_sk.java \
-        sun/text/resources/CollationData_sl.java \
-        sun/text/resources/CollationData_sq.java \
-        sun/text/resources/CollationData_sr.java \
-        sun/text/resources/CollationData_sr_Latn.java \
-        sun/text/resources/CollationData_sv.java \
-        sun/text/resources/CollationData_tr.java \
-        sun/text/resources/CollationData_uk.java \
+        sun/text/resources/be/CollationData_be.java \
+        sun/text/resources/bg/CollationData_bg.java \
+        sun/text/resources/ca/CollationData_ca.java \
+        sun/text/resources/cs/CollationData_cs.java \
+        sun/text/resources/da/CollationData_da.java \
+        sun/text/resources/el/CollationData_el.java \
+        sun/text/resources/es/CollationData_es.java \
+        sun/text/resources/et/CollationData_et.java \
+        sun/text/resources/fi/CollationData_fi.java \
+        sun/text/resources/fr/CollationData_fr.java \
+        sun/text/resources/hr/CollationData_hr.java \
+        sun/text/resources/hu/CollationData_hu.java \
+        sun/text/resources/is/CollationData_is.java \
+        sun/text/resources/lt/CollationData_lt.java \
+        sun/text/resources/lv/CollationData_lv.java \
+        sun/text/resources/mk/CollationData_mk.java \
+        sun/text/resources/no/CollationData_no.java \
+        sun/text/resources/pl/CollationData_pl.java \
+        sun/text/resources/ro/CollationData_ro.java \
+        sun/text/resources/ru/CollationData_ru.java \
+        sun/text/resources/sk/CollationData_sk.java \
+        sun/text/resources/sl/CollationData_sl.java \
+        sun/text/resources/sq/CollationData_sq.java \
+        sun/text/resources/sr/CollationData_sr.java \
+        sun/text/resources/sr/CollationData_sr_Latn.java \
+        sun/text/resources/sv/CollationData_sv.java \
+        sun/text/resources/tr/CollationData_tr.java \
+        sun/text/resources/uk/CollationData_uk.java \
 	\
         sun/text/resources/FormatData.java \
-        sun/text/resources/FormatData_be.java \
-        sun/text/resources/FormatData_be_BY.java \
-        sun/text/resources/FormatData_bg.java \
-        sun/text/resources/FormatData_bg_BG.java \
-        sun/text/resources/FormatData_ca.java \
-        sun/text/resources/FormatData_ca_ES.java \
-        sun/text/resources/FormatData_cs.java \
-        sun/text/resources/FormatData_cs_CZ.java \
-        sun/text/resources/FormatData_da.java \
-        sun/text/resources/FormatData_da_DK.java \
-        sun/text/resources/FormatData_de.java \
-        sun/text/resources/FormatData_de_AT.java \
-        sun/text/resources/FormatData_de_CH.java \
-        sun/text/resources/FormatData_de_DE.java \
-        sun/text/resources/FormatData_de_LU.java \
-        sun/text/resources/FormatData_el.java \
-        sun/text/resources/FormatData_el_CY.java \
-        sun/text/resources/FormatData_el_GR.java \
-        sun/text/resources/FormatData_en.java \
-        sun/text/resources/FormatData_en_US.java \
-        sun/text/resources/FormatData_en_AU.java \
-        sun/text/resources/FormatData_en_CA.java \
-        sun/text/resources/FormatData_en_GB.java \
-        sun/text/resources/FormatData_en_IE.java \
-        sun/text/resources/FormatData_en_IN.java \
-        sun/text/resources/FormatData_en_MT.java \
-        sun/text/resources/FormatData_en_NZ.java \
-        sun/text/resources/FormatData_en_PH.java \
-        sun/text/resources/FormatData_en_SG.java \
-        sun/text/resources/FormatData_en_ZA.java \
-        sun/text/resources/FormatData_es.java \
-        sun/text/resources/FormatData_es_BO.java \
-        sun/text/resources/FormatData_es_AR.java \
-        sun/text/resources/FormatData_es_CL.java \
-        sun/text/resources/FormatData_es_CO.java \
-        sun/text/resources/FormatData_es_CR.java \
-        sun/text/resources/FormatData_es_DO.java \
-        sun/text/resources/FormatData_es_EC.java \
-        sun/text/resources/FormatData_es_ES.java \
-        sun/text/resources/FormatData_es_GT.java \
-        sun/text/resources/FormatData_es_HN.java \
-        sun/text/resources/FormatData_es_MX.java \
-        sun/text/resources/FormatData_es_NI.java \
-        sun/text/resources/FormatData_es_PA.java \
-        sun/text/resources/FormatData_es_PE.java \
-        sun/text/resources/FormatData_es_PR.java \
-        sun/text/resources/FormatData_es_PY.java \
-        sun/text/resources/FormatData_es_SV.java \
-        sun/text/resources/FormatData_es_US.java \
-        sun/text/resources/FormatData_es_UY.java \
-        sun/text/resources/FormatData_es_VE.java \
-        sun/text/resources/FormatData_et.java \
-        sun/text/resources/FormatData_et_EE.java \
-        sun/text/resources/FormatData_fi.java \
-        sun/text/resources/FormatData_fi_FI.java \
-        sun/text/resources/FormatData_fr.java \
-        sun/text/resources/FormatData_fr_BE.java \
-        sun/text/resources/FormatData_fr_CA.java \
-        sun/text/resources/FormatData_fr_CH.java \
-        sun/text/resources/FormatData_fr_FR.java \
-        sun/text/resources/FormatData_fr_LU.java \
-        sun/text/resources/FormatData_ga.java \
-        sun/text/resources/FormatData_ga_IE.java \
-        sun/text/resources/FormatData_hr.java \
-        sun/text/resources/FormatData_hr_HR.java \
-        sun/text/resources/FormatData_hu.java \
-        sun/text/resources/FormatData_hu_HU.java \
-        sun/text/resources/FormatData_in.java \
-        sun/text/resources/FormatData_in_ID.java \
-        sun/text/resources/FormatData_is.java \
-        sun/text/resources/FormatData_is_IS.java \
-        sun/text/resources/FormatData_it.java \
-        sun/text/resources/FormatData_it_CH.java \
-        sun/text/resources/FormatData_it_IT.java \
-        sun/text/resources/FormatData_lt.java \
-        sun/text/resources/FormatData_lt_LT.java \
-        sun/text/resources/FormatData_lv.java \
-        sun/text/resources/FormatData_lv_LV.java \
-        sun/text/resources/FormatData_mk.java \
-        sun/text/resources/FormatData_mk_MK.java \
-        sun/text/resources/FormatData_ms.java \
-        sun/text/resources/FormatData_ms_MY.java \
-        sun/text/resources/FormatData_mt.java \
-        sun/text/resources/FormatData_mt_MT.java \
-        sun/text/resources/FormatData_nl.java \
-        sun/text/resources/FormatData_nl_BE.java \
-        sun/text/resources/FormatData_nl_NL.java \
-        sun/text/resources/FormatData_no.java \
-        sun/text/resources/FormatData_no_NO.java \
-        sun/text/resources/FormatData_no_NO_NY.java \
-        sun/text/resources/FormatData_pl.java \
-        sun/text/resources/FormatData_pl_PL.java \
-        sun/text/resources/FormatData_pt.java \
-        sun/text/resources/FormatData_pt_BR.java \
-        sun/text/resources/FormatData_pt_PT.java \
-        sun/text/resources/FormatData_ro.java \
-        sun/text/resources/FormatData_ro_RO.java \
-        sun/text/resources/FormatData_ru.java \
-        sun/text/resources/FormatData_ru_RU.java \
-        sun/text/resources/FormatData_sk.java \
-        sun/text/resources/FormatData_sk_SK.java \
-        sun/text/resources/FormatData_sl.java \
-        sun/text/resources/FormatData_sl_SI.java \
-        sun/text/resources/FormatData_sq.java \
-        sun/text/resources/FormatData_sq_AL.java \
-        sun/text/resources/FormatData_sr.java \
-        sun/text/resources/FormatData_sr_BA.java \
-        sun/text/resources/FormatData_sr_CS.java \
-        sun/text/resources/FormatData_sr_ME.java \
-        sun/text/resources/FormatData_sr_RS.java \
-        sun/text/resources/FormatData_sr_Latn.java \
-        sun/text/resources/FormatData_sr_Latn_BA.java \
-        sun/text/resources/FormatData_sr_Latn_ME.java \
-        sun/text/resources/FormatData_sr_Latn_RS.java \
-        sun/text/resources/FormatData_sv.java \
-        sun/text/resources/FormatData_sv_SE.java \
-        sun/text/resources/FormatData_tr.java \
-        sun/text/resources/FormatData_tr_TR.java \
-        sun/text/resources/FormatData_uk.java \
-        sun/text/resources/FormatData_uk_UA.java
+        sun/text/resources/be/FormatData_be.java \
+        sun/text/resources/be/FormatData_be_BY.java \
+        sun/text/resources/bg/FormatData_bg.java \
+        sun/text/resources/bg/FormatData_bg_BG.java \
+        sun/text/resources/ca/FormatData_ca.java \
+        sun/text/resources/ca/FormatData_ca_ES.java \
+        sun/text/resources/cs/FormatData_cs.java \
+        sun/text/resources/cs/FormatData_cs_CZ.java \
+        sun/text/resources/da/FormatData_da.java \
+        sun/text/resources/da/FormatData_da_DK.java \
+        sun/text/resources/de/FormatData_de.java \
+        sun/text/resources/de/FormatData_de_AT.java \
+        sun/text/resources/de/FormatData_de_CH.java \
+        sun/text/resources/de/FormatData_de_DE.java \
+        sun/text/resources/de/FormatData_de_LU.java \
+        sun/text/resources/el/FormatData_el.java \
+        sun/text/resources/el/FormatData_el_CY.java \
+        sun/text/resources/el/FormatData_el_GR.java \
+        sun/text/resources/en/FormatData_en.java \
+        sun/text/resources/en/FormatData_en_US.java \
+        sun/text/resources/en/FormatData_en_AU.java \
+        sun/text/resources/en/FormatData_en_CA.java \
+        sun/text/resources/en/FormatData_en_GB.java \
+        sun/text/resources/en/FormatData_en_IE.java \
+        sun/text/resources/en/FormatData_en_IN.java \
+        sun/text/resources/en/FormatData_en_MT.java \
+        sun/text/resources/en/FormatData_en_NZ.java \
+        sun/text/resources/en/FormatData_en_PH.java \
+        sun/text/resources/en/FormatData_en_SG.java \
+        sun/text/resources/en/FormatData_en_ZA.java \
+        sun/text/resources/es/FormatData_es.java \
+        sun/text/resources/es/FormatData_es_BO.java \
+        sun/text/resources/es/FormatData_es_AR.java \
+        sun/text/resources/es/FormatData_es_CL.java \
+        sun/text/resources/es/FormatData_es_CO.java \
+        sun/text/resources/es/FormatData_es_CR.java \
+        sun/text/resources/es/FormatData_es_DO.java \
+        sun/text/resources/es/FormatData_es_EC.java \
+        sun/text/resources/es/FormatData_es_ES.java \
+        sun/text/resources/es/FormatData_es_GT.java \
+        sun/text/resources/es/FormatData_es_HN.java \
+        sun/text/resources/es/FormatData_es_MX.java \
+        sun/text/resources/es/FormatData_es_NI.java \
+        sun/text/resources/es/FormatData_es_PA.java \
+        sun/text/resources/es/FormatData_es_PE.java \
+        sun/text/resources/es/FormatData_es_PR.java \
+        sun/text/resources/es/FormatData_es_PY.java \
+        sun/text/resources/es/FormatData_es_SV.java \
+        sun/text/resources/es/FormatData_es_US.java \
+        sun/text/resources/es/FormatData_es_UY.java \
+        sun/text/resources/es/FormatData_es_VE.java \
+        sun/text/resources/et/FormatData_et.java \
+        sun/text/resources/et/FormatData_et_EE.java \
+        sun/text/resources/fi/FormatData_fi.java \
+        sun/text/resources/fi/FormatData_fi_FI.java \
+        sun/text/resources/fr/FormatData_fr.java \
+        sun/text/resources/fr/FormatData_fr_BE.java \
+        sun/text/resources/fr/FormatData_fr_CA.java \
+        sun/text/resources/fr/FormatData_fr_CH.java \
+        sun/text/resources/fr/FormatData_fr_FR.java \
+        sun/text/resources/ga/FormatData_ga.java \
+        sun/text/resources/ga/FormatData_ga_IE.java \
+        sun/text/resources/hr/FormatData_hr.java \
+        sun/text/resources/hr/FormatData_hr_HR.java \
+        sun/text/resources/hu/FormatData_hu.java \
+        sun/text/resources/hu/FormatData_hu_HU.java \
+        sun/text/resources/in/FormatData_in.java \
+        sun/text/resources/in/FormatData_in_ID.java \
+        sun/text/resources/is/FormatData_is.java \
+        sun/text/resources/is/FormatData_is_IS.java \
+        sun/text/resources/it/FormatData_it.java \
+        sun/text/resources/it/FormatData_it_CH.java \
+        sun/text/resources/it/FormatData_it_IT.java \
+        sun/text/resources/lt/FormatData_lt.java \
+        sun/text/resources/lt/FormatData_lt_LT.java \
+        sun/text/resources/lv/FormatData_lv.java \
+        sun/text/resources/lv/FormatData_lv_LV.java \
+        sun/text/resources/mk/FormatData_mk.java \
+        sun/text/resources/mk/FormatData_mk_MK.java \
+        sun/text/resources/ms/FormatData_ms.java \
+        sun/text/resources/ms/FormatData_ms_MY.java \
+        sun/text/resources/mt/FormatData_mt.java \
+        sun/text/resources/mt/FormatData_mt_MT.java \
+        sun/text/resources/nl/FormatData_nl.java \
+        sun/text/resources/nl/FormatData_nl_BE.java \
+        sun/text/resources/nl/FormatData_nl_NL.java \
+        sun/text/resources/no/FormatData_no.java \
+        sun/text/resources/no/FormatData_no_NO.java \
+        sun/text/resources/no/FormatData_no_NO_NY.java \
+        sun/text/resources/pl/FormatData_pl.java \
+        sun/text/resources/pl/FormatData_pl_PL.java \
+        sun/text/resources/pt/FormatData_pt.java \
+        sun/text/resources/pt/FormatData_pt_BR.java \
+        sun/text/resources/pt/FormatData_pt_PT.java \
+        sun/text/resources/ro/FormatData_ro.java \
+        sun/text/resources/ro/FormatData_ro_RO.java \
+        sun/text/resources/ru/FormatData_ru.java \
+        sun/text/resources/ru/FormatData_ru_RU.java \
+        sun/text/resources/sk/FormatData_sk.java \
+        sun/text/resources/sk/FormatData_sk_SK.java \
+        sun/text/resources/sl/FormatData_sl.java \
+        sun/text/resources/sl/FormatData_sl_SI.java \
+        sun/text/resources/sq/FormatData_sq.java \
+        sun/text/resources/sq/FormatData_sq_AL.java \
+        sun/text/resources/sr/FormatData_sr.java \
+        sun/text/resources/sr/FormatData_sr_BA.java \
+        sun/text/resources/sr/FormatData_sr_CS.java \
+        sun/text/resources/sr/FormatData_sr_ME.java \
+        sun/text/resources/sr/FormatData_sr_RS.java \
+        sun/text/resources/sr/FormatData_sr_Latn.java \
+        sun/text/resources/sr/FormatData_sr_Latn_ME.java \
+        sun/text/resources/sv/FormatData_sv.java \
+        sun/text/resources/sv/FormatData_sv_SE.java \
+        sun/text/resources/tr/FormatData_tr.java \
+        sun/text/resources/tr/FormatData_tr_TR.java \
+        sun/text/resources/uk/FormatData_uk.java \
+        sun/text/resources/uk/FormatData_uk_UA.java
--- a/make/java/util/FILES_java.gmk	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/java/util/FILES_java.gmk	Tue Oct 16 09:37:23 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2010, 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
@@ -29,13 +29,13 @@
         sun/util/resources/LocaleNamesBundle.java \
         sun/util/resources/TimeZoneNamesBundle.java \
         sun/util/resources/TimeZoneNames.java \
-        sun/util/resources/TimeZoneNames_de.java \
-        sun/util/resources/TimeZoneNames_en.java \
-        sun/util/resources/TimeZoneNames_en_CA.java \
-        sun/util/resources/TimeZoneNames_en_GB.java \
-        sun/util/resources/TimeZoneNames_en_IE.java \
-        sun/util/resources/TimeZoneNames_es.java \
-        sun/util/resources/TimeZoneNames_fr.java \
-        sun/util/resources/TimeZoneNames_it.java \
-        sun/util/resources/TimeZoneNames_pt_BR.java \
-        sun/util/resources/TimeZoneNames_sv.java
+        sun/util/resources/de/TimeZoneNames_de.java \
+        sun/util/resources/en/TimeZoneNames_en.java \
+        sun/util/resources/en/TimeZoneNames_en_CA.java \
+        sun/util/resources/en/TimeZoneNames_en_GB.java \
+        sun/util/resources/en/TimeZoneNames_en_IE.java \
+        sun/util/resources/es/TimeZoneNames_es.java \
+        sun/util/resources/fr/TimeZoneNames_fr.java \
+        sun/util/resources/it/TimeZoneNames_it.java \
+        sun/util/resources/pt/TimeZoneNames_pt_BR.java \
+        sun/util/resources/sv/TimeZoneNames_sv.java
--- a/make/java/util/FILES_properties.gmk	Mon Oct 15 15:48:45 2012 -0700
+++ b/make/java/util/FILES_properties.gmk	Tue Oct 16 09:37:23 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
@@ -25,189 +25,189 @@
 
 FILES_compiled_properties = \
         sun/util/resources/LocaleNames.properties \
-        sun/util/resources/LocaleNames_be.properties \
-        sun/util/resources/LocaleNames_bg.properties \
-        sun/util/resources/LocaleNames_ca.properties \
-        sun/util/resources/LocaleNames_cs.properties \
-        sun/util/resources/LocaleNames_da.properties \
-        sun/util/resources/LocaleNames_de.properties \
-        sun/util/resources/LocaleNames_el.properties \
-        sun/util/resources/LocaleNames_el_CY.properties \
-        sun/util/resources/LocaleNames_en.properties \
-        sun/util/resources/LocaleNames_en_MT.properties \
-        sun/util/resources/LocaleNames_en_PH.properties \
-        sun/util/resources/LocaleNames_en_SG.properties \
-        sun/util/resources/LocaleNames_es.properties \
-        sun/util/resources/LocaleNames_es_US.properties \
-        sun/util/resources/LocaleNames_et.properties \
-        sun/util/resources/LocaleNames_fi.properties \
-        sun/util/resources/LocaleNames_fr.properties \
-        sun/util/resources/LocaleNames_ga.properties \
-        sun/util/resources/LocaleNames_hr.properties \
-        sun/util/resources/LocaleNames_hu.properties \
-        sun/util/resources/LocaleNames_in.properties \
-        sun/util/resources/LocaleNames_is.properties \
-        sun/util/resources/LocaleNames_it.properties \
-        sun/util/resources/LocaleNames_lt.properties \
-        sun/util/resources/LocaleNames_lv.properties \
-        sun/util/resources/LocaleNames_mk.properties \
-        sun/util/resources/LocaleNames_ms.properties \
-        sun/util/resources/LocaleNames_mt.properties \
-        sun/util/resources/LocaleNames_nl.properties \
-        sun/util/resources/LocaleNames_no.properties \
-        sun/util/resources/LocaleNames_no_NO_NY.properties \
-        sun/util/resources/LocaleNames_pl.properties \
-        sun/util/resources/LocaleNames_pt.properties \
-        sun/util/resources/LocaleNames_pt_BR.properties \
-        sun/util/resources/LocaleNames_pt_PT.properties \
-        sun/util/resources/LocaleNames_ro.properties \
-        sun/util/resources/LocaleNames_ru.properties \
-        sun/util/resources/LocaleNames_sk.properties \
-        sun/util/resources/LocaleNames_sl.properties \
-        sun/util/resources/LocaleNames_sq.properties \
-        sun/util/resources/LocaleNames_sr.properties \
-        sun/util/resources/LocaleNames_sr_Latn.properties \
-        sun/util/resources/LocaleNames_sv.properties \
-        sun/util/resources/LocaleNames_tr.properties \
-        sun/util/resources/LocaleNames_uk.properties \
+        sun/util/resources/be/LocaleNames_be.properties \
+        sun/util/resources/bg/LocaleNames_bg.properties \
+        sun/util/resources/ca/LocaleNames_ca.properties \
+        sun/util/resources/cs/LocaleNames_cs.properties \
+        sun/util/resources/da/LocaleNames_da.properties \
+        sun/util/resources/de/LocaleNames_de.properties \
+        sun/util/resources/el/LocaleNames_el.properties \
+        sun/util/resources/el/LocaleNames_el_CY.properties \
+        sun/util/resources/en/LocaleNames_en.properties \
+        sun/util/resources/en/LocaleNames_en_MT.properties \
+        sun/util/resources/en/LocaleNames_en_PH.properties \
+        sun/util/resources/en/LocaleNames_en_SG.properties \
+        sun/util/resources/es/LocaleNames_es.properties \
+        sun/util/resources/es/LocaleNames_es_US.properties \
+        sun/util/resources/et/LocaleNames_et.properties \
+        sun/util/resources/fi/LocaleNames_fi.properties \
+        sun/util/resources/fr/LocaleNames_fr.properties \
+        sun/util/resources/ga/LocaleNames_ga.properties \
+        sun/util/resources/hr/LocaleNames_hr.properties \
+        sun/util/resources/hu/LocaleNames_hu.properties \
+        sun/util/resources/in/LocaleNames_in.properties \
+        sun/util/resources/is/LocaleNames_is.properties \
+        sun/util/resources/it/LocaleNames_it.properties \
+        sun/util/resources/lt/LocaleNames_lt.properties \