Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -ra0e86d739df8fd8659a5676dddafcd6c87723baf -rb4c7cf180245db7c4d9d5c600eaf294a4c570286
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a0e86d739df8fd8659a5676dddafcd6c87723baf)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -376,7 +376,7 @@
 sysadmin.lessonFinishUrl = Lesson finish callback URL
 admin.servertimezone.server.timezone.management = Server timezone management
 admin.servertimezone.title = Server timezone management
-admin.servertimezone.select.server.timezone = Select server timezone
+admin.servertimezone.select.server.timezone = Server timezone
 admin.servertimezone.raw.offset = Raw offset: {0}
 admin.servertimezone.dst.offset = DST offset: {0}
 admin.servertimezone.name = Name: {0}
@@ -699,4 +699,4 @@
 admin.user.add.to.lessons = Add user to existing lessons
 ai.config.title = Artificial Intelligence
 ai.config.link = AI management
-sysadmin.maintain.session.delete = Delete user session
+sysadmin.maintain.session.delete = Delete user session
\ No newline at end of file
Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -ra0e86d739df8fd8659a5676dddafcd6c87723baf -rb4c7cf180245db7c4d9d5c600eaf294a4c570286
--- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision a0e86d739df8fd8659a5676dddafcd6c87723baf)
+++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -376,7 +376,7 @@
 sysadmin.lessonFinishUrl = Lesson finish callback URL
 admin.servertimezone.server.timezone.management = Server timezone management
 admin.servertimezone.title = Server timezone management
-admin.servertimezone.select.server.timezone = Select server timezone
+admin.servertimezone.select.server.timezone = Server timezone
 admin.servertimezone.raw.offset = Raw offset: {0}
 admin.servertimezone.dst.offset = DST offset: {0}
 admin.servertimezone.name = Name: {0}
@@ -699,4 +699,4 @@
 admin.user.add.to.lessons = Add user to existing lessons
 ai.config.title = Artificial Intelligence
 ai.config.link = AI management
-sysadmin.maintain.session.delete = Delete user session
+sysadmin.maintain.session.delete = Delete user session
\ No newline at end of file
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml
===================================================================
diff -u -r01c2a55767c613282c319ed8b38a0c78712e3661 -rb4c7cf180245db7c4d9d5c600eaf294a4c570286
--- lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml	(.../adminApplicationContext.xml)	(revision 01c2a55767c613282c319ed8b38a0c78712e3661)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml	(.../adminApplicationContext.xml)	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -23,8 +23,5 @@
 		<property name="logEventService">
 			<ref bean="logEventService"/>
 		</property>
-   		<property name="timezoneService">
-   			<ref bean="timezoneService"/>
-   		</property>	
     </bean>
 </beans>
\ No newline at end of file
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
===================================================================
diff -u -r5b0ba932e4d5b0a247b24004ea21b48a0627ec15 -rb4c7cf180245db7c4d9d5c600eaf294a4c570286
--- lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java	(.../ImportService.java)	(revision 5b0ba932e4d5b0a247b24004ea21b48a0627ec15)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java	(.../ImportService.java)	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -34,8 +34,7 @@
 import org.lamsfoundation.lams.logevent.LogEvent;
 import org.lamsfoundation.lams.logevent.service.ILogEventService;
 import org.lamsfoundation.lams.themes.Theme;
-import org.lamsfoundation.lams.timezone.Timezone;
-import org.lamsfoundation.lams.timezone.service.ITimezoneService;
+import org.lamsfoundation.lams.timezone.TimeZoneUtil;
 import org.lamsfoundation.lams.usermanagement.AuthenticationMethod;
 import org.lamsfoundation.lams.usermanagement.ForgotPasswordRequest;
 import org.lamsfoundation.lams.usermanagement.Organisation;
@@ -67,7 +66,6 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.TimeZone;
 
 /**
  * <p>
@@ -83,7 +81,6 @@
     private IUserManagementService service;
     private MessageService messageService;
     private ILogEventService logEventService;
-    private ITimezoneService timezoneService;
 
     // spreadsheet column indexes for user spreadsheet
     private static final short LOGIN = 0;
@@ -708,26 +705,9 @@
 	user.setCreateDate(new Date());
 	user.setFirstLogin(true);
 
-	// convert timezone like "Europe/Warsaw" to "Etc/GMT-1", if provided
 	String timeZoneColumn = parseStringCell(row.getCell(ImportService.TIME_ZONE));
-	TimeZone javaTimeZone = TimeZone.getTimeZone(timeZoneColumn);
-	Timezone userTimezone = timezoneService.getServerTimezone();
-	if (javaTimeZone != null) {
-	    int offset = javaTimeZone.getRawOffset() / 3600000;
-	    String lamsTimezoneName = "Etc/GMT";
-	    if (offset > 0) {
-		lamsTimezoneName += "-" + offset;
-	    } else if (offset < 0) {
-		lamsTimezoneName += "+" + Math.abs(offset);
-	    }
-	    for (Timezone lamsTimezone : timezoneService.getDefaultTimezones()) {
-		if (lamsTimezone.getTimezoneId().equalsIgnoreCase(lamsTimezoneName)) {
-		    userTimezone = lamsTimezone;
-		    break;
-		}
-	    }
-	}
-	user.setTimeZone(userTimezone.getTimezoneId());
+	user.setTimeZone(
+		TimeZoneUtil.isTimezoneValid(timeZoneColumn) ? timeZoneColumn : TimeZoneUtil.getServerTimezone());
 
 	service.updatePassword(user, password);
 
@@ -972,8 +952,4 @@
     public void setLogEventService(ILogEventService logEventService) {
 	this.logEventService = logEventService;
     }
-
-    public void setTimezoneService(ITimezoneService timezoneService) {
-	this.timezoneService = timezoneService;
-    }
 }
\ No newline at end of file
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/AppAdminStartController.java
===================================================================
diff -u -r1e85a36d6397d66fa9cc46b334e2ef2bef8af4f6 -rb4c7cf180245db7c4d9d5c600eaf294a4c570286
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/AppAdminStartController.java	(.../AppAdminStartController.java)	(revision 1e85a36d6397d66fa9cc46b334e2ef2bef8af4f6)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/AppAdminStartController.java	(.../AppAdminStartController.java)	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -22,10 +22,6 @@
 
 package org.lamsfoundation.lams.admin.web.controller;
 
-import java.util.ArrayList;
-
-import javax.servlet.http.HttpServletRequest;
-
 import org.lamsfoundation.lams.admin.AdminConstants;
 import org.lamsfoundation.lams.admin.web.dto.LinkBean;
 import org.lamsfoundation.lams.usermanagement.Role;
@@ -38,6 +34,9 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+
 /**
  * @author jliew
  *
@@ -67,7 +66,6 @@
 
 	if (request.isUserInRole(Role.APPADMIN) || request.isUserInRole(Role.SYSADMIN)) {
 	    links = new ArrayList<>();
-	    links.add(new LinkBean("timezonemanagement/start.do", "admin.timezone.title"));
 	    links.add(new LinkBean("loginmaintain.do", "appadmin.maintain.loginpage"));
 	    links.add(new LinkBean("signupManagement/start.do", "admin.signup.title"));
 	    links.add(new LinkBean("policyManagement/list.do", "admin.policies.title"));
@@ -124,4 +122,4 @@
 	return "appadmin";
     }
 
-}
+}
\ No newline at end of file
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java
===================================================================
diff -u -rc7c5d74f9c402bdab97bd3fd46436adbfa9202b8 -rb4c7cf180245db7c4d9d5c600eaf294a4c570286
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java	(.../ConfigController.java)	(revision c7c5d74f9c402bdab97bd3fd46436adbfa9202b8)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java	(.../ConfigController.java)	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -22,12 +22,6 @@
  */
 package org.lamsfoundation.lams.admin.web.controller;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
 import org.apache.commons.lang.StringUtils;
 import org.lamsfoundation.lams.admin.web.form.ConfigForm;
 import org.lamsfoundation.lams.config.ConfigurationItem;
@@ -36,6 +30,7 @@
 import org.lamsfoundation.lams.security.ISecurityService;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.LanguageUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.web.filter.AuditLogFilter;
@@ -48,6 +43,12 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.TimeZone;
+
 /**
  * ConfigAction
  *
@@ -81,6 +82,8 @@
 	smtpAuthTypes.put("ssl", "SSL");
 	request.setAttribute("smtpAuthTypes", smtpAuthTypes);
 
+	request.setAttribute("timezones", TimeZone.getAvailableIDs());
+
 	return "config/editconfig";
     }
 
@@ -132,15 +135,18 @@
 			    .append("\" from \"").append(currentValue).append("\" to \"").append(newValue)
 			    .append("\", ");
 		}
+		if (key.equals(ConfigurationKeys.SERVER_TIMEZONE) && StringUtils.isBlank(newValue)) {
+		    newValue = null;
+		}
 		Configuration.updateItem(key, newValue);
 	    }
 	}
 	configuration.persistUpdate();
 
 	if (changeLog.length() > 0) {
 	    // if there were any changes made, log it
-	    String changeLogString = changeLog.insert(0, "Configuration changed: ").substring(0,
-		    changeLog.length() - 2);
+	    String changeLogString = changeLog.insert(0, "Configuration changed: ")
+		    .substring(0, changeLog.length() - 2);
 	    logEventService.logEvent(LogEvent.TYPE_CONFIG_CHANGE, getUserId(), null, null, null, changeLogString);
 
 	    AuditLogFilter.log(AuditLogFilter.CONFIG_CHANGE_ACTION, changeLogString);
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java
===================================================================
diff -u -r1e85a36d6397d66fa9cc46b334e2ef2bef8af4f6 -rb4c7cf180245db7c4d9d5c600eaf294a4c570286
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java	(.../LtiConsumerManagementController.java)	(revision 1e85a36d6397d66fa9cc46b334e2ef2bef8af4f6)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java	(.../LtiConsumerManagementController.java)	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -1,35 +1,22 @@
 package org.lamsfoundation.lams.admin.web.controller;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.TimeZone;
-import java.util.TreeSet;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.admin.web.form.LtiConsumerForm;
 import org.lamsfoundation.lams.integration.ExtServer;
 import org.lamsfoundation.lams.integration.service.IIntegrationService;
 import org.lamsfoundation.lams.security.ISecurityService;
-import org.lamsfoundation.lams.timezone.Timezone;
-import org.lamsfoundation.lams.timezone.dto.TimezoneDTO;
-import org.lamsfoundation.lams.timezone.service.ITimezoneService;
-import org.lamsfoundation.lams.timezone.util.TimezoneIDComparator;
 import org.lamsfoundation.lams.usermanagement.SupportedLocale;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.LanguageUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.filter.AuditLogFilter;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
-import org.lamsfoundation.lams.web.filter.AuditLogFilter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Controller;
@@ -39,6 +26,13 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.util.Collections;
+import java.util.List;
+import java.util.TimeZone;
+
 /**
  * @author Andrey Balan
  */
@@ -52,8 +46,6 @@
     @Autowired
     private IUserManagementService userManagementService;
     @Autowired
-    private ITimezoneService timezoneService;
-    @Autowired
     private ISecurityService securityService;
     @Autowired
     @Qualifier("adminMessageService")
@@ -105,17 +97,7 @@
 	    request.setAttribute("locales", locales);
 
 	    request.setAttribute("countryCodes", LanguageUtil.getCountryCodes(false));
-
-	    List<Timezone> availableTimeZones = timezoneService.getDefaultTimezones();
-	    TreeSet<TimezoneDTO> timezoneDtos = new TreeSet<>(new TimezoneIDComparator());
-	    for (Timezone availableTimeZone : availableTimeZones) {
-		String timezoneId = availableTimeZone.getTimezoneId();
-		TimezoneDTO timezoneDto = new TimezoneDTO();
-		timezoneDto.setTimeZoneId(timezoneId);
-		timezoneDto.setDisplayName(TimeZone.getTimeZone(timezoneId).getDisplayName());
-		timezoneDtos.add(timezoneDto);
-	    }
-	    request.setAttribute("timezoneDtos", timezoneDtos);
+	    request.setAttribute("timezones", TimeZone.getAvailableIDs());
 	}
 
 	integrationService.clearLessonFinishUrlCache();
Fisheye: Tag b4c7cf180245db7c4d9d5c600eaf294a4c570286 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/TimezoneManagementController.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java
===================================================================
diff -u -r1713042dda0682a11a40bd58cb3bbb8b30238786 -rb4c7cf180245db7c4d9d5c600eaf294a4c570286
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java	(.../UserController.java)	(revision 1713042dda0682a11a40bd58cb3bbb8b30238786)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java	(.../UserController.java)	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -23,15 +23,6 @@
 
 package org.lamsfoundation.lams.admin.web.controller;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.TimeZone;
-import java.util.TreeSet;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.admin.web.dto.UserOrgRoleDTO;
@@ -40,10 +31,7 @@
 import org.lamsfoundation.lams.logevent.service.ILogEventService;
 import org.lamsfoundation.lams.themes.Theme;
 import org.lamsfoundation.lams.themes.service.IThemeService;
-import org.lamsfoundation.lams.timezone.Timezone;
-import org.lamsfoundation.lams.timezone.dto.TimezoneDTO;
-import org.lamsfoundation.lams.timezone.service.ITimezoneService;
-import org.lamsfoundation.lams.timezone.util.TimezoneIDComparator;
+import org.lamsfoundation.lams.timezone.TimeZoneUtil;
 import org.lamsfoundation.lams.usermanagement.AuthenticationMethod;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.OrganisationState;
@@ -68,6 +56,13 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.TimeZone;
+
 /**
  * @author Jun-Dir Liew
  */
@@ -84,8 +79,6 @@
     @Autowired
     private IThemeService themeService;
     @Autowired
-    private ITimezoneService timezoneService;
-    @Autowired
     private IUserManagementService userManagementService;
 
     private static List<SupportedLocale> locales;
@@ -191,8 +184,7 @@
 		log.debug(e);
 	    }
 
-	    Timezone serverTimezone = timezoneService.getServerTimezone();
-	    userForm.setTimeZone(serverTimezone.getTimezoneId());
+	    userForm.setTimeZone(TimeZoneUtil.getServerTimezone());
 	}
 	userForm.setOrgId(org == null ? null : org.getOrganisationId());
 
@@ -206,17 +198,7 @@
 	    request.setAttribute("canSetTwoFactorAuthentication", true);
 	}
 
-	// Get all available time zones
-	List<Timezone> availableTimeZones = timezoneService.getDefaultTimezones();
-	TreeSet<TimezoneDTO> timezoneDtos = new TreeSet<>(new TimezoneIDComparator());
-	for (Timezone availableTimeZone : availableTimeZones) {
-	    String timezoneId = availableTimeZone.getTimezoneId();
-	    TimezoneDTO timezoneDto = new TimezoneDTO();
-	    timezoneDto.setTimeZoneId(timezoneId);
-	    timezoneDto.setDisplayName(TimeZone.getTimeZone(timezoneId).getDisplayName());
-	    timezoneDtos.add(timezoneDto);
-	}
-	request.setAttribute("timezoneDtos", timezoneDtos);
+	request.setAttribute("timezones", TimeZone.getAvailableIDs());
 
 	// for breadcrumb links
 	if (org != null) {
Index: lams_admin/web/config/editconfig.jsp
===================================================================
diff -u -r4dfac2d5a56db552565f34ac9fa2398bc01838b5 -rb4c7cf180245db7c4d9d5c600eaf294a4c570286
--- lams_admin/web/config/editconfig.jsp	(.../editconfig.jsp)	(revision 4dfac2d5a56db552565f34ac9fa2398bc01838b5)
+++ lams_admin/web/config/editconfig.jsp	(.../editconfig.jsp)	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -68,6 +68,16 @@
 												</c:forEach>
 											</select>
 										</c:when>
+										<c:when test="${row.key == 'ServerTimezone'}">
+											<select name="value" class="form-control" id="${row.key}">
+												<option value="">---</option>
+												<c:forEach items="${timezones}" var="timezone">
+													<option value="${timezone}" ${timezone == row.value ? 'selected="selected"' : '' }>
+														<c:out value="${timezone}" />
+													</option>
+												</c:forEach>
+											</select>
+										</c:when>
 										<c:when test="${row.format==BOOLEAN}">
 											<select id="${row.key}" name="value" class="form-control">
 												<option value="true" ${row.value ? 'selected="selected"' : '' }>true</option>
@@ -106,4 +116,4 @@
 		
 	</lams:Page5>
 </body>
-</lams:html>
+</lams:html>
\ No newline at end of file
Index: lams_admin/web/integration/ltiConsumer.jsp
===================================================================
diff -u -r9a7f862d77571f30df62616d9e8d6ebc8c35ab09 -rb4c7cf180245db7c4d9d5c600eaf294a4c570286
--- lams_admin/web/integration/ltiConsumer.jsp	(.../ltiConsumer.jsp)	(revision 9a7f862d77571f30df62616d9e8d6ebc8c35ab09)
+++ lams_admin/web/integration/ltiConsumer.jsp	(.../ltiConsumer.jsp)	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -129,10 +129,8 @@
 						<div class="mb-3">
 							<label for="defaultTimeZone" class="form-label"><fmt:message key="admin.user.time.zone" /></label>
 							<form:select path="defaultTimeZone" cssClass="form-select">
-								<c:forEach items="${timezoneDtos}" var="timezoneDto">
-									<form:option value="${timezoneDto.timeZoneId}">
-										${timezoneDto.timeZoneId} - ${timezoneDto.displayName}
-									</form:option>
+								<c:forEach items="${timezones}" var="timezone">
+									<form:option value="${timezone}"><c:out value="${timezone}" /></form:option>
 								</c:forEach>
 							</form:select>
 							<lams:errors path="defaultTimeZone"/>
Fisheye: Tag b4c7cf180245db7c4d9d5c600eaf294a4c570286 refers to a dead (removed) revision in file `lams_admin/web/timezoneManagement.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/web/user.jsp
===================================================================
diff -u -r6b09352f0035857637c5accfa2ffc66a4385f120 -rb4c7cf180245db7c4d9d5c600eaf294a4c570286
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision 6b09352f0035857637c5accfa2ffc66a4385f120)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -474,10 +474,8 @@
 								key="admin.user.time.zone" />:
 						</label>
 						<form:select path="timeZone" cssClass="form-select">
-							<c:forEach items="${timezoneDtos}" var="timezoneDto">
-								<form:option value="${timezoneDto.timeZoneId}">
-									${timezoneDto.timeZoneId} - ${timezoneDto.displayName}
-								</form:option>
+							<c:forEach items="${timezones}" var="timezone">
+								<form:option value="${timezone}"><c:out value="${timezone}" /></form:option>
 							</c:forEach>
 						</form:select>
 					</div>
Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileController.java
===================================================================
diff -u -ra5b247dd91cb3ffabf9de46cba029e5537fad087 -rb4c7cf180245db7c4d9d5c600eaf294a4c570286
--- lams_central/src/java/org/lamsfoundation/lams/web/ProfileController.java	(.../ProfileController.java)	(revision a5b247dd91cb3ffabf9de46cba029e5537fad087)
+++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileController.java	(.../ProfileController.java)	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -22,15 +22,6 @@
  */
 package org.lamsfoundation.lams.web;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.TimeZone;
-import java.util.TreeSet;
-
-import javax.servlet.http.HttpServletRequest;
-
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
@@ -43,10 +34,6 @@
 import org.lamsfoundation.lams.policies.service.IPolicyService;
 import org.lamsfoundation.lams.themes.Theme;
 import org.lamsfoundation.lams.themes.service.IThemeService;
-import org.lamsfoundation.lams.timezone.Timezone;
-import org.lamsfoundation.lams.timezone.dto.TimezoneDTO;
-import org.lamsfoundation.lams.timezone.service.ITimezoneService;
-import org.lamsfoundation.lams.timezone.util.TimezoneIDComparator;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.OrganisationType;
 import org.lamsfoundation.lams.usermanagement.SupportedLocale;
@@ -69,6 +56,13 @@
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.TimeZone;
+
 /**
  * @author <a href="mailto:fyang@melcoe.mq.edu.au">Fei Yang</a>
  */
@@ -84,8 +78,6 @@
     @Autowired
     private IThemeService themeService;
     @Autowired
-    private ITimezoneService timezoneService;
-    @Autowired
     @Qualifier("centralMessageService")
     private MessageService messageService;
     @Autowired
@@ -264,20 +256,8 @@
 	}
 	userForm.setUserTheme(userSelectedTheme);
 
-	List<Timezone> availableTimeZones = timezoneService.getDefaultTimezones();
-	//TreeSet<TimezoneDTO> timezoneDtos = new TreeSet<TimezoneDTO>(new TimezoneDTOComparator());
-	// Comparator to sort timezones by timezone id
-	TreeSet<TimezoneDTO> timezoneDtos = new TreeSet<>(new TimezoneIDComparator());
+	request.setAttribute("timezones", TimeZone.getAvailableIDs());
 
-	for (Timezone availableTimeZone : availableTimeZones) {
-	    String timezoneId = availableTimeZone.getTimezoneId();
-	    TimezoneDTO timezoneDto = new TimezoneDTO();
-	    timezoneDto.setTimeZoneId(timezoneId);
-	    timezoneDto.setDisplayName(TimeZone.getTimeZone(timezoneId).getDisplayName());
-	    timezoneDtos.add(timezoneDto);
-	}
-	request.setAttribute("timezoneDtos", timezoneDtos);
-
 	return "profile/editprofile";
     }
-}
+}
\ No newline at end of file
Index: lams_central/src/java/org/lamsfoundation/lams/web/controller/SignupController.java
===================================================================
diff -u -rc411a41e411c046a3db44b372462132c4957c6dc -rb4c7cf180245db7c4d9d5c600eaf294a4c570286
--- lams_central/src/java/org/lamsfoundation/lams/web/controller/SignupController.java	(.../SignupController.java)	(revision c411a41e411c046a3db44b372462132c4957c6dc)
+++ lams_central/src/java/org/lamsfoundation/lams/web/controller/SignupController.java	(.../SignupController.java)	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -1,20 +1,10 @@
 package org.lamsfoundation.lams.web.controller;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.Map;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.AddressException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.signup.model.SignupOrganisation;
 import org.lamsfoundation.lams.signup.service.ISignupService;
-import org.lamsfoundation.lams.timezone.service.ITimezoneService;
+import org.lamsfoundation.lams.timezone.TimeZoneUtil;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
@@ -33,6 +23,15 @@
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import javax.mail.MessagingException;
+import javax.mail.internet.AddressException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Map;
+
 @Controller
 @RequestMapping("/signup")
 public class SignupController {
@@ -43,8 +42,6 @@
     @Autowired
     @Qualifier("centralMessageService")
     private MessageService messageService;
-    @Autowired
-    private ITimezoneService timezoneService;
 
     @RequestMapping("init")
     public String execute(@ModelAttribute("SignupForm") SignupForm signupForm, HttpServletRequest request,
@@ -85,7 +82,7 @@
 		user.setLastName(signupForm.getLastName());
 		user.setEmail(signupForm.getEmail());
 		user.setCountry(signupForm.getCountry());
-		user.setTimeZone(timezoneService.getServerTimezone().getTimezoneId());
+		user.setTimeZone(TimeZoneUtil.getServerTimezone());
 
 		if (!ValidationUtil.isPasswordNotUserDetails(signupForm.getPassword(), user)) {
 		    errorMap.add("password", messageService.getMessage("label.password.restrictions"));
@@ -309,4 +306,4 @@
 	}
 	return "/signup/emailVerifyResult";
     }
-}
+}
\ No newline at end of file
Index: lams_central/web/profile/editprofile.jsp
===================================================================
diff -u -r54a3c302d29d64b55efa18189083dadd13c51708 -rb4c7cf180245db7c4d9d5c600eaf294a4c570286
--- lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
+++ lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -178,10 +178,8 @@
 								<div class="form-group">
 									<label><fmt:message key="label.timezone.title" />:</label>
 									<form:select path="timeZone" disabled="${!profileEditEnabled or editOnlyName}" cssClass="form-control">
-										<c:forEach items="${timezoneDtos}" var="timezoneDto">
-											<form:option value="${timezoneDto.timeZoneId}">
-												${timezoneDto.timeZoneId} - ${timezoneDto.displayName}
-											</form:option>
+										<c:forEach items="${timezones}" var="timezone">
+											<form:option value="${timezone}"><c:out value="${timezone}" /></form:option>
 										</c:forEach>
 									</form:select>
 								</div>
@@ -321,10 +319,8 @@
 								<div class="form-group">
 									<label><fmt:message key="label.timezone.title" />:</label>
 									<form:select path="timeZone" disabled="${!profileEditEnabled}" cssClass="form-control">
-										<c:forEach items="${timezoneDtos}" var="timezoneDto">
-											<form:option value="${timezoneDto.timeZoneId}">
-												${timezoneDto.timeZoneId} - ${timezoneDto.displayName}
-											</form:option>
+										<c:forEach items="${timezones}" var="timezone">
+											<form:option value="${timezone}"><c:out value="${timezone}" /></form:option>
 										</c:forEach>
 									</form:select>
 								</div>
Index: lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
===================================================================
diff -u -rf53bf7195291dc2c87f096afb30e0b2c78ed63fc -rb4c7cf180245db7c4d9d5c600eaf294a4c570286
--- lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision f53bf7195291dc2c87f096afb30e0b2c78ed63fc)
+++ lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -54,7 +54,6 @@
 			 <!-- Below are immutable entities which can be kept in cache forever. -->
 			<prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.learningdesign.LearningLibrary.expiration.max_idle">-1</prop>
 			<prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.themes.Theme.expiration.max_idle">-1</prop>
-			<prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.timezone.Timezone.expiration.max_idle">-1</prop>
 			<prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.tool.Tool.expiration.max_idle">-1</prop>
 			<prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.tool.SystemTool.expiration.max_idle">-1</prop>
 			<prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.usermanagement.AuthenticationMethodType.expiration.max_idle">-1</prop>
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -r551d792837f89602da3be00578e9d474decc6605 -rb4c7cf180245db7c4d9d5c600eaf294a4c570286
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 551d792837f89602da3be00578e9d474decc6605)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -211,28 +211,6 @@
 			</props>
 		</property>
 	</bean>
-	
-	<bean id="timezoneServiceTarget" class="org.lamsfoundation.lams.timezone.service.TimezoneService">
-		<property name="timezoneDAO"><ref bean="timezoneDAO"/></property>
-	</bean>
-	
-	<bean id="timezoneService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
-		<property name ="target"><ref bean="timezoneServiceTarget"/></property>
-		<property name="proxyTargetClass"><value>true</value></property> 
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<property name="transactionAttributes">
-			<props>
-				<prop key="get*">PROPAGATION_REQUIRED</prop>
-				<prop key="set*">PROPAGATION_REQUIRED</prop>
-				<prop key="update*">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-	</bean>
 
 	<bean id="signupServiceTarget" class="org.lamsfoundation.lams.signup.service.SignupService">
 		<property name="signupDAO"><ref bean="signupDAO" /></property>
@@ -721,11 +699,6 @@
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
-	<!--  Timezone service related beans -->
-	<bean id="timezoneDAO" class="org.lamsfoundation.lams.timezone.dao.hibernate.TimezoneDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>	
-	
 	<!--  Signup service related beans -->
 	<bean id="signupDAO" class="org.lamsfoundation.lams.signup.dao.hibernate.SignupDAO">
 		<property name="sessionFactory"><ref bean="coreSessionFactory" /></property>
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20231215.sql
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20231215.sql	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20231215.sql	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -0,0 +1,18 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+-- Put all sql statements below here
+
+-- LDEV-5426 Use Java timezones instead of built-in ones
+
+INSERT INTO lams_configuration (config_key, config_value, description_key, header_name, format, required)
+VALUES ('ServerTimezone', (SELECT timezone_id FROM lams_timezone WHERE server_timezone = 1),
+        'admin.servertimezone.select.server.timezone', 'config.header.features', 'STRING', 0);
+DROP TABLE lams_timezone;
+
+-- Put all sql statements above here
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
===================================================================
diff -u -r3a98d2ed66b1a6edc0a5aec5860d8c78dc1a9892 -rb4c7cf180245db7c4d9d5c600eaf294a4c570286
--- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java	(.../IntegrationService.java)	(revision 3a98d2ed66b1a6edc0a5aec5860d8c78dc1a9892)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java	(.../IntegrationService.java)	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -70,7 +70,7 @@
 import org.lamsfoundation.lams.integration.util.LtiUtils;
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.lesson.service.ILessonService;
-import org.lamsfoundation.lams.timezone.service.ITimezoneService;
+import org.lamsfoundation.lams.timezone.TimeZoneUtil;
 import org.lamsfoundation.lams.tool.service.ILamsCoreToolService;
 import org.lamsfoundation.lams.usermanagement.AuthenticationMethod;
 import org.lamsfoundation.lams.usermanagement.Organisation;
@@ -109,7 +109,6 @@
     private IUserManagementService service;
     private ILessonService lessonService;
     private ILamsCoreToolService toolService;
-    private ITimezoneService timezoneService;
 
     /**
      * Returns integration server or LTI tool consumer by its human-entered server key/server id.
@@ -505,7 +504,7 @@
 	    user.setCreateDate(new Date());
 	    user.setDisabledFlag(false);
 	    user.setLocale(LanguageUtil.getSupportedLocaleByNameOrLanguageCode(userData[12]));
-	    user.setTimeZone(timezoneService.getServerTimezone().getTimezoneId());
+	    user.setTimeZone(TimeZoneUtil.getServerTimezone());
 	    user.setTheme(service.getDefaultTheme());
 	    service.saveUser(user);
 	}
@@ -1205,9 +1204,4 @@
     public void setToolService(ILamsCoreToolService toolService) {
 	this.toolService = toolService;
     }
-
-    public void setTimezoneService(ITimezoneService timezoneService) {
-	this.timezoneService = timezoneService;
-    }
-
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml
===================================================================
diff -u -r713a4d2055ba7766354709db2ae65dacfb5d2b1a -rb4c7cf180245db7c4d9d5c600eaf294a4c570286
--- lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml	(.../integrationContext.xml)	(revision 713a4d2055ba7766354709db2ae65dacfb5d2b1a)
+++ lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml	(.../integrationContext.xml)	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -9,7 +9,6 @@
 		<property name="lessonService"><ref bean="lessonService"/></property>
 		<property name="service"><ref bean="userManagementService"/></property>
 		<property name="toolService"><ref bean="lamsCoreToolServiceTarget"/></property>
-		<property name="timezoneService"><ref bean="timezoneService"/></property>
 	</bean>
 	
 	<bean id="integrationService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
Index: lams_common/src/java/org/lamsfoundation/lams/timezone/TimeZoneUtil.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/timezone/TimeZoneUtil.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/timezone/TimeZoneUtil.java	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -0,0 +1,20 @@
+package org.lamsfoundation.lams.timezone;
+
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
+
+import java.util.TimeZone;
+
+public class TimeZoneUtil {
+
+    public static String getServerTimezone() {
+	String serverTimezone = Configuration.get(ConfigurationKeys.SERVER_TIMEZONE);
+	return StringUtils.isBlank(serverTimezone) ? TimeZone.getDefault().getID() : serverTimezone;
+    }
+
+    public static boolean isTimezoneValid(String timezoneId) {
+	return ArrayUtils.contains(TimeZone.getAvailableIDs(), timezoneId);
+    }
+}
\ No newline at end of file
Fisheye: Tag b4c7cf180245db7c4d9d5c600eaf294a4c570286 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/timezone/Timezone.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b4c7cf180245db7c4d9d5c600eaf294a4c570286 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/timezone/dao/ITimezoneDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b4c7cf180245db7c4d9d5c600eaf294a4c570286 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/timezone/dao/hibernate/TimezoneDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b4c7cf180245db7c4d9d5c600eaf294a4c570286 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/timezone/dto/TimezoneDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b4c7cf180245db7c4d9d5c600eaf294a4c570286 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/timezone/service/ITimezoneService.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b4c7cf180245db7c4d9d5c600eaf294a4c570286 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/timezone/service/TimezoneService.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b4c7cf180245db7c4d9d5c600eaf294a4c570286 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/timezone/util/TimezoneIDComparator.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml
===================================================================
diff -u -r713a4d2055ba7766354709db2ae65dacfb5d2b1a -rb4c7cf180245db7c4d9d5c600eaf294a4c570286
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml	(.../ldapContext.xml)	(revision 713a4d2055ba7766354709db2ae65dacfb5d2b1a)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml	(.../ldapContext.xml)	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -7,7 +7,6 @@
            				   
 	<bean id="ldapServiceTarget" class="org.lamsfoundation.lams.usermanagement.service.LdapService">
 		<property name="service"><ref bean="userManagementService"/></property>
-		<property name="timezoneService"><ref bean="timezoneService"/></property>
 	</bean>
 	
 	<bean id="ldapService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
===================================================================
diff -u -r29a37489a63e5a95f42a5ef5fd8a7daeb65c53c5 -rb4c7cf180245db7c4d9d5c600eaf294a4c570286
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java	(.../LdapService.java)	(revision 29a37489a63e5a95f42a5ef5fd8a7daeb65c53c5)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java	(.../LdapService.java)	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -22,30 +22,10 @@
 
 package org.lamsfoundation.lams.usermanagement.service;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Properties;
-
-import javax.naming.Context;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
-import javax.naming.ldap.Control;
-import javax.naming.ldap.InitialLdapContext;
-import javax.naming.ldap.LdapContext;
-import javax.naming.ldap.PagedResultsControl;
-import javax.naming.ldap.PagedResultsResponseControl;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.integration.security.RandomPasswordGenerator;
-import org.lamsfoundation.lams.timezone.service.ITimezoneService;
+import org.lamsfoundation.lams.timezone.TimeZoneUtil;
 import org.lamsfoundation.lams.usermanagement.AuthenticationMethod;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.OrganisationState;
@@ -58,6 +38,25 @@
 import org.lamsfoundation.lams.util.HashUtil;
 import org.lamsfoundation.lams.util.LanguageUtil;
 
+import javax.naming.Context;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+import javax.naming.ldap.Control;
+import javax.naming.ldap.InitialLdapContext;
+import javax.naming.ldap.LdapContext;
+import javax.naming.ldap.PagedResultsControl;
+import javax.naming.ldap.PagedResultsResponseControl;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Properties;
+
 /**
  * @author jliew
  *
@@ -68,8 +67,6 @@
 
     private IUserManagementService service;
 
-    private ITimezoneService timezoneService;
-
     private static final int BULK_UPDATE_CREATED = 0;
 
     private static final int BULK_UPDATE_UPDATED = 1;
@@ -153,7 +150,7 @@
 		user.setDisabledFlag(getDisabledBoolean(attrs));
 		user.setCreateDate(new Date());
 		user.setLocale(getLocale(map.get("locale")));
-		user.setTimeZone(timezoneService.getServerTimezone().getTimezoneId());
+		user.setTimeZone(TimeZoneUtil.getServerTimezone());
 		user.setFirstLogin(true);
 		service.saveUser(user);
 		service.logUserCreated(user, (User) null);
@@ -619,9 +616,4 @@
     public void setService(IUserManagementService service) {
 	this.service = service;
     }
-
-    public void setTimezoneService(ITimezoneService timezoneService) {
-	this.timezoneService = timezoneService;
-    }
-
-}
+}
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
===================================================================
diff -u -rad80b813ce57fb0277896d5ba213d15b559af004 -rb4c7cf180245db7c4d9d5c600eaf294a4c570286
--- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision ad80b813ce57fb0277896d5ba213d15b559af004)
+++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -27,7 +27,6 @@
  * Known keys for the configuration data.
  *
  * @author fmalikoff
- *
  */
 public class ConfigurationKeys {
 
@@ -253,6 +252,7 @@
 
     // LDEV-4144
     public static String SHOW_TIMEZONE_WARNING = "ShowTimezoneWarning";
+    public static String SERVER_TIMEZONE = "ServerTimezone";
 
     // LDEV-4594 / LDEV-4583 Allow/Block access to index.do for integration learners. Default to false - do not allow direct access.
     public static String ALLOW_DIRECT_ACCESS_FOR_INTEGRATION_LEARNERS = "AllowDirectAccessIntgrtnLrnr";
Index: lams_common/src/java/org/lamsfoundation/lams/web/filter/AuditLogFilter.java
===================================================================
diff -u -r7a8799c48d4fdfcb3dbfa289e40a625e2a8e0187 -rb4c7cf180245db7c4d9d5c600eaf294a4c570286
--- lams_common/src/java/org/lamsfoundation/lams/web/filter/AuditLogFilter.java	(.../AuditLogFilter.java)	(revision 7a8799c48d4fdfcb3dbfa289e40a625e2a8e0187)
+++ lams_common/src/java/org/lamsfoundation/lams/web/filter/AuditLogFilter.java	(.../AuditLogFilter.java)	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -1,22 +1,21 @@
 package org.lamsfoundation.lams.web.filter;
 
-import java.io.IOException;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.web.filter.OncePerRequestFilter;
 
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.util.Map.Entry;
+import java.util.Set;
+
 /**
  * Logs requests to controllers with their parameters
  *
@@ -34,7 +33,6 @@
     public static final String CALL_ACTION = "endpoint_call";
     public static final String CONFIG_CHANGE_ACTION = "configuration_change";
     public static final String LOGIN_PAGE_CHANGE_ACTION = "login_page_change";
-    public static final String TIMEZONE_CHANGE_ACTION = "timezone_change";
     public static final String ACCOUNT_LOCKED_ACTION = "account_lock";
     public static final String LOGIN_AS_ACTION = "login_as";
     public static final String SESSION_DELETE_ACTION = "session_delete";
Index: lams_gradebook/lkc_gradebook.eml
===================================================================
diff -u
--- lams_gradebook/lkc_gradebook.eml	(revision 0)
+++ lams_gradebook/lkc_gradebook.eml	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component inheritJdk="true">
+	<contentEntry url="file://$MODULE_DIR$"/>
+	<levels>
+		<level name="3rdParty" value="project"/>
+	</levels>
+</component>
\ No newline at end of file
Index: lams_gradebook/lkc_gradebook.iml
===================================================================
diff -u
--- lams_gradebook/lkc_gradebook.iml	(revision 0)
+++ lams_gradebook/lkc_gradebook.iml	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module classpath="eclipse" classpath-dir="$MODULE_DIR$" type="JAVA_MODULE" version="4" />
\ No newline at end of file
Index: lams_monitoring/lkc_monitoring.eml
===================================================================
diff -u
--- lams_monitoring/lkc_monitoring.eml	(revision 0)
+++ lams_monitoring/lkc_monitoring.eml	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component inheritJdk="true">
+	<contentEntry url="file://$MODULE_DIR$"/>
+	<levels>
+		<level name="3rdParty" value="project"/>
+	</levels>
+</component>
\ No newline at end of file
Index: lams_monitoring/lkc_monitoring.iml
===================================================================
diff -u
--- lams_monitoring/lkc_monitoring.iml	(revision 0)
+++ lams_monitoring/lkc_monitoring.iml	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module classpath="eclipse" classpath-dir="$MODULE_DIR$" type="JAVA_MODULE" version="4" />
\ No newline at end of file
Index: lams_monitoring/web/allQuestionsList.jsp
===================================================================
diff -u
--- lams_monitoring/web/allQuestionsList.jsp	(revision 0)
+++ lams_monitoring/web/allQuestionsList.jsp	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -0,0 +1,111 @@
+<!DOCTYPE html>
+
+<%@ include file="/taglibs.jsp"%>
+<lams:html>
+<lams:head>
+	<lams:css/>
+	<style type="text/css">
+		.question-index {
+			float: left; 
+			padding-right: 10px;
+		}
+		.question-title {
+			padding-bottom: 8px;
+		}
+		h1 {
+			padding-top: 15px;
+			margin-bottom: 10px;
+		}
+	</style>
+</lams:head>
+
+<body class="stripes">
+<lams:Page type="learner" title="All questions list">
+
+	<c:if test="${(empty mcContentSet) and (empty scratchieSet) and (empty assessmentMap)}">
+		<lams:Alert id="no-activities" type="info" close="true">
+			Current lesson doesn't contain activities with questions.
+		</lams:Alert>
+	</c:if>
+
+	<c:forEach var="mcContent" items="${mcContentSet}">
+		<c:set var="title">MCQ: <c:out value="${mcContent.title}"/></c:set>
+		<lams:SimplePanel title="${title}">
+		
+			<c:forEach var="question" items="${mcContent.mcQueContents}" varStatus="i">
+				<div class="question-title">
+					<span class="question-index">
+						${i.index+1})
+					</span> 
+					<c:out value="${question.qbQuestion.description}" escapeXml="false"/>
+				</div>
+				
+				<table class="table table-striped table-hover table-condensed">
+					<c:forEach var="qbOption" items="${question.qbQuestion.qbOptions}">
+						<tr>
+							<td>
+								<c:out value="${qbOption.name}" escapeXml="false"/>
+							</td>
+						</tr>
+					</c:forEach>
+				</table>
+			</c:forEach>
+		
+		</lams:SimplePanel>
+	</c:forEach>
+	
+	<c:forEach var="scratchie" items="${scratchieSet}">
+		<c:set var="title">Scratchie: <c:out value="${scratchie.title}"/></c:set>
+		<lams:SimplePanel title="${title}">
+		
+			<c:forEach var="item" items="${scratchie.scratchieItems}" varStatus="i">
+				<div class="question-title">
+					<span class="question-index">
+						${i.index+1})
+					</span> 
+					<c:out value="${item.qbQuestion.description}" escapeXml="false"/>
+				</div>
+				
+				<table class="table table-striped table-hover table-condensed">
+					<c:forEach var="qbOption" items="${item.qbQuestion.qbOptions}">
+						<tr>
+							<td>
+								<c:out value="${qbOption.name}" escapeXml="false"/>
+							</td>
+						</tr>
+					</c:forEach>
+				</table>
+			</c:forEach>
+			
+		</lams:SimplePanel>
+	</c:forEach>
+	
+	<c:forEach var="entry" items="${assessmentMap}">
+		<c:set var="assessment" value="${entry.key}"/>
+		<c:set var="questions" value="${entry.value}"/>
+		
+		<c:set var="title">Assessment: <c:out value="${assessment.title}"/></c:set>
+		<lams:SimplePanel title="${title}">
+		
+			<c:forEach var="question" items="${questions}" varStatus="i">
+				<c:set var="qbQuestion" value="${question.qbQuestion}"/>
+				<div class="question-title">
+					<span class="question-index">
+						${i.index+1})
+					</span> 
+					<c:out value="${qbQuestion.description}" escapeXml="false"/>
+				</div>
+				
+				<table class="table table-striped table-hover table-condensed">
+					<%@ include file="assessmentAnswers.jsp"%>
+				</table>
+			</c:forEach>
+			
+		</lams:SimplePanel>
+	</c:forEach>
+
+	<div id="footer"></div>		
+
+</lams:Page>
+</body>
+</lams:html>
\ No newline at end of file
Index: lams_monitoring/web/assessmentAnswers.jsp
===================================================================
diff -u
--- lams_monitoring/web/assessmentAnswers.jsp	(revision 0)
+++ lams_monitoring/web/assessmentAnswers.jsp	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -0,0 +1,72 @@
+<%@ include file="/taglibs.jsp"%>
+					
+<c:choose>
+	<c:when test="${qbQuestion.type == 1}">
+		<c:forEach var="qbOption" items="${qbQuestion.qbOptions}">
+				
+			<tr>
+				<td>
+					<c:out value="${qbOption.name}" escapeXml="false"/>
+				</td>
+			</tr>
+									
+		</c:forEach>						
+	</c:when>
+	
+	<c:when test="${qbQuestion.type == 2}">
+		
+		<tr>
+			<td>
+	
+				<div>
+					<div style="float: left;">
+						<c:forEach var="qbOption" items="${question.qbOptions}">
+							<div>
+								<c:out value="${qbOption.matchingPair}" escapeXml="false"/>
+							</div>
+						</c:forEach>
+					</div>
+					
+					<div style=" float: right; width: 50%;">
+						<c:forEach var="qbOption" items="${question.qbOptions}">
+							<div>
+								<c:out value="${qbOption.name}" escapeXml="false"/>
+							</div>
+						</c:forEach>							
+					</div>
+				</div>
+					
+			</td>
+		</tr>								
+		
+	</c:when>
+	
+	<c:when test="${(qbQuestion.type == 3) || (qbQuestion.type == 4) || (qbQuestion.type == 6)}">
+	</c:when>
+						
+	<c:when test="${qbQuestion.type == 5}">
+		<tr>
+			<td>
+				true
+			</td>
+		</tr>
+		<tr>
+			<td>
+				false
+			</td>
+		</tr>
+	</c:when>
+						
+	<c:when test="${qbQuestion.type == 7}">
+		<c:forEach var="qbOption" items="${question.qbOptions}">
+						
+			<tr>
+				<td>
+					<c:out value="${qbOption.name}" escapeXml="false"/>
+				</td>
+			</tr>
+			
+		</c:forEach>
+	</c:when>						
+	
+</c:choose>
\ No newline at end of file
Index: lams_tool_assessment/lkc_tool_assessment.eml
===================================================================
diff -u
--- lams_tool_assessment/lkc_tool_assessment.eml	(revision 0)
+++ lams_tool_assessment/lkc_tool_assessment.eml	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component inheritJdk="true">
+	<contentEntry url="file://$MODULE_DIR$"/>
+	<levels>
+		<level name="3rdParty" value="project"/>
+	</levels>
+</component>
\ No newline at end of file
Index: lams_tool_assessment/lkc_tool_assessment.iml
===================================================================
diff -u
--- lams_tool_assessment/lkc_tool_assessment.iml	(revision 0)
+++ lams_tool_assessment/lkc_tool_assessment.iml	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module classpath="eclipse" classpath-dir="$MODULE_DIR$" type="JAVA_MODULE" version="4" />
\ No newline at end of file