Caldavsync Sources / changeset

     1.1 --- a/src/net/fortuna/ical4j/model/TimeZoneRegistryImpl.java	Thu Feb 12 21:48:00 2015 +0100
     1.2 +++ b/src/net/fortuna/ical4j/model/TimeZoneRegistryImpl.java	Sat Feb 14 00:01:16 2015 +0100
     1.3 @@ -73,14 +73,14 @@
     1.4      private static final Properties ALIASES = new Properties();
     1.5      static {
     1.6          try {
     1.7 -            ALIASES.load(ResourceLoader.getResourceAsStream("tz.alias"));
     1.8 +            ALIASES.load(ResourceLoader.getResourceAsStream("net/fortuna/ical4j/model/tz.alias"));
     1.9          }
    1.10          catch (IOException ioe) {
    1.11              LogFactory.getLog(TimeZoneRegistryImpl.class).warn(
    1.12                      "Error loading timezone aliases: " + ioe.getMessage());
    1.13          }
    1.14          try {
    1.15 -        	ALIASES.load(ResourceLoader.getResourceAsStream("/tz.alias"));
    1.16 +        	ALIASES.load(ResourceLoader.getResourceAsStream("tz.alias"));
    1.17          }
    1.18          catch (Exception e) {
    1.19          	LogFactory.getLog(TimeZoneRegistryImpl.class).debug(

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/src/net/fortuna/ical4j/model/tz.alias	Sat Feb 14 00:01:16 2015 +0100
     2.3 @@ -0,0 +1,131 @@
     2.4 +## Unsupported timezone identifiers..
     2.5 +Etc/GMT+0=Etc/GMT
     2.6 +Etc/GMT-0=Etc/GMT
     2.7 +Etc/GMT0=Etc/GMT
     2.8 +GMT=Etc/GMT
     2.9 +
    2.10 +### Temporary hack to support above timezones..
    2.11 +Etc/GMT=Europe/London
    2.12 +Etc/Greenwich=Etc/GMT
    2.13 +Etc/UCT=Europe/London
    2.14 +Etc/UTC=Europe/London
    2.15 +Etc/Universal=Etc/UTC
    2.16 +
    2.17 +Etc/Zulu=Etc/UTC
    2.18 +
    2.19 +## Non-Oslon aliases:
    2.20 +#
    2.21 +US/Pacific-New=America/Los_Angeles
    2.22 +
    2.23 +## Update Olson backward compatibility here:
    2.24 +#
    2.25 +Africa/Asmera = Africa/Asmara
    2.26 +Africa/Timbuktu = Africa/Bamako
    2.27 +America/Argentina/ComodRivadavia = America/Argentina/Catamarca
    2.28 +America/Atka = America/Adak
    2.29 +America/Buenos_Aires = America/Argentina/Buenos_Aires
    2.30 +America/Catamarca = America/Argentina/Catamarca
    2.31 +America/Coral_Harbour = America/Atikokan
    2.32 +America/Cordoba = America/Argentina/Cordoba
    2.33 +America/Ensenada = America/Tijuana
    2.34 +America/Fort_Wayne = America/Indiana/Indianapolis
    2.35 +America/Indianapolis = America/Indiana/Indianapolis
    2.36 +America/Jujuy = America/Argentina/Jujuy
    2.37 +America/Knox_IN = America/Indiana/Knox
    2.38 +America/Louisville = America/Kentucky/Louisville
    2.39 +America/Mendoza = America/Argentina/Mendoza
    2.40 +America/Porto_Acre = America/Rio_Branco
    2.41 +America/Rosario = America/Argentina/Cordoba
    2.42 +America/Virgin = America/St_Thomas
    2.43 +Asia/Ashkhabad = Asia/Ashgabat
    2.44 +Asia/Chungking = Asia/Chongqing
    2.45 +Asia/Dacca = Asia/Dhaka
    2.46 +Asia/Katmandu = Asia/Kathmandu
    2.47 +Asia/Calcutta = Asia/Kolkata
    2.48 +Asia/Macao = Asia/Macau
    2.49 +Asia/Tel_Aviv = Asia/Jerusalem
    2.50 +Asia/Saigon = Asia/Ho_Chi_Minh
    2.51 +Asia/Thimbu = Asia/Thimphu
    2.52 +Asia/Ujung_Pandang = Asia/Makassar
    2.53 +Asia/Ulan_Bator = Asia/Ulaanbaatar
    2.54 +Atlantic/Faeroe = Atlantic/Faroe
    2.55 +Atlantic/Jan_Mayen = Europe/Oslo
    2.56 +Australia/ACT = Australia/Sydney
    2.57 +Australia/Canberra = Australia/Sydney
    2.58 +Australia/LHI = Australia/Lord_Howe
    2.59 +Australia/NSW = Australia/Sydney
    2.60 +Australia/North = Australia/Darwin
    2.61 +Australia/Queensland = Australia/Brisbane
    2.62 +Australia/South = Australia/Adelaide
    2.63 +Australia/Tasmania = Australia/Hobart
    2.64 +Australia/Victoria = Australia/Melbourne
    2.65 +Australia/West = Australia/Perth
    2.66 +Australia/Yancowinna = Australia/Broken_Hill
    2.67 +Brazil/Acre = America/Rio_Branco
    2.68 +Brazil/DeNoronha = America/Noronha
    2.69 +Brazil/East = America/Sao_Paulo
    2.70 +Brazil/West = America/Manaus
    2.71 +Canada/Atlantic = America/Halifax
    2.72 +Canada/Central = America/Winnipeg
    2.73 +Canada/East-Saskatchewan = America/Regina
    2.74 +Canada/Eastern = America/Toronto
    2.75 +Canada/Mountain = America/Edmonton
    2.76 +Canada/Newfoundland = America/St_Johns
    2.77 +Canada/Pacific = America/Vancouver
    2.78 +Canada/Saskatchewan = America/Regina
    2.79 +Canada/Yukon = America/Whitehorse
    2.80 +Chile/Continental = America/Santiago
    2.81 +Chile/EasterIsland = Pacific/Easter
    2.82 +Cuba = America/Havana
    2.83 +Egypt = Africa/Cairo
    2.84 +Eire = Europe/Dublin
    2.85 +Europe/Belfast = Europe/London
    2.86 +Europe/Tiraspol = Europe/Chisinau
    2.87 +GB = Europe/London
    2.88 +GB-Eire = Europe/London
    2.89 +GMT+0 = Etc/GMT
    2.90 +GMT-0 = Etc/GMT
    2.91 +GMT0 = Etc/GMT
    2.92 +Greenwich = Etc/GMT
    2.93 +Hongkong = Asia/Hong_Kong
    2.94 +Iceland = Atlantic/Reykjavik
    2.95 +Iran = Asia/Tehran
    2.96 +Israel = Asia/Jerusalem
    2.97 +Jamaica = America/Jamaica
    2.98 +Japan = Asia/Tokyo
    2.99 +Kwajalein = Pacific/Kwajalein
   2.100 +Libya = Africa/Tripoli
   2.101 +Mexico/BajaNorte = America/Tijuana
   2.102 +Mexico/BajaSur = America/Mazatlan
   2.103 +Mexico/General = America/Mexico_City
   2.104 +NZ = Pacific/Auckland
   2.105 +NZ-CHAT = Pacific/Chatham
   2.106 +Navajo = America/Denver
   2.107 +PRC = Asia/Shanghai
   2.108 +Pacific/Samoa = Pacific/Pago_Pago
   2.109 +Pacific/Yap = Pacific/Chuuk
   2.110 +Pacific/Truk = Pacific/Chuuk
   2.111 +Pacific/Ponape = Pacific/Pohnpei
   2.112 +Poland = Europe/Warsaw
   2.113 +Portugal = Europe/Lisbon
   2.114 +ROC = Asia/Taipei
   2.115 +ROK = Asia/Seoul
   2.116 +Singapore = Asia/Singapore
   2.117 +Turkey = Europe/Istanbul
   2.118 +UCT = Etc/UCT
   2.119 +US/Alaska = America/Anchorage
   2.120 +US/Aleutian = America/Adak
   2.121 +US/Arizona = America/Phoenix
   2.122 +US/Central = America/Chicago
   2.123 +US/East-Indiana = America/Indiana/Indianapolis
   2.124 +US/Eastern = America/New_York
   2.125 +US/Hawaii = Pacific/Honolulu
   2.126 +US/Indiana-Starke = America/Indiana/Knox
   2.127 +US/Michigan = America/Detroit
   2.128 +US/Mountain = America/Denver
   2.129 +US/Pacific = America/Los_Angeles
   2.130 +US/Samoa = Pacific/Pago_Pago
   2.131 +UTC = Etc/UTC
   2.132 +Universal = Etc/UTC
   2.133 +W-SU = Europe/Moscow
   2.134 +Zulu = Etc/UTC

     3.1 --- a/src/tz.alias	Thu Feb 12 21:48:00 2015 +0100
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,131 +0,0 @@
     3.4 -## Unsupported timezone identifiers..
     3.5 -Etc/GMT+0=Etc/GMT
     3.6 -Etc/GMT-0=Etc/GMT
     3.7 -Etc/GMT0=Etc/GMT
     3.8 -GMT=Etc/GMT
     3.9 -
    3.10 -### Temporary hack to support above timezones..
    3.11 -Etc/GMT=Europe/London
    3.12 -Etc/Greenwich=Etc/GMT
    3.13 -Etc/UCT=Europe/London
    3.14 -Etc/UTC=Europe/London
    3.15 -Etc/Universal=Etc/UTC
    3.16 -
    3.17 -Etc/Zulu=Etc/UTC
    3.18 -
    3.19 -## Non-Oslon aliases:
    3.20 -#
    3.21 -US/Pacific-New=America/Los_Angeles
    3.22 -
    3.23 -## Update Olson backward compatibility here:
    3.24 -#
    3.25 -Africa/Asmera = Africa/Asmara
    3.26 -Africa/Timbuktu = Africa/Bamako
    3.27 -America/Argentina/ComodRivadavia = America/Argentina/Catamarca
    3.28 -America/Atka = America/Adak
    3.29 -America/Buenos_Aires = America/Argentina/Buenos_Aires
    3.30 -America/Catamarca = America/Argentina/Catamarca
    3.31 -America/Coral_Harbour = America/Atikokan
    3.32 -America/Cordoba = America/Argentina/Cordoba
    3.33 -America/Ensenada = America/Tijuana
    3.34 -America/Fort_Wayne = America/Indiana/Indianapolis
    3.35 -America/Indianapolis = America/Indiana/Indianapolis
    3.36 -America/Jujuy = America/Argentina/Jujuy
    3.37 -America/Knox_IN = America/Indiana/Knox
    3.38 -America/Louisville = America/Kentucky/Louisville
    3.39 -America/Mendoza = America/Argentina/Mendoza
    3.40 -America/Porto_Acre = America/Rio_Branco
    3.41 -America/Rosario = America/Argentina/Cordoba
    3.42 -America/Virgin = America/St_Thomas
    3.43 -Asia/Ashkhabad = Asia/Ashgabat
    3.44 -Asia/Chungking = Asia/Chongqing
    3.45 -Asia/Dacca = Asia/Dhaka
    3.46 -Asia/Katmandu = Asia/Kathmandu
    3.47 -Asia/Calcutta = Asia/Kolkata
    3.48 -Asia/Macao = Asia/Macau
    3.49 -Asia/Tel_Aviv = Asia/Jerusalem
    3.50 -Asia/Saigon = Asia/Ho_Chi_Minh
    3.51 -Asia/Thimbu = Asia/Thimphu
    3.52 -Asia/Ujung_Pandang = Asia/Makassar
    3.53 -Asia/Ulan_Bator = Asia/Ulaanbaatar
    3.54 -Atlantic/Faeroe = Atlantic/Faroe
    3.55 -Atlantic/Jan_Mayen = Europe/Oslo
    3.56 -Australia/ACT = Australia/Sydney
    3.57 -Australia/Canberra = Australia/Sydney
    3.58 -Australia/LHI = Australia/Lord_Howe
    3.59 -Australia/NSW = Australia/Sydney
    3.60 -Australia/North = Australia/Darwin
    3.61 -Australia/Queensland = Australia/Brisbane
    3.62 -Australia/South = Australia/Adelaide
    3.63 -Australia/Tasmania = Australia/Hobart
    3.64 -Australia/Victoria = Australia/Melbourne
    3.65 -Australia/West = Australia/Perth
    3.66 -Australia/Yancowinna = Australia/Broken_Hill
    3.67 -Brazil/Acre = America/Rio_Branco
    3.68 -Brazil/DeNoronha = America/Noronha
    3.69 -Brazil/East = America/Sao_Paulo
    3.70 -Brazil/West = America/Manaus
    3.71 -Canada/Atlantic = America/Halifax
    3.72 -Canada/Central = America/Winnipeg
    3.73 -Canada/East-Saskatchewan = America/Regina
    3.74 -Canada/Eastern = America/Toronto
    3.75 -Canada/Mountain = America/Edmonton
    3.76 -Canada/Newfoundland = America/St_Johns
    3.77 -Canada/Pacific = America/Vancouver
    3.78 -Canada/Saskatchewan = America/Regina
    3.79 -Canada/Yukon = America/Whitehorse
    3.80 -Chile/Continental = America/Santiago
    3.81 -Chile/EasterIsland = Pacific/Easter
    3.82 -Cuba = America/Havana
    3.83 -Egypt = Africa/Cairo
    3.84 -Eire = Europe/Dublin
    3.85 -Europe/Belfast = Europe/London
    3.86 -Europe/Tiraspol = Europe/Chisinau
    3.87 -GB = Europe/London
    3.88 -GB-Eire = Europe/London
    3.89 -GMT+0 = Etc/GMT
    3.90 -GMT-0 = Etc/GMT
    3.91 -GMT0 = Etc/GMT
    3.92 -Greenwich = Etc/GMT
    3.93 -Hongkong = Asia/Hong_Kong
    3.94 -Iceland = Atlantic/Reykjavik
    3.95 -Iran = Asia/Tehran
    3.96 -Israel = Asia/Jerusalem
    3.97 -Jamaica = America/Jamaica
    3.98 -Japan = Asia/Tokyo
    3.99 -Kwajalein = Pacific/Kwajalein
   3.100 -Libya = Africa/Tripoli
   3.101 -Mexico/BajaNorte = America/Tijuana
   3.102 -Mexico/BajaSur = America/Mazatlan
   3.103 -Mexico/General = America/Mexico_City
   3.104 -NZ = Pacific/Auckland
   3.105 -NZ-CHAT = Pacific/Chatham
   3.106 -Navajo = America/Denver
   3.107 -PRC = Asia/Shanghai
   3.108 -Pacific/Samoa = Pacific/Pago_Pago
   3.109 -Pacific/Yap = Pacific/Chuuk
   3.110 -Pacific/Truk = Pacific/Chuuk
   3.111 -Pacific/Ponape = Pacific/Pohnpei
   3.112 -Poland = Europe/Warsaw
   3.113 -Portugal = Europe/Lisbon
   3.114 -ROC = Asia/Taipei
   3.115 -ROK = Asia/Seoul
   3.116 -Singapore = Asia/Singapore
   3.117 -Turkey = Europe/Istanbul
   3.118 -UCT = Etc/UCT
   3.119 -US/Alaska = America/Anchorage
   3.120 -US/Aleutian = America/Adak
   3.121 -US/Arizona = America/Phoenix
   3.122 -US/Central = America/Chicago
   3.123 -US/East-Indiana = America/Indiana/Indianapolis
   3.124 -US/Eastern = America/New_York
   3.125 -US/Hawaii = Pacific/Honolulu
   3.126 -US/Indiana-Starke = America/Indiana/Knox
   3.127 -US/Michigan = America/Detroit
   3.128 -US/Mountain = America/Denver
   3.129 -US/Pacific = America/Los_Angeles
   3.130 -US/Samoa = Pacific/Pago_Pago
   3.131 -UTC = Etc/UTC
   3.132 -Universal = Etc/UTC
   3.133 -W-SU = Europe/Moscow
   3.134 -Zulu = Etc/UTC