changeset 15690:5e6c9c2f13e0

8007436: (profiles) Add JSR-310 to Compact Profiles contents Reviewed-by: dholmes, erikj
author alanb
date Mon, 18 Feb 2013 08:57:06 +0000
parents 50d655fbb5ca
children 0f039e7fe863
files jdk/makefiles/profile-includes.txt jdk/makefiles/profile-rtjar-includes.txt
diffstat 2 files changed, 4 insertions(+), 455 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/makefiles/profile-includes.txt	Sun Feb 17 16:44:19 2013 -0500
+++ b/jdk/makefiles/profile-includes.txt	Mon Feb 18 08:57:06 2013 +0000
@@ -76,460 +76,7 @@
     security/java.security \
     security/local_policy.jar \
     security/trusted.libraries \
-    zi/Africa/Abidjan \
-    zi/Africa/Accra \
-    zi/Africa/Addis_Ababa \
-    zi/Africa/Algiers \
-    zi/Africa/Asmara \
-    zi/Africa/Bamako \
-    zi/Africa/Bangui \
-    zi/Africa/Banjul \
-    zi/Africa/Bissau \
-    zi/Africa/Blantyre \
-    zi/Africa/Brazzaville \
-    zi/Africa/Bujumbura \
-    zi/Africa/Cairo \
-    zi/Africa/Casablanca \
-    zi/Africa/Ceuta \
-    zi/Africa/Conakry \
-    zi/Africa/Dakar \
-    zi/Africa/Dar_es_Salaam \
-    zi/Africa/Djibouti \
-    zi/Africa/Douala \
-    zi/Africa/El_Aaiun \
-    zi/Africa/Freetown \
-    zi/Africa/Gaborone \
-    zi/Africa/Harare \
-    zi/Africa/Johannesburg \
-    zi/Africa/Juba \
-    zi/Africa/Kampala \
-    zi/Africa/Khartoum \
-    zi/Africa/Kigali \
-    zi/Africa/Kinshasa \
-    zi/Africa/Lagos \
-    zi/Africa/Libreville \
-    zi/Africa/Lome \
-    zi/Africa/Luanda \
-    zi/Africa/Lubumbashi \
-    zi/Africa/Lusaka \
-    zi/Africa/Malabo \
-    zi/Africa/Maputo \
-    zi/Africa/Maseru \
-    zi/Africa/Mbabane \
-    zi/Africa/Mogadishu \
-    zi/Africa/Monrovia \
-    zi/Africa/Nairobi \
-    zi/Africa/Ndjamena \
-    zi/Africa/Niamey \
-    zi/Africa/Nouakchott \
-    zi/Africa/Ouagadougou \
-    zi/Africa/Porto-Novo \
-    zi/Africa/Sao_Tome \
-    zi/Africa/Tripoli \
-    zi/Africa/Tunis \
-    zi/Africa/Windhoek \
-    zi/America/Adak \
-    zi/America/Anchorage \
-    zi/America/Anguilla \
-    zi/America/Antigua \
-    zi/America/Araguaina \
-    zi/America/Argentina/Buenos_Aires \
-    zi/America/Argentina/Catamarca \
-    zi/America/Argentina/Cordoba \
-    zi/America/Argentina/Jujuy \
-    zi/America/Argentina/La_Rioja \
-    zi/America/Argentina/Mendoza \
-    zi/America/Argentina/Rio_Gallegos \
-    zi/America/Argentina/Salta \
-    zi/America/Argentina/San_Juan \
-    zi/America/Argentina/San_Luis \
-    zi/America/Argentina/Tucuman \
-    zi/America/Argentina/Ushuaia \
-    zi/America/Aruba \
-    zi/America/Asuncion \
-    zi/America/Atikokan \
-    zi/America/Bahia \
-    zi/America/Bahia_Banderas \
-    zi/America/Barbados \
-    zi/America/Belem \
-    zi/America/Belize \
-    zi/America/Blanc-Sablon \
-    zi/America/Boa_Vista \
-    zi/America/Bogota \
-    zi/America/Boise \
-    zi/America/Cambridge_Bay \
-    zi/America/Campo_Grande \
-    zi/America/Cancun \
-    zi/America/Caracas \
-    zi/America/Cayenne \
-    zi/America/Cayman \
-    zi/America/Chicago \
-    zi/America/Chihuahua \
-    zi/America/Costa_Rica \
-    zi/America/Creston \
-    zi/America/Cuiaba \
-    zi/America/Curacao \
-    zi/America/Danmarkshavn \
-    zi/America/Dawson \
-    zi/America/Dawson_Creek \
-    zi/America/Denver \
-    zi/America/Detroit \
-    zi/America/Dominica \
-    zi/America/Edmonton \
-    zi/America/Eirunepe \
-    zi/America/El_Salvador \
-    zi/America/Fortaleza \
-    zi/America/Glace_Bay \
-    zi/America/Godthab \
-    zi/America/Goose_Bay \
-    zi/America/Grand_Turk \
-    zi/America/Grenada \
-    zi/America/Guadeloupe \
-    zi/America/Guatemala \
-    zi/America/Guayaquil \
-    zi/America/Guyana \
-    zi/America/Halifax \
-    zi/America/Havana \
-    zi/America/Hermosillo \
-    zi/America/Indiana/Indianapolis \
-    zi/America/Indiana/Knox \
-    zi/America/Indiana/Marengo \
-    zi/America/Indiana/Petersburg \
-    zi/America/Indiana/Tell_City \
-    zi/America/Indiana/Vevay \
-    zi/America/Indiana/Vincennes \
-    zi/America/Indiana/Winamac \
-    zi/America/Inuvik \
-    zi/America/Iqaluit \
-    zi/America/Jamaica \
-    zi/America/Juneau \
-    zi/America/Kentucky/Louisville \
-    zi/America/Kentucky/Monticello \
-    zi/America/La_Paz \
-    zi/America/Lima \
-    zi/America/Los_Angeles \
-    zi/America/Maceio \
-    zi/America/Managua \
-    zi/America/Manaus \
-    zi/America/Martinique \
-    zi/America/Matamoros \
-    zi/America/Mazatlan \
-    zi/America/Menominee \
-    zi/America/Merida \
-    zi/America/Metlakatla \
-    zi/America/Mexico_City \
-    zi/America/Miquelon \
-    zi/America/Moncton \
-    zi/America/Monterrey \
-    zi/America/Montevideo \
-    zi/America/Montreal \
-    zi/America/Montserrat \
-    zi/America/Nassau \
-    zi/America/New_York \
-    zi/America/Nipigon \
-    zi/America/Nome \
-    zi/America/Noronha \
-    zi/America/North_Dakota/Beulah \
-    zi/America/North_Dakota/Center \
-    zi/America/North_Dakota/New_Salem \
-    zi/America/Ojinaga \
-    zi/America/Panama \
-    zi/America/Pangnirtung \
-    zi/America/Paramaribo \
-    zi/America/Phoenix \
-    zi/America/Port-au-Prince \
-    zi/America/Port_of_Spain \
-    zi/America/Porto_Velho \
-    zi/America/Puerto_Rico \
-    zi/America/Rainy_River \
-    zi/America/Rankin_Inlet \
-    zi/America/Recife \
-    zi/America/Regina \
-    zi/America/Resolute \
-    zi/America/Rio_Branco \
-    zi/America/Santa_Isabel \
-    zi/America/Santarem \
-    zi/America/Santiago \
-    zi/America/Santo_Domingo \
-    zi/America/Sao_Paulo \
-    zi/America/Scoresbysund \
-    zi/America/Sitka \
-    zi/America/St_Johns \
-    zi/America/St_Kitts \
-    zi/America/St_Lucia \
-    zi/America/St_Thomas \
-    zi/America/St_Vincent \
-    zi/America/Swift_Current \
-    zi/America/Tegucigalpa \
-    zi/America/Thule \
-    zi/America/Thunder_Bay \
-    zi/America/Tijuana \
-    zi/America/Toronto \
-    zi/America/Tortola \
-    zi/America/Vancouver \
-    zi/America/Whitehorse \
-    zi/America/Winnipeg \
-    zi/America/Yakutat \
-    zi/America/Yellowknife \
-    zi/Antarctica/Casey \
-    zi/Antarctica/Davis \
-    zi/Antarctica/DumontDUrville \
-    zi/Antarctica/Macquarie \
-    zi/Antarctica/Mawson \
-    zi/Antarctica/McMurdo \
-    zi/Antarctica/Palmer \
-    zi/Antarctica/Rothera \
-    zi/Antarctica/Syowa \
-    zi/Antarctica/Vostok \
-    zi/Asia/Aden \
-    zi/Asia/Almaty \
-    zi/Asia/Amman \
-    zi/Asia/Anadyr \
-    zi/Asia/Aqtau \
-    zi/Asia/Aqtobe \
-    zi/Asia/Ashgabat \
-    zi/Asia/Baghdad \
-    zi/Asia/Bahrain \
-    zi/Asia/Baku \
-    zi/Asia/Bangkok \
-    zi/Asia/Beirut \
-    zi/Asia/Bishkek \
-    zi/Asia/Brunei \
-    zi/Asia/Choibalsan \
-    zi/Asia/Chongqing \
-    zi/Asia/Colombo \
-    zi/Asia/Damascus \
-    zi/Asia/Dhaka \
-    zi/Asia/Dili \
-    zi/Asia/Dubai \
-    zi/Asia/Dushanbe \
-    zi/Asia/Gaza \
-    zi/Asia/Harbin \
-    zi/Asia/Hebron \
-    zi/Asia/Ho_Chi_Minh \
-    zi/Asia/Hong_Kong \
-    zi/Asia/Hovd \
-    zi/Asia/Irkutsk \
-    zi/Asia/Jakarta \
-    zi/Asia/Jayapura \
-    zi/Asia/Jerusalem \
-    zi/Asia/Kabul \
-    zi/Asia/Kamchatka \
-    zi/Asia/Karachi \
-    zi/Asia/Kashgar \
-    zi/Asia/Kathmandu \
-    zi/Asia/Kolkata \
-    zi/Asia/Krasnoyarsk \
-    zi/Asia/Kuala_Lumpur \
-    zi/Asia/Kuching \
-    zi/Asia/Kuwait \
-    zi/Asia/Macau \
-    zi/Asia/Magadan \
-    zi/Asia/Makassar \
-    zi/Asia/Manila \
-    zi/Asia/Muscat \
-    zi/Asia/Nicosia \
-    zi/Asia/Novokuznetsk \
-    zi/Asia/Novosibirsk \
-    zi/Asia/Omsk \
-    zi/Asia/Oral \
-    zi/Asia/Phnom_Penh \
-    zi/Asia/Pontianak \
-    zi/Asia/Pyongyang \
-    zi/Asia/Qatar \
-    zi/Asia/Qyzylorda \
-    zi/Asia/Rangoon \
-    zi/Asia/Riyadh \
-    zi/Asia/Riyadh87 \
-    zi/Asia/Riyadh88 \
-    zi/Asia/Riyadh89 \
-    zi/Asia/Sakhalin \
-    zi/Asia/Samarkand \
-    zi/Asia/Seoul \
-    zi/Asia/Shanghai \
-    zi/Asia/Singapore \
-    zi/Asia/Taipei \
-    zi/Asia/Tashkent \
-    zi/Asia/Tbilisi \
-    zi/Asia/Tehran \
-    zi/Asia/Thimphu \
-    zi/Asia/Tokyo \
-    zi/Asia/Ulaanbaatar \
-    zi/Asia/Urumqi \
-    zi/Asia/Vientiane \
-    zi/Asia/Vladivostok \
-    zi/Asia/Yakutsk \
-    zi/Asia/Yekaterinburg \
-    zi/Asia/Yerevan \
-    zi/Atlantic/Azores \
-    zi/Atlantic/Bermuda \
-    zi/Atlantic/Canary \
-    zi/Atlantic/Cape_Verde \
-    zi/Atlantic/Faroe \
-    zi/Atlantic/Madeira \
-    zi/Atlantic/Reykjavik \
-    zi/Atlantic/South_Georgia \
-    zi/Atlantic/St_Helena \
-    zi/Atlantic/Stanley \
-    zi/Australia/Adelaide \
-    zi/Australia/Brisbane \
-    zi/Australia/Broken_Hill \
-    zi/Australia/Currie \
-    zi/Australia/Darwin \
-    zi/Australia/Eucla \
-    zi/Australia/Hobart \
-    zi/Australia/Lindeman \
-    zi/Australia/Lord_Howe \
-    zi/Australia/Melbourne \
-    zi/Australia/Perth \
-    zi/Australia/Sydney \
-    zi/CET \
-    zi/CST6CDT \
-    zi/EET \
-    zi/EST \
-    zi/EST5EDT \
-    zi/Etc/GMT \
-    zi/Etc/GMT+1 \
-    zi/Etc/GMT+10 \
-    zi/Etc/GMT+11 \
-    zi/Etc/GMT+12 \
-    zi/Etc/GMT+2 \
-    zi/Etc/GMT+3 \
-    zi/Etc/GMT+4 \
-    zi/Etc/GMT+5 \
-    zi/Etc/GMT+6 \
-    zi/Etc/GMT+7 \
-    zi/Etc/GMT+8 \
-    zi/Etc/GMT+9 \
-    zi/Etc/GMT-1 \
-    zi/Etc/GMT-10 \
-    zi/Etc/GMT-11 \
-    zi/Etc/GMT-12 \
-    zi/Etc/GMT-13 \
-    zi/Etc/GMT-14 \
-    zi/Etc/GMT-2 \
-    zi/Etc/GMT-3 \
-    zi/Etc/GMT-4 \
-    zi/Etc/GMT-5 \
-    zi/Etc/GMT-6 \
-    zi/Etc/GMT-7 \
-    zi/Etc/GMT-8 \
-    zi/Etc/GMT-9 \
-    zi/Etc/UCT \
-    zi/Etc/UTC \
-    zi/Europe/Amsterdam \
-    zi/Europe/Andorra \
-    zi/Europe/Athens \
-    zi/Europe/Belgrade \
-    zi/Europe/Berlin \
-    zi/Europe/Brussels \
-    zi/Europe/Bucharest \
-    zi/Europe/Budapest \
-    zi/Europe/Chisinau \
-    zi/Europe/Copenhagen \
-    zi/Europe/Dublin \
-    zi/Europe/Gibraltar \
-    zi/Europe/Helsinki \
-    zi/Europe/Istanbul \
-    zi/Europe/Kaliningrad \
-    zi/Europe/Kiev \
-    zi/Europe/Lisbon \
-    zi/Europe/London \
-    zi/Europe/Luxembourg \
-    zi/Europe/Madrid \
-    zi/Europe/Malta \
-    zi/Europe/Minsk \
-    zi/Europe/Monaco \
-    zi/Europe/Moscow \
-    zi/Europe/Oslo \
-    zi/Europe/Paris \
-    zi/Europe/Prague \
-    zi/Europe/Riga \
-    zi/Europe/Rome \
-    zi/Europe/Samara \
-    zi/Europe/Simferopol \
-    zi/Europe/Sofia \
-    zi/Europe/Stockholm \
-    zi/Europe/Tallinn \
-    zi/Europe/Tirane \
-    zi/Europe/Uzhgorod \
-    zi/Europe/Vaduz \
-    zi/Europe/Vienna \
-    zi/Europe/Vilnius \
-    zi/Europe/Volgograd \
-    zi/Europe/Warsaw \
-    zi/Europe/Zaporozhye \
-    zi/Europe/Zurich \
-    zi/GMT \
-    zi/HST \
-    zi/Indian/Antananarivo \
-    zi/Indian/Chagos \
-    zi/Indian/Christmas \
-    zi/Indian/Cocos \
-    zi/Indian/Comoro \
-    zi/Indian/Kerguelen \
-    zi/Indian/Mahe \
-    zi/Indian/Maldives \
-    zi/Indian/Mauritius \
-    zi/Indian/Mayotte \
-    zi/Indian/Reunion \
-    zi/MET \
-    zi/MST \
-    zi/MST7MDT \
-    zi/PST8PDT \
-    zi/Pacific/Apia \
-    zi/Pacific/Auckland \
-    zi/Pacific/Chatham \
-    zi/Pacific/Chuuk \
-    zi/Pacific/Easter \
-    zi/Pacific/Efate \
-    zi/Pacific/Enderbury \
-    zi/Pacific/Fakaofo \
-    zi/Pacific/Fiji \
-    zi/Pacific/Funafuti \
-    zi/Pacific/Galapagos \
-    zi/Pacific/Gambier \
-    zi/Pacific/Guadalcanal \
-    zi/Pacific/Guam \
-    zi/Pacific/Honolulu \
-    zi/Pacific/Johnston \
-    zi/Pacific/Kiritimati \
-    zi/Pacific/Kosrae \
-    zi/Pacific/Kwajalein \
-    zi/Pacific/Majuro \
-    zi/Pacific/Marquesas \
-    zi/Pacific/Midway \
-    zi/Pacific/Nauru \
-    zi/Pacific/Niue \
-    zi/Pacific/Norfolk \
-    zi/Pacific/Noumea \
-    zi/Pacific/Pago_Pago \
-    zi/Pacific/Palau \
-    zi/Pacific/Pitcairn \
-    zi/Pacific/Pohnpei \
-    zi/Pacific/Port_Moresby \
-    zi/Pacific/Rarotonga \
-    zi/Pacific/Saipan \
-    zi/Pacific/Tahiti \
-    zi/Pacific/Tarawa \
-    zi/Pacific/Tongatapu \
-    zi/Pacific/Wake \
-    zi/Pacific/Wallis \
-    zi/SystemV/AST4 \
-    zi/SystemV/AST4ADT \
-    zi/SystemV/CST6 \
-    zi/SystemV/CST6CDT \
-    zi/SystemV/EST5 \
-    zi/SystemV/EST5EDT \
-    zi/SystemV/HST10 \
-    zi/SystemV/MST7 \
-    zi/SystemV/MST7MDT \
-    zi/SystemV/PST8 \
-    zi/SystemV/PST8PDT \
-    zi/SystemV/YST9 \
-    zi/SystemV/YST9YDT \
-    zi/WET \
-    zi/ZoneInfoMappings
+    tzdb.jar
 
 PROFILE_1_JRE_OTHER_FILES := \
     COPYRIGHT \
@@ -547,7 +94,8 @@
     resources.jar \
     rt.jar \
     security/US_export_policy.jar \
-    security/local_policy.jar
+    security/local_policy.jar \
+    tzdb.jar
 
 
 PROFILE_2_JRE_BIN_FILES := \
--- a/jdk/makefiles/profile-rtjar-includes.txt	Sun Feb 17 16:44:19 2013 -0500
+++ b/jdk/makefiles/profile-rtjar-includes.txt	Mon Feb 18 08:57:06 2013 +0000
@@ -51,6 +51,7 @@
     java/security/spec \
     java/text \
     java/text/spi \
+    java/time \
     java/util \
     java/util/concurrent \
     java/util/concurrent/atomic \