Author: solomax
Date: Tue Aug 13 09:00:32 2013
New Revision: 1513390
URL: http://svn.apache.org/r1513390
Log:
[OPENMEETINGS-750] import is partially fixed
Removed:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/OmTimeZoneConverter.java
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebService.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/conference/InvitationManager.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/ldap/LdapLoginManagement.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/BackupExport.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/BackupImport.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/TimezoneUtil.java
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=1513390&r1=1513389&r2=1513390&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:00:32 2013
@@ -24,7 +24,6 @@ import org.apache.openmeetings.Openmeeti
import org.apache.openmeetings.data.basic.AuthLevelUtil;
import org.apache.openmeetings.data.basic.SessiondataDao;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.basic.dao.OmTimeZoneDao;
import org.apache.openmeetings.data.conference.InvitationManager;
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
@@ -60,8 +59,6 @@ public class JabberWebService {
@Autowired
private InvitationManager invitationManager;
@Autowired
- private OmTimeZoneDao omTimeZoneDaoImpl;
- @Autowired
private ConfigurationDao configurationDao;
@Autowired
private TimezoneUtil timezoneUtil;
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=1513390&r1=1513389&r2=1513390&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:00:32 2013
@@ -38,7 +38,6 @@ import javax.persistence.criteria.Predic
import javax.persistence.criteria.Root;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.basic.dao.OmTimeZoneDao;
import org.apache.openmeetings.data.calendar.management.MeetingMemberLogic;
import org.apache.openmeetings.data.conference.InvitationManager;
import org.apache.openmeetings.data.conference.dao.InvitationDao;
@@ -68,8 +67,6 @@ public class AppointmentDao {
@Autowired
private UserManager userManager;
@Autowired
- private OmTimeZoneDao omTimeZoneDaoImpl;
- @Autowired
private AppointmentCategoryDao appointmentCategoryDaoImpl;
@Autowired
private AppointmentReminderTypDao appointmentReminderTypDao;
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=1513390&r1=1513389&r2=1513390&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:00:32 2013
@@ -27,7 +27,6 @@ import java.util.TimeZone;
import org.apache.openmeetings.data.basic.FieldManager;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.basic.dao.OmTimeZoneDao;
import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
import org.apache.openmeetings.data.calendar.daos.MeetingMemberDao;
import org.apache.openmeetings.data.conference.InvitationManager;
@@ -61,8 +60,6 @@ public class AppointmentLogic {
@Autowired
private FieldManager fieldManager;
@Autowired
- private OmTimeZoneDao omTimeZoneDaoImpl;
- @Autowired
private RoomManager roomManager;
@Autowired
private RoomDao roomDao;
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=1513390&r1=1513389&r2=1513390&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:00:32 2013
@@ -30,7 +30,6 @@ import org.apache.openmeetings.Openmeeti
import org.apache.openmeetings.data.basic.AuthLevelUtil;
import org.apache.openmeetings.data.basic.FieldManager;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.basic.dao.OmTimeZoneDao;
import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.data.conference.dao.InvitationDao;
@@ -96,8 +95,6 @@ public class InvitationManager {
private TimezoneUtil timezoneUtil;
@Autowired
private AppointmentDao appointmentDaoImpl;
- @Autowired
- private OmTimeZoneDao omTimeZoneDaoImpl;
/**
* Sending invitation within plain mail
@@ -977,8 +974,6 @@ public class InvitationManager {
User user = userManager.getUserById(organizer_userId);
// TODO: Check time zone handling in iCal Mail
- // OmTimeZone omTimeZone =
omTimeZoneDaoImpl.getOmTimeZone(jNameTimeZone);
-
IcalHandler handler = new
IcalHandler(IcalHandler.ICAL_METHOD_CANCEL);
// refresh appointment
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=1513390&r1=1513389&r2=1513390&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:00:32 2013
@@ -45,7 +45,6 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.data.basic.FieldManager;
import org.apache.openmeetings.data.basic.SessiondataDao;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.basic.dao.OmTimeZoneDao;
import org.apache.openmeetings.data.beans.basic.SearchResult;
import org.apache.openmeetings.data.user.dao.StateDao;
import org.apache.openmeetings.data.user.dao.UsersDao;
@@ -93,8 +92,6 @@ public class UserManager {
@Autowired
private StateDao statemanagement;
@Autowired
- private OmTimeZoneDao omTimeZoneDaoImpl;
- @Autowired
private OrganisationManager organisationManager;
@Autowired
private ManageCryptStyle cryptManager;
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=1513390&r1=1513389&r2=1513390&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:00:32 2013
@@ -35,7 +35,6 @@ import org.apache.openjpa.persistence.Op
import org.apache.openjpa.persistence.OpenJPAQuery;
import org.apache.openmeetings.data.IDataProviderDao;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.basic.dao.OmTimeZoneDao;
import org.apache.openmeetings.persistence.beans.user.Address;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.utils.DaoHelper;
@@ -66,8 +65,6 @@ public class UsersDao implements IDataPr
@Autowired
private ConfigurationDao configurationDao;
@Autowired
- private OmTimeZoneDao omTimeZoneDaoImpl;
- @Autowired
private StateDao stateDaoImpl;
@Autowired
private TimezoneUtil timezoneUtil;
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=1513390&r1=1513389&r2=1513390&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:00:32 2013
@@ -32,7 +32,6 @@ import org.apache.openmeetings.Openmeeti
import org.apache.openmeetings.data.basic.SessiondataDao;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.data.basic.dao.LdapConfigDao;
-import org.apache.openmeetings.data.basic.dao.OmTimeZoneDao;
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.data.user.dao.StateDao;
import org.apache.openmeetings.data.user.dao.UsersDao;
@@ -71,8 +70,6 @@ public class LdapLoginManagement {
@Autowired
private LdapConfigDao ldapConfigDao;
@Autowired
- private OmTimeZoneDao omTimeZoneDaoImpl;
- @Autowired
private ManageCryptStyle cryptManager;
@Autowired
private UsersDao usersDao;
@@ -670,7 +667,7 @@ public class LdapLoginManagement {
&& userdata.get(ldapAttrs.get("timezoneAttr"))
!= null)
jName_timeZone =
userdata.get(ldapAttrs.get("timezoneAttr"));
- if (omTimeZoneDaoImpl.getOmTimeZone(jName_timeZone) == null) {
+ if (timezoneUtil.getTimezoneByInternalJName(jName_timeZone) ==
null) {
jName_timeZone = configurationDao.getConfValue(
"default.timezone", String.class,
"Europe/Berlin");
}
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=1513390&r1=1513389&r2=1513390&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:00:32 2013
@@ -25,7 +25,6 @@ import java.util.TimeZone;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.SessiondataDao;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.basic.dao.OmTimeZoneDao;
import org.apache.openmeetings.data.conference.InvitationManager;
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.data.user.dao.UsersDao;
@@ -51,8 +50,6 @@ public class InvitationService implement
@Autowired
private UserManager userManager;
@Autowired
- private OmTimeZoneDao omTimeZoneDaoImpl;
- @Autowired
private InvitationManager invitationManager;
@Autowired
private TimezoneUtil timezoneUtil;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java?rev=1513390&r1=1513389&r2=1513390&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
Tue Aug 13 09:00:32 2013
@@ -26,13 +26,13 @@ import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.TimeZone;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.AuthLevelUtil;
import org.apache.openmeetings.data.basic.SessiondataDao;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.data.basic.dao.LdapConfigDao;
-import org.apache.openmeetings.data.basic.dao.OmTimeZoneDao;
import org.apache.openmeetings.data.basic.dao.SOAPLoginDao;
import org.apache.openmeetings.data.conference.FeedbackManager;
import org.apache.openmeetings.data.conference.InvitationManager;
@@ -43,7 +43,6 @@ import org.apache.openmeetings.data.user
import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.ldap.LdapLoginManagement;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
-import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.apache.openmeetings.persistence.beans.basic.RemoteSessionObject;
import org.apache.openmeetings.persistence.beans.basic.SOAPLogin;
import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
@@ -65,6 +64,8 @@ import org.springframework.beans.factory
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
+import edu.emory.mathcs.backport.java.util.Arrays;
+
/**
*
* @author swagner
@@ -87,8 +88,6 @@ public class MainService implements IPen
@Autowired
private StateDao statemanagement;
@Autowired
- private OmTimeZoneDao omTimeZoneDaoImpl;
- @Autowired
private RoomManager roomManager;
@Autowired
private ConferenceLogDao conferenceLogDao;
@@ -497,8 +496,9 @@ public class MainService implements IPen
return statemanagement.getStates();
}
- public List<OmTimeZone> getTimeZones() {
- return omTimeZoneDaoImpl.getOmTimeZones();
+ @SuppressWarnings("unchecked")
+ public List<String> getTimeZones() {
+ return Arrays.asList(TimeZone.getAvailableIDs());
}
/**
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=1513390&r1=1513389&r2=1513390&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:00:32 2013
@@ -32,7 +32,6 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.data.basic.FieldManager;
import org.apache.openmeetings.data.basic.SessiondataDao;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.basic.dao.OmTimeZoneDao;
import org.apache.openmeetings.data.basic.dao.ServerDao;
import org.apache.openmeetings.data.beans.basic.SearchResult;
import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
@@ -95,8 +94,6 @@ public class UserService {
@Autowired
private FieldManager fieldManager;
@Autowired
- private OmTimeZoneDao omTimeZoneDaoImpl;
- @Autowired
private SalutationDao salutationmanagement;
@Autowired
private OrganisationManager organisationManager;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/BackupExport.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/BackupExport.java?rev=1513390&r1=1513389&r2=1513390&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/BackupExport.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/BackupExport.java
Tue Aug 13 09:00:32 2013
@@ -41,7 +41,6 @@ import org.apache.openmeetings.backup.Ap
import org.apache.openmeetings.backup.AppointmentConverter;
import org.apache.openmeetings.backup.AppointmentReminderTypeConverter;
import org.apache.openmeetings.backup.DateConverter;
-import org.apache.openmeetings.backup.OmTimeZoneConverter;
import org.apache.openmeetings.backup.OrganisationConverter;
import org.apache.openmeetings.backup.PollTypeConverter;
import org.apache.openmeetings.backup.RoomConverter;
@@ -65,7 +64,6 @@ import org.apache.openmeetings.data.user
import org.apache.openmeetings.data.user.dao.UserContactsDao;
import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
-import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
import org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory;
import
org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
@@ -328,7 +326,6 @@ public class BackupExport {
List<Configuration> list =
configurationDao.getConfigurations(
0, Integer.MAX_VALUE,
"c.configuration_id", true);
Registry registry = new Registry();
- registry.bind(OmTimeZone.class,
OmTimeZoneConverter.class);
registry.bind(State.class, StateConverter.class);
registry.bind(User.class, UserConverter.class);
Strategy strategy = new RegistryStrategy(registry);
@@ -422,7 +419,6 @@ public class BackupExport {
Serializer serializer = new Persister(strategy);
registry.bind(Organisation.class, OrganisationConverter.class);
- registry.bind(OmTimeZone.class, OmTimeZoneConverter.class);
registry.bind(State.class, StateConverter.class);
if (list != null && list.size() > 0) {
registry.bind(list.get(0).getRegdate().getClass(),
DateConverter.class);
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=1513390&r1=1513389&r2=1513390&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:00:32 2013
@@ -55,7 +55,6 @@ import org.apache.openmeetings.backup.Ap
import org.apache.openmeetings.backup.DateConverter;
import org.apache.openmeetings.backup.IntegerTransform;
import org.apache.openmeetings.backup.LongTransform;
-import org.apache.openmeetings.backup.OmTimeZoneConverter;
import org.apache.openmeetings.backup.OrganisationConverter;
import org.apache.openmeetings.backup.PollTypeConverter;
import org.apache.openmeetings.backup.RoomConverter;
@@ -64,7 +63,6 @@ import org.apache.openmeetings.backup.St
import org.apache.openmeetings.backup.UserConverter;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.data.basic.dao.LdapConfigDao;
-import org.apache.openmeetings.data.basic.dao.OmTimeZoneDao;
import org.apache.openmeetings.data.calendar.daos.AppointmentCategoryDao;
import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDao;
@@ -83,7 +81,6 @@ import org.apache.openmeetings.data.user
import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
-import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
import org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory;
import
org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
@@ -108,6 +105,7 @@ 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;
@@ -133,8 +131,6 @@ public class BackupImport {
@Autowired
private StateDao statemanagement;
@Autowired
- private OmTimeZoneDao omTimeZoneDaoImpl;
- @Autowired
private OrganisationManager organisationManager;
@Autowired
private OrganisationDao orgDao;
@@ -168,6 +164,8 @@ public class BackupImport {
private PollManager pollManager;
@Autowired
private ConfigurationDao configurationDao;
+ @Autowired
+ private TimezoneUtil tzUtil;
private final HashMap<Long, Long> usersMap = new HashMap<Long, Long>();
private final HashMap<Long, Long> organisationsMap = new HashMap<Long,
Long>();
@@ -666,7 +664,6 @@ public class BackupImport {
Serializer ser = new Persister(strategy);
registry.bind(Organisation.class, new
OrganisationConverter(orgDao, organisationsMap));
- registry.bind(OmTimeZone.class, new
OmTimeZoneConverter(omTimeZoneDaoImpl));
registry.bind(State.class, new StateConverter(statemanagement));
registry.bind(Date.class, DateConverter.class);
@@ -696,11 +693,14 @@ public class BackupImport {
List<User> list = new ArrayList<User>();
InputNode root = NodeBuilder.read(new
StringReader(sw.toString()));
InputNode root1 = NodeBuilder.read(new
StringReader(sw.toString())); //HACK to handle Address inside user
+ InputNode root2 = NodeBuilder.read(new
StringReader(sw.toString())); //HACK to handle old om_time_zone
InputNode listNode = root.getNext();
InputNode listNode1 = root1.getNext(); //HACK to handle Address
inside user
+ InputNode listNode2 = root2.getNext(); //HACK to handle old
om_time_zone
if (listNodeName.equals(listNode.getName())) {
InputNode item = listNode.getNext();
InputNode item1 = listNode1.getNext(); //HACK to handle
Address inside user
+ InputNode item2 = listNode1.getNext(); //HACK to handle
old om_time_zone
while (item != null) {
User u = ser.read(User.class, item, false);
@@ -709,11 +709,17 @@ public class BackupImport {
Address a = ser.read(Address.class,
item1, false);
u.setAdresses(a);
}
- list.add(u);
- item = listNode.getNext();
do {
item1 = listNode1.getNext(); //HACK to
handle Address inside user
} while (item != null &&
!"user".equals(item1.getName()));
+ do {
+ if (u.getTimeZoneId() == null &&
"omTimeZone".equals(item2.getName())) {
+
u.setTimeZoneId(tzUtil.getTimezoneByInternalJName(item2.getValue()).getID());
+ }
+ item2 = listNode2.getNext(); //HACK to
handle old om_time_zone
+ } while (item != null &&
!"user".equals(item2.getName()));
+ list.add(u);
+ item = listNode.getNext();
}
}
return list;
Modified:
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/math/TimezoneUtil.java?rev=1513390&r1=1513389&r2=1513390&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/TimezoneUtil.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/TimezoneUtil.java
Tue Aug 13 09:00:32 2013
@@ -31,6 +31,9 @@ import org.red5.logging.Red5LoggerFactor
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(
