Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.94 -r1.95
--- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	25 Nov 2014 23:27:50 -0000	1.94
+++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	1 Dec 2014 23:10:29 -0000	1.95
@@ -154,6 +154,7 @@
 sysadmin.prefix  =Prefix
 sysadmin.disabled  =Disabled
 sysadmin.login.request.ttl  =Login Request's time to live
+sysadmin.login.request.ttl.enable  =Enforce time limitation
 sysadmin.organisation  =Organisation
 sysadmin.userinfoUrl  =User information URL
 sysadmin.timeoutUrl  =Timeout URL
Index: lams_admin/conf/xdoclet/struts-forms.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/xdoclet/struts-forms.xml,v
diff -u -r1.44 -r1.45
--- lams_admin/conf/xdoclet/struts-forms.xml	25 Nov 2014 23:27:50 -0000	1.44
+++ lams_admin/conf/xdoclet/struts-forms.xml	1 Dec 2014 23:10:29 -0000	1.45
@@ -82,6 +82,7 @@
 	<form-property name="timeoutUrl" type="java.lang.String" initial="http://dummy.url/not.implemented"/>
 	<form-property name="lessonFinishUrl" type="java.lang.String"/>
 	<form-property name="disabled" type="java.lang.Boolean" initial="false"/>
+	<form-property name="timeToLiveLoginRequestEnabled" type="java.lang.Boolean" initial="true"/>
 	<form-property name="timeToLiveLoginRequest" type="java.lang.Integer" initial="80"/>
 	<form-property name="orgId" type="java.lang.Integer" initial="-1"/>
 	<form-property name="newOrg" type="java.lang.Boolean" initial="false"/>
Index: lams_admin/web/servermaintain.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/servermaintain.jsp,v
diff -u -r1.13 -r1.14
--- lams_admin/web/servermaintain.jsp	25 Nov 2014 23:27:50 -0000	1.13
+++ lams_admin/web/servermaintain.jsp	1 Dec 2014 23:10:29 -0000	1.14
@@ -1,4 +1,9 @@
 <%@ include file="/taglibs.jsp"%>
+<style media="screen,projection" type="text/css">
+	table td {
+  		padding-bottom: 7px;
+	}
+</style>
 
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
@@ -13,7 +18,9 @@
 <html:errors/>
 <br />
 <html:form action="serversave.do" styleId="ext-server-form" method="post">
-<html:hidden property="sid" />
+	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+	<html:hidden property="sid" />
+	
 <table>
 	<tr>
 		<td><fmt:message key="sysadmin.serverid" />:</td>
@@ -35,14 +42,26 @@
 		<td><fmt:message key="sysadmin.prefix" />:</td>
 		<td><html:text property="prefix" size="10"/> *</td>
 	</tr>
+	
 	<tr>
 		<td><fmt:message key="sysadmin.disabled" />:</td>
 		<td><html:checkbox property="disabled" /></td>
 	</tr>
+	
 	<tr>
+		<td><fmt:message key="sysadmin.login.request.ttl.enable" />:</td>
+		<td>
+			<html:checkbox property="timeToLiveLoginRequestEnabled" styleId="ttl-login-request-enabled"/>
+			<!-- to overcome nasty DynaActionForm bug (http://www.coderanch.com/t/46408/Struts/DynaValidatorActionForm-checkboxes) -->
+			<input type="hidden" name="timeToLiveLoginRequestEnabled" value="false">
+		</td>
+	</tr>
+	
+	<tr id="ttl-login-request-wrap" <c:if test="${!formBean.map.timeToLiveLoginRequestEnabled}">style="display:none;"</c:if>>
 		<td><fmt:message key="sysadmin.login.request.ttl" />:</td>
-		<td><html:text property="timeToLiveLoginRequest" size="10"/></td>
-	</tr>	
+		<td><html:text property="timeToLiveLoginRequest" size="10" styleId="ttl-login-request"/></td>
+	</tr>
+	
 	<logic:notEqual name="ServerOrgMapForm" property="orgId" value="-1">
 		<tr>
 			<td><fmt:message key="sysadmin.organisation" />:</td>
@@ -72,8 +91,8 @@
 </table>
 <div align="center">
 	<html:submit property="submitbutton" styleClass="button"><fmt:message key="admin.save" /></html:submit>
-	<html:reset styleClass="button"><fmt:message key="admin.reset" /></html:reset>
-	<html:cancel styleClass="button"><fmt:message key="admin.cancel" /></html:cancel>
+	<html:reset styleClass="button cancel"><fmt:message key="admin.reset" /></html:reset>
+	<html:cancel styleClass="button cancel"><fmt:message key="admin.cancel" /></html:cancel>
 </div>
 </html:form>
 <script type="text/javascript" language="javascript">
@@ -83,9 +102,15 @@
 	}
 	
 	$(document).ready(function(){
+		$("#ttl-login-request-enabled").click(function(){
+			$('#ttl-login-request-wrap').toggle('slow');
+			if ($("#ttl-login-request-enabled").is(':checked')) {
+				$('#ttl-login-request').prop("value", 80);
+			}
+		});
 
 		// validate signup form on keyup and submit
-		$("#ext-server-form").validate({
+		var validator = $("#ext-server-form").validate({
 			rules: {
 				serverid: "required", 
 				serverkey: "required",
Index: lams_build/liblist.txt
===================================================================
RCS file: /usr/local/cvsroot/lams_build/liblist.txt,v
diff -u -r1.25 -r1.26
--- lams_build/liblist.txt	26 Jun 2014 14:56:29 -0000	1.25
+++ lams_build/liblist.txt	1 Dec 2014 23:10:46 -0000	1.26
@@ -29,7 +29,7 @@
 flagstone		  transform.jar												   BSD							 Flagstone Software Ltd.		  reading and writing Flash 
 				  translate.jar
 
-jakarta-commons   commons-beanutils.jar                 1.6                    Apache License 2.0            Apache Software Foundation       Jakarta Commons Beanutils
+jakarta-commons   commons-beanutils.jar                 1.9.2                  Apache License 2.0            Apache Software Foundation       Jakarta Commons Beanutils
                   commons-codec-1.3.jar                 1.3                    Apache License 2.0            Apache Software Foundation       Jakarta Commons Codec
                   commons-collections.jar               3.1                    Apache License 2.0            Apache Software Foundation       Commons Collections
                   commons-digester.jar                  1.6                    Apache License 2.0            Apache Software Foundation       Jakarta Commons Digester
Index: lams_build/lib/jakarta-commons/commons-beanutils.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/jakarta-commons/commons-beanutils.jar,v
diff -u -r1.3 -r1.4
Binary files differ
Index: lams_build/lib/lams/lams.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v
diff -u -r1.435 -r1.436
Binary files differ
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/Attic/ExtServerOrgMap.hbm.xml,v
diff -u -r1.7 -r1.8
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	25 Nov 2014 23:33:51 -0000	1.7
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	1 Dec 2014 23:10:31 -0000	1.8
@@ -126,6 +126,16 @@
             not-null="true"
         />
         
+        <property
+            name="timeToLiveLoginRequestEnabled"
+            type="java.lang.Boolean"
+            update="true"
+            insert="true"
+            column="time_to_live_login_request_enabled"
+            length="1"
+            not-null="true"            
+        />
+        
 		<property
             name="timeToLiveLoginRequest"
             type="int"
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040036.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040036.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040036.sql	1 Dec 2014 23:10:31 -0000	1.1
@@ -0,0 +1,9 @@
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS = 0;
+
+--  LDEV-3382: Add datetime parameter check to LoginRequest
+ALTER TABLE lams_ext_server_org_map ADD COLUMN time_to_live_login_request_enabled TINYINT(1) NOT NULL DEFAULT 1;
+
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerOrgMap.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/Attic/ExtServerOrgMap.java,v
diff -u -r1.7 -r1.8
--- lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerOrgMap.java	25 Nov 2014 23:33:51 -0000	1.7
+++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerOrgMap.java	1 Dec 2014 23:10:31 -0000	1.8
@@ -42,6 +42,8 @@
     /** persistent field */
     private Boolean disabled;
     
+    private Boolean timeToLiveLoginRequestEnabled;
+    
     /** persistent field */
     private int timeToLiveLoginRequest;
 
@@ -147,6 +149,14 @@
 	this.disabled = disabled;
     }
     
+    public Boolean getTimeToLiveLoginRequestEnabled() {
+	return this.timeToLiveLoginRequestEnabled;
+    }
+
+    public void setTimeToLiveLoginRequestEnabled(Boolean timeToLiveLoginRequestEnabled) {
+	this.timeToLiveLoginRequestEnabled = timeToLiveLoginRequestEnabled;
+    }
+    
     /**
      * Measured in minutes.
      * 
Index: lams_common/src/java/org/lamsfoundation/lams/integration/security/Authenticator.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/security/Authenticator.java,v
diff -u -r1.6 -r1.7
--- lams_common/src/java/org/lamsfoundation/lams/integration/security/Authenticator.java	25 Nov 2014 23:33:51 -0000	1.6
+++ lams_common/src/java/org/lamsfoundation/lams/integration/security/Authenticator.java	1 Dec 2014 23:10:31 -0000	1.7
@@ -84,25 +84,27 @@
 	if (map.getDisabled()) {
 	    throw new AuthenticationException("The third party server is disabled");
 	}
+	
+	// check if there is datetime check and if so if it isn't too old
+	if (map.getTimeToLiveLoginRequestEnabled()) {
+	    long datetimeParam;
+	    try {
+		datetimeParam = Long.parseLong(datetime);
+	    } catch (NumberFormatException e) {
+		throw new AuthenticationException(
+			"The third party server provided wrong format of datetime, datetime = " + datetime, e);
+	    }
 
-	// check if datetime parameter is not too old
-	long datetimeParam;
-	try {
-	    datetimeParam = Long.parseLong(datetime);
-	} catch (NumberFormatException e) {
-	    throw new AuthenticationException("The third party server provided wrong format of datetime, datetime = "
-		    + datetime, e);
+	    int timeToLiveLoginRequest = map.getTimeToLiveLoginRequest();
+	    // sum up request time and maximum allowed request's time to live
+	    Date requestTimePlusTimeToLive = new Date(datetimeParam + timeToLiveLoginRequest * 60 * 1000);
+	    Date now = new Date();
+	    if (requestTimePlusTimeToLive.before(now)) {
+		throw new AuthenticationException("Login Request can't be older than " + timeToLiveLoginRequest
+			+ "minutes. Request time is: " + new Date(datetimeParam));
+	    }
 	}
 
-	int timeToLiveLoginRequest = map.getTimeToLiveLoginRequest();
-	//sum up request time and maximum allowed request's time to live
-	Date requestTimePlusTimeToLive = new Date(datetimeParam + timeToLiveLoginRequest * 60 * 1000);
-	Date now = new Date();
-	if (requestTimePlusTimeToLive.before(now)) {
-	    throw new AuthenticationException("Login Request can't be older than " + timeToLiveLoginRequest
-		    + "minutes. Request time is: " + new Date(datetimeParam));
-	}
-
 	//learnerStrictAuth hash [ts + uid + method + lsid + serverID + serverKey]
 	//otherwise [ts + uid + method + serverID + serverKey]
 	String plaintext = (lsid == null) ? datetime.toLowerCase().trim() + username.toLowerCase().trim()