Author: solomax
Date: Tue Aug 13 09:50:53 2013
New Revision: 1513414
URL: http://svn.apache.org/r1513414
Log:
[OPENMEETINGS-751] OmTimeZone was removed from the sources
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/TimezoneUtil.java
- copied, changed from r1513390,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/TimezoneUtil.java
Removed:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/OmTimeZoneDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/OmTimeZone.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/TimezoneUtil.java
Modified:
openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/MeetingMemberLogic.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/InvitationManager.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/BackupImport.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/ImportHelper.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
Modified:
openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
Tue Aug 13 09:50:53 2013
@@ -246,7 +246,6 @@
<bean id="errorManagement"
class="org.apache.openmeetings.data.basic.dao.ErrorDao" />
<bean id="navimanagement"
class="org.apache.openmeetings.data.basic.NaviBuilder" />
<bean id="pollManagement"
class="org.apache.openmeetings.data.conference.PollManager" />
- <bean id="omTimeZoneDaoImpl"
class="org.apache.openmeetings.data.basic.dao.OmTimeZoneDao" />
<bean id="statemanagement"
class="org.apache.openmeetings.data.user.dao.StateDao" />
<bean id="fieldLanguageDaoImpl"
class="org.apache.openmeetings.data.basic.FieldLanguageDao" />
<bean id="fieldValueDaoImpl"
class="org.apache.openmeetings.data.basic.FieldValueDao" />
@@ -295,7 +294,7 @@
<bean id="generateSWF"
class="org.apache.openmeetings.documents.GenerateSWF" />
<bean id="fileUtils"
class="org.apache.openmeetings.data.file.FileUtils" />
<bean id="ldapLoginManagement"
class="org.apache.openmeetings.ldap.LdapLoginManagement" />
- <bean id="timezoneUtil"
class="org.apache.openmeetings.utils.math.TimezoneUtil" />
+ <bean id="timezoneUtil"
class="org.apache.openmeetings.utils.TimezoneUtil" />
<bean id="whiteboardManagement"
class="org.apache.openmeetings.data.whiteboard.WhiteboardManager" />
<!-- Templates -->
Modified: openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml Tue Aug 13
09:50:53 2013
@@ -31,7 +31,6 @@
<class>org.apache.openmeetings.persistence.beans.basic.MailMessage</class>
<class>org.apache.openmeetings.persistence.beans.basic.Naviglobal</class>
<class>org.apache.openmeetings.persistence.beans.basic.Navimain</class>
-
<class>org.apache.openmeetings.persistence.beans.basic.OmTimeZone</class>
<class>org.apache.openmeetings.persistence.beans.basic.Sessiondata</class>
<class>org.apache.openmeetings.persistence.beans.basic.SOAPLogin</class>
<class>org.apache.openmeetings.persistence.beans.basic.Server</class>
Modified: openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
(original)
+++ openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml Tue Aug
13 09:50:53 2013
@@ -31,7 +31,6 @@
<class>org.apache.openmeetings.persistence.beans.basic.MailMessage</class>
<class>org.apache.openmeetings.persistence.beans.basic.Naviglobal</class>
<class>org.apache.openmeetings.persistence.beans.basic.Navimain</class>
-
<class>org.apache.openmeetings.persistence.beans.basic.OmTimeZone</class>
<class>org.apache.openmeetings.persistence.beans.basic.Sessiondata</class>
<class>org.apache.openmeetings.persistence.beans.basic.SOAPLogin</class>
<class>org.apache.openmeetings.persistence.beans.basic.Server</class>
Modified: openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
(original)
+++ openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml Tue Aug
13 09:50:53 2013
@@ -31,7 +31,6 @@
<class>org.apache.openmeetings.persistence.beans.basic.MailMessage</class>
<class>org.apache.openmeetings.persistence.beans.basic.Naviglobal</class>
<class>org.apache.openmeetings.persistence.beans.basic.Navimain</class>
-
<class>org.apache.openmeetings.persistence.beans.basic.OmTimeZone</class>
<class>org.apache.openmeetings.persistence.beans.basic.Sessiondata</class>
<class>org.apache.openmeetings.persistence.beans.basic.SOAPLogin</class>
<class>org.apache.openmeetings.persistence.beans.basic.Server</class>
Modified: openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
(original)
+++ openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml Tue Aug
13 09:50:53 2013
@@ -31,7 +31,6 @@
<class>org.apache.openmeetings.persistence.beans.basic.MailMessage</class>
<class>org.apache.openmeetings.persistence.beans.basic.Naviglobal</class>
<class>org.apache.openmeetings.persistence.beans.basic.Navimain</class>
-
<class>org.apache.openmeetings.persistence.beans.basic.OmTimeZone</class>
<class>org.apache.openmeetings.persistence.beans.basic.Sessiondata</class>
<class>org.apache.openmeetings.persistence.beans.basic.SOAPLogin</class>
<class>org.apache.openmeetings.persistence.beans.basic.Server</class>
Modified: openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
(original)
+++ openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml Tue
Aug 13 09:50:53 2013
@@ -31,7 +31,6 @@
<class>org.apache.openmeetings.persistence.beans.basic.MailMessage</class>
<class>org.apache.openmeetings.persistence.beans.basic.Naviglobal</class>
<class>org.apache.openmeetings.persistence.beans.basic.Navimain</class>
-
<class>org.apache.openmeetings.persistence.beans.basic.OmTimeZone</class>
<class>org.apache.openmeetings.persistence.beans.basic.Sessiondata</class>
<class>org.apache.openmeetings.persistence.beans.basic.SOAPLogin</class>
<class>org.apache.openmeetings.persistence.beans.basic.Server</class>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java
Tue Aug 13 09:50:53 2013
@@ -48,7 +48,7 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.room.RoomType;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.persistence.beans.user.UserContact;
-import org.apache.openmeetings.utils.math.TimezoneUtil;
+import org.apache.openmeetings.utils.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -718,8 +718,7 @@ public class CalendarWebService {
}
if (omTimeZoneId > 0) {
- timezone = timezoneUtil
-
.getTimezoneByOmTimeZoneId(omTimeZoneId);
+ timezone =
timezoneUtil.getTimezoneByOmTimeZoneId(omTimeZoneId);
}
if (timezone == null) {
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebService.java?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebService.java
Tue Aug 13 09:50:53 2013
@@ -32,7 +32,7 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.room.RoomOrganisation;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.remote.ConferenceService;
-import org.apache.openmeetings.utils.math.TimezoneUtil;
+import org.apache.openmeetings.utils.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java
Tue Aug 13 09:50:53 2013
@@ -48,8 +48,8 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.remote.ConferenceService;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.session.ISessionManager;
+import org.apache.openmeetings.utils.TimezoneUtil;
import org.apache.openmeetings.utils.math.CalendarPatterns;
-import org.apache.openmeetings.utils.math.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
Tue Aug 13 09:50:53 2013
@@ -27,6 +27,7 @@ import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.util.Date;
import java.util.Map;
+import java.util.TimeZone;
import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
@@ -549,7 +550,7 @@ public class Admin {
System.exit(1);
}
}
- Map<String, String> tzMap =
ImportHelper.getAllTimeZones(ImportInitvalues.getTimeZones());
+ Map<String, String> tzMap =
ImportHelper.getAllTimeZones(TimeZone.getAvailableIDs());
cfg.ical_timeZone = null;
if (cmdl.hasOption("tz")) {
cfg.ical_timeZone = cmdl.getOptionValue("tz");
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
Tue Aug 13 09:50:53 2013
@@ -51,8 +51,8 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.room.Room;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.persistence.beans.user.User.Type;
+import org.apache.openmeetings.utils.TimezoneUtil;
import org.apache.openmeetings.utils.math.CalendarPatterns;
-import org.apache.openmeetings.utils.math.TimezoneUtil;
import org.apache.openmeetings.web.app.WebSession;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
Tue Aug 13 09:50:53 2013
@@ -40,8 +40,8 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
import org.apache.openmeetings.persistence.beans.room.Room;
import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.utils.TimezoneUtil;
import org.apache.openmeetings.utils.math.CalendarPatterns;
-import org.apache.openmeetings.utils.math.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/MeetingMemberLogic.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/MeetingMemberLogic.java?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/MeetingMemberLogic.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/MeetingMemberLogic.java
Tue Aug 13 09:50:53 2013
@@ -30,8 +30,8 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
import org.apache.openmeetings.persistence.beans.invitation.Invitations;
import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.utils.TimezoneUtil;
import org.apache.openmeetings.utils.math.CalendarPatterns;
-import org.apache.openmeetings.utils.math.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/InvitationManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/InvitationManager.java?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/InvitationManager.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/InvitationManager.java
Tue Aug 13 09:50:53 2013
@@ -44,12 +44,12 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.persistence.beans.user.User.Type;
import org.apache.openmeetings.templates.InvitationTemplate;
+import org.apache.openmeetings.utils.TimezoneUtil;
import org.apache.openmeetings.utils.crypt.MD5;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
import org.apache.openmeetings.utils.mail.IcalHandler;
import org.apache.openmeetings.utils.mail.MailHandler;
import org.apache.openmeetings.utils.math.CalendarPatterns;
-import org.apache.openmeetings.utils.math.TimezoneUtil;
import org.apache.openmeetings.utils.sms.SMSHandler;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java
Tue Aug 13 09:50:53 2013
@@ -34,7 +34,7 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.room.Room;
import org.apache.openmeetings.utils.DaoHelper;
-import org.apache.openmeetings.utils.math.TimezoneUtil;
+import org.apache.openmeetings.utils.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java
Tue Aug 13 09:50:53 2013
@@ -60,10 +60,10 @@ import org.apache.openmeetings.remote.ut
import org.apache.openmeetings.session.ISessionManager;
import org.apache.openmeetings.templates.ResetPasswordTemplate;
import org.apache.openmeetings.utils.DaoHelper;
+import org.apache.openmeetings.utils.TimezoneUtil;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
import org.apache.openmeetings.utils.mail.MailHandler;
import org.apache.openmeetings.utils.math.CalendarPatterns;
-import org.apache.openmeetings.utils.math.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IClient;
import org.red5.server.api.scope.IScope;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
Tue Aug 13 09:50:53 2013
@@ -38,8 +38,8 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.persistence.beans.user.Address;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.utils.DaoHelper;
+import org.apache.openmeetings.utils.TimezoneUtil;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
-import org.apache.openmeetings.utils.math.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
Tue Aug 13 09:50:53 2013
@@ -37,8 +37,6 @@ import java.util.Date;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
import java.util.Map;
import org.apache.openmeetings.data.basic.FieldLanguageDao;
@@ -46,7 +44,6 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.data.basic.NaviBuilder;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.data.basic.dao.ErrorDao;
-import org.apache.openmeetings.data.basic.dao.OmTimeZoneDao;
import org.apache.openmeetings.data.calendar.daos.AppointmentCategoryDao;
import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDao;
import org.apache.openmeetings.data.conference.PollManager;
@@ -58,7 +55,6 @@ import org.apache.openmeetings.data.user
import org.apache.openmeetings.data.user.dao.SalutationDao;
import org.apache.openmeetings.data.user.dao.StateDao;
import org.apache.openmeetings.data.user.dao.UsersDao;
-import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
import org.apache.openmeetings.persistence.beans.lang.Fieldvalues;
@@ -66,7 +62,7 @@ import org.apache.openmeetings.persisten
import
org.apache.openmeetings.persistence.beans.user.oauth.OAuthServer.RequestMethod;
import org.apache.openmeetings.utils.ImportHelper;
import org.apache.openmeetings.utils.OmFileHelper;
-import org.apache.openmeetings.utils.math.TimezoneUtil;
+import org.apache.openmeetings.utils.TimezoneUtil;
import org.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
@@ -90,8 +86,6 @@ public class ImportInitvalues {
@Autowired
private StateDao statemanagement;
@Autowired
- private OmTimeZoneDao omTimeZoneDaoImpl;
- @Autowired
private NaviBuilder navimanagement;
@Autowired
private ErrorDao errorManagement;
@@ -756,60 +750,6 @@ public class ImportInitvalues {
log.debug("Countries ADDED");
}
- private void loadTimeZoneFiles() throws Exception {
- SAXReader reader = new SAXReader();
- Document document = reader
- .read(new File(OmFileHelper.getLanguagesDir(),
-
OmFileHelper.nameOfTimeZoneFile));
-
- Element root = document.getRootElement();
-
- for (@SuppressWarnings("rawtypes")
- Iterator it = root.elementIterator("timezone"); it.hasNext();) {
- Element item = (Element) it.next();
- String timeZoneName = item.attributeValue("name");
- String timeZoneLabel = item.attributeValue("label");
- String iCal = item.attributeValue("iCal");
- Integer orderId =
Integer.valueOf(item.attributeValue("orderId"));
-
- omTimeZoneDaoImpl.addOmTimeZone(timeZoneName,
timeZoneLabel, iCal,
- orderId);
- }
- log.debug("TimeZones ADDED");
- }
-
- public static List<OmTimeZone> getTimeZones() throws Exception {
- log.debug(":: getTimeZones ::");
-
- List<OmTimeZone> omTimeZones = new LinkedList<OmTimeZone>();
-
- SAXReader reader = new SAXReader();
- Document document = reader
- .read(new File(OmFileHelper.getLanguagesDir(),
-
OmFileHelper.nameOfTimeZoneFile));
-
- Element root = document.getRootElement();
-
- for (@SuppressWarnings("rawtypes")
- Iterator it = root.elementIterator("timezone"); it.hasNext();) {
- Element item = (Element) it.next();
- String timeZoneName = item.attributeValue("name");
- String timeZoneLabel = item.attributeValue("label");
- Integer orderId =
Integer.valueOf(item.attributeValue("orderId"));
- String iCal = item.attributeValue("iCal");
-
- OmTimeZone omTimeZone = new OmTimeZone();
- omTimeZone.setIcal(iCal);
- omTimeZone.setJname(timeZoneName);
- omTimeZone.setLabel(timeZoneLabel);
- omTimeZone.setOrderId(orderId);
-
- omTimeZones.add(omTimeZone);
- }
-
- return omTimeZones;
- }
-
/**
* load all availible languages File names and language name's from the
* config file
@@ -1065,8 +1005,6 @@ public class ImportInitvalues {
loadErrorMappingsFromXML();
progress = 31;
loadCountriesFiles();
- progress = 38;
- loadTimeZoneFiles();
progress = 44;
loadLanguagesFiles();
progress = 50;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java
Tue Aug 13 09:50:53 2013
@@ -42,8 +42,8 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.remote.util.SessionVariablesUtil;
import org.apache.openmeetings.utils.OmFileHelper;
+import org.apache.openmeetings.utils.TimezoneUtil;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
-import org.apache.openmeetings.utils.math.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IClient;
import org.slf4j.Logger;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
Tue Aug 13 09:50:53 2013
@@ -49,8 +49,8 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.room.RoomType;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.session.ISessionManager;
+import org.apache.openmeetings.utils.TimezoneUtil;
import org.apache.openmeetings.utils.math.CalendarPatterns;
-import org.apache.openmeetings.utils.math.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IConnection;
import org.red5.server.api.Red5;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java
Tue Aug 13 09:50:53 2013
@@ -30,7 +30,7 @@ import org.apache.openmeetings.data.user
import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.invitation.Invitations;
import org.apache.openmeetings.persistence.beans.user.User;
-import org.apache.openmeetings.utils.math.TimezoneUtil;
+import org.apache.openmeetings.utils.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.service.IPendingServiceCall;
import org.red5.server.api.service.IPendingServiceCallback;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
Tue Aug 13 09:50:53 2013
@@ -59,10 +59,10 @@ import org.apache.openmeetings.remote.re
import org.apache.openmeetings.session.ISessionManager;
import org.apache.openmeetings.templates.RequestContactConfirmTemplate;
import org.apache.openmeetings.templates.RequestContactTemplate;
+import org.apache.openmeetings.utils.TimezoneUtil;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
import org.apache.openmeetings.utils.mail.MailHandler;
import org.apache.openmeetings.utils.math.CalendarPatterns;
-import org.apache.openmeetings.utils.math.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.scope.IScope;
import org.slf4j.Logger;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/BackupImport.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/BackupImport.java?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/BackupImport.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/BackupImport.java
Tue Aug 13 09:50:53 2013
@@ -105,7 +105,6 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.utils.crypt.MD5Implementation;
import org.apache.openmeetings.utils.math.CalendarPatterns;
-import org.apache.openmeetings.utils.math.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
import org.simpleframework.xml.Serializer;
import org.simpleframework.xml.convert.Registry;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/ImportHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/ImportHelper.java?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/ImportHelper.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/ImportHelper.java
Tue Aug 13 09:50:53 2013
@@ -22,11 +22,9 @@ import static org.apache.openmeetings.Op
import static
org.apache.openmeetings.persistence.beans.basic.Configuration.MAX_UPLOAD_SIZE_KEY;
import java.util.LinkedHashMap;
-import java.util.List;
import java.util.Map;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -63,13 +61,11 @@ public class ImportHelper {
* @param tzList
* @return
*/
- public static Map<String, String> getAllTimeZones(List<OmTimeZone>
tzList) {
+ public static Map<String, String> getAllTimeZones(String ... tzList) {
Map<String, String> result = new LinkedHashMap<String,
String>();
- for (OmTimeZone omTimeZone : tzList) {
- String labelName = omTimeZone.getLabel() + " ("
- + omTimeZone.getJname() + ")";
- result.put(omTimeZone.getIcal(), labelName);
+ for (String omTimeZone : tzList) {
+ result.put(omTimeZone, omTimeZone);
}
return result;
Copied:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/TimezoneUtil.java
(from r1513390,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/TimezoneUtil.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/TimezoneUtil.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/TimezoneUtil.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/TimezoneUtil.java&r1=1513390&r2=1513414&rev=1513414&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/TimezoneUtil.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/TimezoneUtil.java
Tue Aug 13 09:50:53 2013
@@ -16,33 +16,60 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.utils.math;
+package org.apache.openmeetings.utils;
+import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.utils.OmFileHelper.getLanguagesDir;
+import static org.apache.openmeetings.utils.OmFileHelper.nameOfTimeZoneFile;
+
+import java.io.File;
import java.util.Calendar;
import java.util.Date;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
import java.util.TimeZone;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.basic.dao.OmTimeZoneDao;
-import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.utils.math.CalendarPatterns;
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.Element;
+import org.dom4j.io.SAXReader;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
-/*
- FIXME this class should be completely refactored and used in backup import
only
- */
public class TimezoneUtil {
-
- private static final Logger log = Red5LoggerFactory.getLogger(
- TimezoneUtil.class,
OpenmeetingsVariables.webAppRootKey);
-
+ private static final Logger log =
Red5LoggerFactory.getLogger(TimezoneUtil.class, webAppRootKey);
+ private static final Map<String, String> ICAL_TZ_MAP = new
Hashtable<String, String>();
+ private static final Map<Long, String> ID_TZ_MAP = new Hashtable<Long,
String>();
+ static {
+ SAXReader reader = new SAXReader();
+ Document document;
+ try {
+ document = reader.read(new File(getLanguagesDir(),
nameOfTimeZoneFile));
+
+ Element root = document.getRootElement();
+
+ //HACK based on the fact timezones are not changed
+ long id = 1;
+ for (@SuppressWarnings("rawtypes")
+ Iterator it = root.elementIterator("timezone");
it.hasNext();) {
+ Element item = (Element) it.next();
+ String timeZoneName =
item.attributeValue("name");
+ String iCal = item.attributeValue("iCal");
+ ICAL_TZ_MAP.put(timeZoneName, iCal);
+ ID_TZ_MAP.put(id++, iCal);
+ }
+ } catch (DocumentException e) {
+ log.error("Unexpected error while reading old time zone
list", e);
+ }
+ }
+
@Autowired
private ConfigurationDao configurationDao;
- @Autowired
- private OmTimeZoneDao omTimeZoneDaoImpl;
/**
* Parameters:
@@ -81,10 +108,9 @@ public class TimezoneUtil {
String defaultTzName =
configurationDao.getConfValue("default.timezone", String.class,
"Europe/Berlin");
- OmTimeZone omTimeZoneDefault =
omTimeZoneDaoImpl.getOmTimeZone(defaultTzName);
+ String omTimeZoneDefault = ICAL_TZ_MAP.get(defaultTzName);
- TimeZone timeZoneByOmTimeZone = TimeZone
- .getTimeZone(omTimeZoneDefault.getIcal());
+ TimeZone timeZoneByOmTimeZone =
TimeZone.getTimeZone(omTimeZoneDefault);
if (timeZoneByOmTimeZone != null) {
return timeZoneByOmTimeZone;
@@ -116,21 +142,7 @@ public class TimezoneUtil {
}
// if user has not time zone get one from the server
configuration
-
- String defaultTzName =
configurationDao.getConfValue("default.timezone", String.class,
"Europe/Berlin");
-
- OmTimeZone omTimeZone =
omTimeZoneDaoImpl.getOmTimeZone(defaultTzName);
-
- TimeZone timeZoneByOmTimeZone = TimeZone.getTimeZone(omTimeZone
- .getIcal());
-
- if (timeZoneByOmTimeZone != null) {
- return timeZoneByOmTimeZone;
- }
-
- // If everything fails take the servers default one
- log.error("There is no correct time zone set in the
configuration of OpenMeetings for the key default.timezone or key is missing in
table, using default locale!");
- return TimeZone.getDefault();
+ return getDefaultTimeZone();
}
/**
@@ -141,35 +153,21 @@ public class TimezoneUtil {
*/
public TimeZone getTimezoneByInternalJName(String jName) {
- OmTimeZone omTimeZone = omTimeZoneDaoImpl.getOmTimeZone(jName);
+ String omTimeZone = ICAL_TZ_MAP.get(jName);
if (omTimeZone == null) {
log.error("There is not omTimeZone for this jName:
"+jName);
throw new RuntimeException("There is not omTimeZone for
this jName: "+jName);
}
- TimeZone timeZone = TimeZone.getTimeZone(omTimeZone.getIcal());
+ TimeZone timeZone = TimeZone.getTimeZone(omTimeZone);
if (timeZone != null) {
return timeZone;
}
// if user has not time zone get one from the server
configuration
-
- String defaultTzName =
configurationDao.getConfValue("default.timezone", String.class,
"Europe/Berlin");
-
- OmTimeZone omTimeZoneDefault =
omTimeZoneDaoImpl.getOmTimeZone(defaultTzName);
-
- TimeZone timeZoneByOmTimeZone = TimeZone
- .getTimeZone(omTimeZoneDefault.getIcal());
-
- if (timeZoneByOmTimeZone != null) {
- return timeZoneByOmTimeZone;
- }
-
- // If everything fails take the servers default one
- log.error("There is no correct time zone set in the
configuration of OpenMeetings for the key default.timezone or key is missing in
table, using default locale!");
- return TimeZone.getDefault();
+ return getDefaultTimeZone();
}
/**
@@ -179,32 +177,16 @@ public class TimezoneUtil {
* @return
*/
public TimeZone getTimezoneByOmTimeZoneId(Long omtimezoneId) {
+ String omTimeZone = ID_TZ_MAP.get(omtimezoneId);
- OmTimeZone omTimeZone = omTimeZoneDaoImpl
- .getOmTimeZoneById(omtimezoneId);
-
- TimeZone timeZone = TimeZone.getTimeZone(omTimeZone.getIcal());
+ TimeZone timeZone = TimeZone.getTimeZone(omTimeZone);
if (timeZone != null) {
return timeZone;
}
// if user has not time zone get one from the server
configuration
-
- String defaultTzName =
configurationDao.getConfValue("default.timezone", String.class,
"Europe/Berlin");
-
- OmTimeZone omTimeZoneDefault =
omTimeZoneDaoImpl.getOmTimeZone(defaultTzName);
-
- TimeZone timeZoneByOmTimeZone = TimeZone
- .getTimeZone(omTimeZoneDefault.getIcal());
-
- if (timeZoneByOmTimeZone != null) {
- return timeZoneByOmTimeZone;
- }
-
- // If everything fails take the servers default one
- log.error("There is no correct time zone set in the
configuration of OpenMeetings for the key default.timezone or key is missing in
table, using default locale!");
- return TimeZone.getDefault();
+ return getDefaultTimeZone();
}
/**
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
Tue Aug 13 09:50:53 2013
@@ -46,7 +46,7 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
import org.apache.openmeetings.persistence.beans.user.State;
import org.apache.openmeetings.persistence.beans.user.User;
-import org.apache.openmeetings.utils.math.TimezoneUtil;
+import org.apache.openmeetings.utils.TimezoneUtil;
import org.apache.openmeetings.web.user.dashboard.PrivateRoomsWidgetDescriptor;
import org.apache.openmeetings.web.user.dashboard.RssWidgetDescriptor;
import org.apache.openmeetings.web.user.dashboard.StartWidgetDescriptor;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/UserSearchPanel.java?rev=1513414&r1=1513413&r2=1513414&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
Tue Aug 13 09:50:53 2013
@@ -30,7 +30,7 @@ import org.apache.openmeetings.data.user
import org.apache.openmeetings.data.user.dao.UserContactsDao;
import org.apache.openmeetings.persistence.beans.user.PrivateMessage;
import org.apache.openmeetings.persistence.beans.user.User;
-import org.apache.openmeetings.utils.math.TimezoneUtil;
+import org.apache.openmeetings.utils.TimezoneUtil;
import org.apache.openmeetings.web.common.PagingNavigatorPanel;
import org.apache.openmeetings.web.common.UserPanel;
import org.apache.openmeetings.web.util.ContactsHelper;
