# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1423868476 -3600
# Node ID 87d37281ea41e48eab91cc82dfbd976d8086f617
# Parent  b9ad6f933bc913f9c59b6a73a6b7655ab85c60bd
Partially back out correction to NPE in changeset e0e108e77052, since
the most important blocks relate to the flawed ResourceLoader class.

diff -r b9ad6f933bc9 -r 87d37281ea41 src/net/fortuna/ical4j/model/TimeZoneRegistryImpl.java
--- a/src/net/fortuna/ical4j/model/TimeZoneRegistryImpl.java	Thu Feb 12 21:48:00 2015 +0100
+++ b/src/net/fortuna/ical4j/model/TimeZoneRegistryImpl.java	Sat Feb 14 00:01:16 2015 +0100
@@ -73,14 +73,14 @@
     private static final Properties ALIASES = new Properties();
     static {
         try {
-            ALIASES.load(ResourceLoader.getResourceAsStream("tz.alias"));
+            ALIASES.load(ResourceLoader.getResourceAsStream("net/fortuna/ical4j/model/tz.alias"));
         }
         catch (IOException ioe) {
             LogFactory.getLog(TimeZoneRegistryImpl.class).warn(
                     "Error loading timezone aliases: " + ioe.getMessage());
         }
         try {
-        	ALIASES.load(ResourceLoader.getResourceAsStream("/tz.alias"));
+        	ALIASES.load(ResourceLoader.getResourceAsStream("tz.alias"));
         }
         catch (Exception e) {
         	LogFactory.getLog(TimeZoneRegistryImpl.class).debug(
diff -r b9ad6f933bc9 -r 87d37281ea41 src/net/fortuna/ical4j/model/tz.alias
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/net/fortuna/ical4j/model/tz.alias	Sat Feb 14 00:01:16 2015 +0100
@@ -0,0 +1,131 @@
+## Unsupported timezone identifiers..
+Etc/GMT+0=Etc/GMT
+Etc/GMT-0=Etc/GMT
+Etc/GMT0=Etc/GMT
+GMT=Etc/GMT
+
+### Temporary hack to support above timezones..
+Etc/GMT=Europe/London
+Etc/Greenwich=Etc/GMT
+Etc/UCT=Europe/London
+Etc/UTC=Europe/London
+Etc/Universal=Etc/UTC
+
+Etc/Zulu=Etc/UTC
+
+## Non-Oslon aliases:
+#
+US/Pacific-New=America/Los_Angeles
+
+## Update Olson backward compatibility here:
+#
+Africa/Asmera = Africa/Asmara
+Africa/Timbuktu = Africa/Bamako
+America/Argentina/ComodRivadavia = America/Argentina/Catamarca
+America/Atka = America/Adak
+America/Buenos_Aires = America/Argentina/Buenos_Aires
+America/Catamarca = America/Argentina/Catamarca
+America/Coral_Harbour = America/Atikokan
+America/Cordoba = America/Argentina/Cordoba
+America/Ensenada = America/Tijuana
+America/Fort_Wayne = America/Indiana/Indianapolis
+America/Indianapolis = America/Indiana/Indianapolis
+America/Jujuy = America/Argentina/Jujuy
+America/Knox_IN = America/Indiana/Knox
+America/Louisville = America/Kentucky/Louisville
+America/Mendoza = America/Argentina/Mendoza
+America/Porto_Acre = America/Rio_Branco
+America/Rosario = America/Argentina/Cordoba
+America/Virgin = America/St_Thomas
+Asia/Ashkhabad = Asia/Ashgabat
+Asia/Chungking = Asia/Chongqing
+Asia/Dacca = Asia/Dhaka
+Asia/Katmandu = Asia/Kathmandu
+Asia/Calcutta = Asia/Kolkata
+Asia/Macao = Asia/Macau
+Asia/Tel_Aviv = Asia/Jerusalem
+Asia/Saigon = Asia/Ho_Chi_Minh
+Asia/Thimbu = Asia/Thimphu
+Asia/Ujung_Pandang = Asia/Makassar
+Asia/Ulan_Bator = Asia/Ulaanbaatar
+Atlantic/Faeroe = Atlantic/Faroe
+Atlantic/Jan_Mayen = Europe/Oslo
+Australia/ACT = Australia/Sydney
+Australia/Canberra = Australia/Sydney
+Australia/LHI = Australia/Lord_Howe
+Australia/NSW = Australia/Sydney
+Australia/North = Australia/Darwin
+Australia/Queensland = Australia/Brisbane
+Australia/South = Australia/Adelaide
+Australia/Tasmania = Australia/Hobart
+Australia/Victoria = Australia/Melbourne
+Australia/West = Australia/Perth
+Australia/Yancowinna = Australia/Broken_Hill
+Brazil/Acre = America/Rio_Branco
+Brazil/DeNoronha = America/Noronha
+Brazil/East = America/Sao_Paulo
+Brazil/West = America/Manaus
+Canada/Atlantic = America/Halifax
+Canada/Central = America/Winnipeg
+Canada/East-Saskatchewan = America/Regina
+Canada/Eastern = America/Toronto
+Canada/Mountain = America/Edmonton
+Canada/Newfoundland = America/St_Johns
+Canada/Pacific = America/Vancouver
+Canada/Saskatchewan = America/Regina
+Canada/Yukon = America/Whitehorse
+Chile/Continental = America/Santiago
+Chile/EasterIsland = Pacific/Easter
+Cuba = America/Havana
+Egypt = Africa/Cairo
+Eire = Europe/Dublin
+Europe/Belfast = Europe/London
+Europe/Tiraspol = Europe/Chisinau
+GB = Europe/London
+GB-Eire = Europe/London
+GMT+0 = Etc/GMT
+GMT-0 = Etc/GMT
+GMT0 = Etc/GMT
+Greenwich = Etc/GMT
+Hongkong = Asia/Hong_Kong
+Iceland = Atlantic/Reykjavik
+Iran = Asia/Tehran
+Israel = Asia/Jerusalem
+Jamaica = America/Jamaica
+Japan = Asia/Tokyo
+Kwajalein = Pacific/Kwajalein
+Libya = Africa/Tripoli
+Mexico/BajaNorte = America/Tijuana
+Mexico/BajaSur = America/Mazatlan
+Mexico/General = America/Mexico_City
+NZ = Pacific/Auckland
+NZ-CHAT = Pacific/Chatham
+Navajo = America/Denver
+PRC = Asia/Shanghai
+Pacific/Samoa = Pacific/Pago_Pago
+Pacific/Yap = Pacific/Chuuk
+Pacific/Truk = Pacific/Chuuk
+Pacific/Ponape = Pacific/Pohnpei
+Poland = Europe/Warsaw
+Portugal = Europe/Lisbon
+ROC = Asia/Taipei
+ROK = Asia/Seoul
+Singapore = Asia/Singapore
+Turkey = Europe/Istanbul
+UCT = Etc/UCT
+US/Alaska = America/Anchorage
+US/Aleutian = America/Adak
+US/Arizona = America/Phoenix
+US/Central = America/Chicago
+US/East-Indiana = America/Indiana/Indianapolis
+US/Eastern = America/New_York
+US/Hawaii = Pacific/Honolulu
+US/Indiana-Starke = America/Indiana/Knox
+US/Michigan = America/Detroit
+US/Mountain = America/Denver
+US/Pacific = America/Los_Angeles
+US/Samoa = Pacific/Pago_Pago
+UTC = Etc/UTC
+Universal = Etc/UTC
+W-SU = Europe/Moscow
+Zulu = Etc/UTC
diff -r b9ad6f933bc9 -r 87d37281ea41 src/tz.alias
--- a/src/tz.alias	Thu Feb 12 21:48:00 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +0,0 @@
-## Unsupported timezone identifiers..
-Etc/GMT+0=Etc/GMT
-Etc/GMT-0=Etc/GMT
-Etc/GMT0=Etc/GMT
-GMT=Etc/GMT
-
-### Temporary hack to support above timezones..
-Etc/GMT=Europe/London
-Etc/Greenwich=Etc/GMT
-Etc/UCT=Europe/London
-Etc/UTC=Europe/London
-Etc/Universal=Etc/UTC
-
-Etc/Zulu=Etc/UTC
-
-## Non-Oslon aliases:
-#
-US/Pacific-New=America/Los_Angeles
-
-## Update Olson backward compatibility here:
-#
-Africa/Asmera = Africa/Asmara
-Africa/Timbuktu = Africa/Bamako
-America/Argentina/ComodRivadavia = America/Argentina/Catamarca
-America/Atka = America/Adak
-America/Buenos_Aires = America/Argentina/Buenos_Aires
-America/Catamarca = America/Argentina/Catamarca
-America/Coral_Harbour = America/Atikokan
-America/Cordoba = America/Argentina/Cordoba
-America/Ensenada = America/Tijuana
-America/Fort_Wayne = America/Indiana/Indianapolis
-America/Indianapolis = America/Indiana/Indianapolis
-America/Jujuy = America/Argentina/Jujuy
-America/Knox_IN = America/Indiana/Knox
-America/Louisville = America/Kentucky/Louisville
-America/Mendoza = America/Argentina/Mendoza
-America/Porto_Acre = America/Rio_Branco
-America/Rosario = America/Argentina/Cordoba
-America/Virgin = America/St_Thomas
-Asia/Ashkhabad = Asia/Ashgabat
-Asia/Chungking = Asia/Chongqing
-Asia/Dacca = Asia/Dhaka
-Asia/Katmandu = Asia/Kathmandu
-Asia/Calcutta = Asia/Kolkata
-Asia/Macao = Asia/Macau
-Asia/Tel_Aviv = Asia/Jerusalem
-Asia/Saigon = Asia/Ho_Chi_Minh
-Asia/Thimbu = Asia/Thimphu
-Asia/Ujung_Pandang = Asia/Makassar
-Asia/Ulan_Bator = Asia/Ulaanbaatar
-Atlantic/Faeroe = Atlantic/Faroe
-Atlantic/Jan_Mayen = Europe/Oslo
-Australia/ACT = Australia/Sydney
-Australia/Canberra = Australia/Sydney
-Australia/LHI = Australia/Lord_Howe
-Australia/NSW = Australia/Sydney
-Australia/North = Australia/Darwin
-Australia/Queensland = Australia/Brisbane
-Australia/South = Australia/Adelaide
-Australia/Tasmania = Australia/Hobart
-Australia/Victoria = Australia/Melbourne
-Australia/West = Australia/Perth
-Australia/Yancowinna = Australia/Broken_Hill
-Brazil/Acre = America/Rio_Branco
-Brazil/DeNoronha = America/Noronha
-Brazil/East = America/Sao_Paulo
-Brazil/West = America/Manaus
-Canada/Atlantic = America/Halifax
-Canada/Central = America/Winnipeg
-Canada/East-Saskatchewan = America/Regina
-Canada/Eastern = America/Toronto
-Canada/Mountain = America/Edmonton
-Canada/Newfoundland = America/St_Johns
-Canada/Pacific = America/Vancouver
-Canada/Saskatchewan = America/Regina
-Canada/Yukon = America/Whitehorse
-Chile/Continental = America/Santiago
-Chile/EasterIsland = Pacific/Easter
-Cuba = America/Havana
-Egypt = Africa/Cairo
-Eire = Europe/Dublin
-Europe/Belfast = Europe/London
-Europe/Tiraspol = Europe/Chisinau
-GB = Europe/London
-GB-Eire = Europe/London
-GMT+0 = Etc/GMT
-GMT-0 = Etc/GMT
-GMT0 = Etc/GMT
-Greenwich = Etc/GMT
-Hongkong = Asia/Hong_Kong
-Iceland = Atlantic/Reykjavik
-Iran = Asia/Tehran
-Israel = Asia/Jerusalem
-Jamaica = America/Jamaica
-Japan = Asia/Tokyo
-Kwajalein = Pacific/Kwajalein
-Libya = Africa/Tripoli
-Mexico/BajaNorte = America/Tijuana
-Mexico/BajaSur = America/Mazatlan
-Mexico/General = America/Mexico_City
-NZ = Pacific/Auckland
-NZ-CHAT = Pacific/Chatham
-Navajo = America/Denver
-PRC = Asia/Shanghai
-Pacific/Samoa = Pacific/Pago_Pago
-Pacific/Yap = Pacific/Chuuk
-Pacific/Truk = Pacific/Chuuk
-Pacific/Ponape = Pacific/Pohnpei
-Poland = Europe/Warsaw
-Portugal = Europe/Lisbon
-ROC = Asia/Taipei
-ROK = Asia/Seoul
-Singapore = Asia/Singapore
-Turkey = Europe/Istanbul
-UCT = Etc/UCT
-US/Alaska = America/Anchorage
-US/Aleutian = America/Adak
-US/Arizona = America/Phoenix
-US/Central = America/Chicago
-US/East-Indiana = America/Indiana/Indianapolis
-US/Eastern = America/New_York
-US/Hawaii = Pacific/Honolulu
-US/Indiana-Starke = America/Indiana/Knox
-US/Michigan = America/Detroit
-US/Mountain = America/Denver
-US/Pacific = America/Los_Angeles
-US/Samoa = Pacific/Pago_Pago
-UTC = Etc/UTC
-Universal = Etc/UTC
-W-SU = Europe/Moscow
-Zulu = Etc/UTC