Author: sebawagner
Date: Fri Apr 20 18:08:34 2012
New Revision: 1328470
URL: http://svn.apache.org/viewvc?rev=1328470&view=rev
Log:
OPENMEETINGS-193 Fix timezones that are missing
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/timezones.xml
incubator/openmeetings/trunk/singlewebapp/docs/FileService.html
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/timezone/TestGetIds.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/timezones.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/timezones.xml?rev=1328470&r1=1328469&r2=1328470&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/timezones.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/timezones.xml
Fri Apr 20 18:08:34 2012
@@ -19,9 +19,10 @@
-->
<timezones>
- <timezone orderId="1" name="Etc/GMT+12" label="Magadan, Fiji, New Zealand"
iCal="Pacific/Fiji" />
+ <timezone orderId="1" name="Etc/GMT+12" label="New Zealand"
iCal="Pacific/Auckland" />
+ <timezone orderId="1" name="Etc/GMT+12" label="Kiribati (Gilbert Islands),
Fiji, Russia (Kamchatka Krai)" iCal="Pacific/Fiji" />
<timezone orderId="2" name="Etc/GMT+11" label="Vladivostok, Kamchatka,
Solomon Islands, New Caledonia" iCal="Asia/Vladivostok" />
- <timezone orderId="3" name="Etc/GMT+10" label="Australia, Yakutsk"
iCal="Australia/Sydney" />
+ <timezone orderId="3" name="Etc/GMT+10" label="Australia
(NSW,Sydney,Tasmania), Yakutsk" iCal="Australia/Sydney" />
<timezone orderId="4" name="Etc/GMT+9" label="Japan/Korea Standard Time,
Irkutsk, East Timor" iCal="Asia/Tokyo" />
<timezone orderId="5" name="Etc/GMT+8" label="China Standard Time,
Krasnoyarsk, Philippines, Singapore" iCal="Asia/Singapore" />
<timezone orderId="6" name="Etc/GMT+7" label="Novosibirsk, Indochina Time,
Thailand, Vietnam, Jakarta" iCal="Asia/Jakarta" />
@@ -37,16 +38,30 @@
<timezone orderId="16" name="Etc/GMT" label="Iceland, United Kingdom,
Ireland" iCal="Europe/London" />
<timezone orderId="17" name="Etc/GMT-1" label="Azores, Cape Verde"
iCal="Atlantic/Cape_Verde" />
<timezone orderId="18" name="Etc/GMT-2" label="Fernando de Noronha"
iCal="America/Noronha" />
- <timezone orderId="19" name="Etc/GMT-3" label="Rio de Janeiro, São Paulo,
Argentina, Uruguay" iCal="America/Sao_Paulo" />
+ <timezone orderId="19" name="Etc/GMT-3" label="Brazil (BrasÃlia, Rio de
Janeiro, São Paulo), most of Greenland, Uruguay" iCal="America/Sao_Paulo" />
+ <timezone orderId="19" name="Etc/GMT-3" label="Argentina, Paraguay"
iCal="America/Buenos_Aires" />
+ <timezone orderId="19" name="Etc/GMT-3" label="Canada GMT+3:30" iCal="CNT"
/>
<timezone orderId="20" name="Etc/GMT-4" label="Nova Scotia, Dominican
Republic, Puerto Rico, Santiago" iCal="America/Santiago" />
+ <timezone orderId="20" name="Etc/GMT-4" label="Venezuela GMT+4:30"
iCal="America/Caracas" />
<timezone orderId="21" name="Etc/GMT-5" label="Ottawa, Toronto, Montreal,
Boston, New York" iCal="America/New_York" />
+ <timezone orderId="21" name="Etc/GMT-5" label="Colombia, Cuba, Ecuador,
Haiti, Jamaica, Panama, Peru" iCal="America/Jamaica" />
<timezone orderId="24" name="Etc/GMT-6" label="Costa Rica , El Salvador,
Guatemala, Honduras" iCal="America/El_Salvador" />
- <timezone orderId="26" name="Etc/GMT-7" label="Mexico City, Chihuahua,
Sonora" iCal="America/Mexico_City" />
+ <timezone orderId="24" name="Etc/GMT-6" label="Canada (Manitoba), United
States (Illinois, most of Texas)" iCal="America/Chicago" />
+ <timezone orderId="26" name="Etc/GMT-7" label="Canada (Alberta), Mexico
(Chihuahua), USA (Colorado)" iCal="America/Denver" />
+ <timezone orderId="26" name="Etc/GMT-7" label="Canada (northeastern
British Columbia), Mexico (Sonora), USA (Arizona)" iCal="America/Phoenix" />
<timezone orderId="27" name="Etc/GMT-8" label="Vancouver, Portland, Las
Vegas, California" iCal="America/Los_Angeles" />
<timezone orderId="28" name="Etc/GMT-9" label="Anchorage, Fairbanks,
Juneau" iCal="America/Juneau" />
+ <timezone orderId="28" name="Etc/GMT-9" label="United States (most of
Alaska)" iCal="US/Alaska" />
<timezone orderId="29" name="Etc/GMT-10" label="Hawaii"
iCal="Pacific/Honolulu" />
<timezone orderId="30" name="Etc/GMT-11" label="Samoa" iCal="Pacific/Apia"
/>
<timezone orderId="23" name="Etc/GMT-6(Chicago)" label="Chicago, Dallas"
iCal="America/Chicago" />
<timezone orderId="25" name="Etc/GMT-7(Phoenix)" label="Alberta, Colorado,
Phoenix" iCal="America/Phoenix" />
<timezone orderId="22" name="Etc/GMT-5(Panama)" label="Panama
Port-au-Prince" iCal="America/Panama" />
+ <timezone orderId="15" name="Etc/GMT+1 (North Africa)" label="Angola,
Cameroon, Nigeria, Tunisia" iCal="Africa/Tunis" />
+ <timezone orderId="14" name="Etc/GMT+2" label="Libya, Egypt, South Africa,
Zimbabwe" iCal="Africa/Cairo" />
+ <timezone orderId="4" name="Etc/GMT+9 (Australia-North)" label="Australia
(Nothern Territory,Darwin) GMT+9:30" iCal="Australia/Darwin" />
+ <timezone orderId="4" name="Etc/GMT+9 (Australia-South)" label="Australia
(Southern Territory,Adelaide) GMT+9:30" iCal="Australia/Adelaide" />
+ <timezone orderId="3" name="Etc/GMT+10" label="Russia (Zabaykalsky Krai),
Papua New Guinea, Australia (Queensland)" iCal="Australia/Queensland" />
+ <timezone orderId="3" name="Etc/GMT+10" label="Lord Howe Island -
Australia GMT+10:30" iCal="Australia/Lord_Howe" />
+ <timezone orderId="16" name="Etc/GMT" label="Côte d'Ivoire, Faroe
Islands, Ghana, Iceland, Senegal" iCal="Africa/Dakar" />
</timezones>
Modified: incubator/openmeetings/trunk/singlewebapp/docs/FileService.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/FileService.html?rev=1328470&r1=1328469&r2=1328470&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/FileService.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/FileService.html Fri Apr 20
18:08:34 2012
@@ -137,22 +137,6 @@ limitations under the License.
<a href="#moveFileSelf"><b>moveFileSelf</b></a><br/>
<div class="navigation_comment"><i >move a file or
folder</i></div>
</div>
- <div>
- <a href="#getTestObject"><b>getTestObject</b></a><br/>
- <div class="navigation_comment"><i ></i></div>
- </div>
- <div>
- <a href="#echo"><b>echo</b></a><br/>
- <div class="navigation_comment"><i ></i></div>
- </div>
- <div>
- <a href="#ping"><b>ping</b></a><br/>
- <div class="navigation_comment"><i ></i></div>
- </div>
- <div>
- <a href="#pingF"><b>pingF</b></a><br/>
- <div class="navigation_comment"><i ></i></div>
- </div>
</div>
<h3>Methods Details in FileService</h3>
@@ -1582,111 +1566,6 @@ limitations under the License.
<a
href="http://localhost:5080/openmeetings/services/FileService/moveFileSelf?SID=VALUE&fileExplorerItemId=VALUE&newParentFileExplorerItemId=VALUE&room_id=VALUE&isOwner=VALUE&moveToHome=VALUE";>http://localhost:5080/openmeetings/services/FileService/moveFileSelf?SID=VALUE&fileExplorerItemId=VALUE&newParentFileExplorerItemId=VALUE&room_id=VALUE&isOwner=VALUE&moveToHome=VALUE</a>
</a>
</div>
- <div
class="method">
- <div class="method_header">
- <div style="margin-left:10px">
- <a name="getTestObject" ><b>getTestObject</b></a>
- </div>
- </div>
-
- Method: <i>getTestObject (
- )
- </i><br/>
- <p>
-
- </p>
- <p>
- Return Type: org.openmeetings.app.data.basic.files.TestObject
- </p>
- <p>Params:</p>
-
- <i>No Params</i>
- <br/>
- REST Sample Call/URL:<br/>
-
<a
href="http://localhost:5080/openmeetings/services/FileService/getTestObject";>http://localhost:5080/openmeetings/services/FileService/getTestObject</a>
- </a>
- </div>
- <div
class="method">
- <div class="method_header">
- <div style="margin-left:10px">
- <a name="echo" ><b>echo</b></a>
- </div>
- </div>
-
- Method: <i>echo (
-
OMElement element
- )
- </i><br/>
- <p>
-
- </p>
- <p>
- Return Type: org.apache.axiom.om.OMElement
- </p>
- <p>Params:</p>
- <b>Warning:</b><i>
Params in this method do not seem to be correctly documentated</i>
- <br/><br/>
-
- <i>No Params</i>
- <br/>
- REST Sample Call/URL:<br/>
-
<a
href="http://localhost:5080/openmeetings/services/FileService/echo?element=VALUE";>http://localhost:5080/openmeetings/services/FileService/echo?element=VALUE</a>
- </a>
- </div>
- <div
class="method">
- <div class="method_header">
- <div style="margin-left:10px">
- <a name="ping" ><b>ping</b></a>
- </div>
- </div>
-
- Method: <i>ping (
-
OMElement element
- )
- </i><br/>
- <p>
-
- </p>
- <p>
- Return Type: void
- </p>
- <p>Params:</p>
- <b>Warning:</b><i>
Params in this method do not seem to be correctly documentated</i>
- <br/><br/>
-
- <i>No Params</i>
- <br/>
- REST Sample Call/URL:<br/>
-
<a
href="http://localhost:5080/openmeetings/services/FileService/ping?element=VALUE";>http://localhost:5080/openmeetings/services/FileService/ping?element=VALUE</a>
- </a>
- </div>
- <div
class="method">
- <div class="method_header">
- <div style="margin-left:10px">
- <a name="pingF" ><b>pingF</b></a>
- </div>
- </div>
-
- Method: <i>pingF (
-
OMElement element
- )
- </i><br/>
- <p>
-
- </p>
- <p>
- Return Type: void
- </p>
- <p>Params:</p>
- <b>Warning:</b><i>
Params in this method do not seem to be correctly documentated</i>
- <br/><br/>
-
- <i>No Params</i>
- <br/>
- REST Sample Call/URL:<br/>
-
<a
href="http://localhost:5080/openmeetings/services/FileService/pingF?element=VALUE";>http://localhost:5080/openmeetings/services/FileService/pingF?element=VALUE</a>
- </a>
- </div>
</body>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/timezone/TestGetIds.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/timezone/TestGetIds.java?rev=1328470&r1=1328469&r2=1328470&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/timezone/TestGetIds.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/timezone/TestGetIds.java
Fri Apr 20 18:08:34 2012
@@ -19,6 +19,7 @@
package org.openmeetings.test.timezone;
import java.util.Calendar;
+import java.util.Date;
import java.util.TimeZone;
import junit.framework.TestCase;
@@ -31,6 +32,8 @@ public class TestGetIds extends TestCase
public void testGetIds() {
try {
+ Date tDate = new Date();
+
String[] ids = TimeZone.getAvailableIDs();
for (String id : ids) {
@@ -41,12 +44,20 @@ public class TestGetIds extends TestCase
cal.setTimeZone(timeZone);
// + cal.get(Calendar.DST_OFFSET)
int offset = cal.get(Calendar.ZONE_OFFSET);
+ cal.setTime(tDate);
int offsetInHours = offset/1000/60;
- System.out.println("<name>" + id +
"</name><offset>"+offsetInHours+"</offset>");
+ String tString = cal.get(Calendar.DAY_OF_MONTH)
+
+"."+cal.get(Calendar.DAY_OF_MONTH)
+
+"."+cal.get(Calendar.YEAR)
+ +" "
+
+cal.get(Calendar.HOUR)+":"+cal.get(Calendar.MINUTE);
+
+
+ System.out.println("<name>" + id +
"</name><offset>"+offsetInHours+"</offset><now>"+tString+"</now>");
}
-
+
} catch (Exception err) {
err.printStackTrace();
}
