Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r5e39743e8bd500d0e121cf4c95b9c9fc77eb80fc -r154dd0c76d055576f3eadb915647183afef0486c
--- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 5e39743e8bd500d0e121cf4c95b9c9fc77eb80fc)
+++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 154dd0c76d055576f3eadb915647183afef0486c)
@@ -47,6 +47,7 @@
 error.flash.theme.invalid  =Invalid flash theme. {0}
 error.html.theme.invalid  =Invalid html theme. {0}
 error.locale.invalid  =Invalid locale. {0}
+error.login.request.ttl.negative  =Login request's time to live should be a positive number. 
 msg.user.add.to.parent.group  =User/s marked with a '*' will be automatically added to the parent course with the same roles.
 msg.add.to.org  =User will be added to {0}.
 msg.results.none  =No results matched your query.
@@ -152,6 +153,7 @@
 sysadmin.serverdesc  =Description
 sysadmin.prefix  =Prefix
 sysadmin.disabled  =Disabled
+sysadmin.login.request.ttl  =Login Request's time to live
 sysadmin.organisation  =Organisation
 sysadmin.userinfoUrl  =User information URL
 sysadmin.timeoutUrl  =Timeout URL
Index: lams_admin/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -r606581007abbdaee5483777096f32ffac1c3e3eb -r154dd0c76d055576f3eadb915647183afef0486c
--- lams_admin/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
+++ lams_admin/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 154dd0c76d055576f3eadb915647183afef0486c)
@@ -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="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"/>
 	<form-property name="orgName" type="java.lang.String" />
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java
===================================================================
diff -u -r273ac76ea166a02a1e72b10010ac41c545349bd5 -r154dd0c76d055576f3eadb915647183afef0486c
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java	(.../ServerSaveAction.java)	(revision 273ac76ea166a02a1e72b10010ac41c545349bd5)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java	(.../ServerSaveAction.java)	(revision 154dd0c76d055576f3eadb915647183afef0486c)
@@ -60,12 +60,8 @@
  * </p>
  * 
  * @author <a href="mailto:fyang@melcoe.mq.edu.au">Fei Yang</a>
- */
-/**
- * struts doclets
  * 
- * @struts.action path="/serversave" input=".servermaintain"
- *                name="ServerOrgMapForm" scope="request" validate="false"
+ * @struts.action path="/serversave" input=".servermaintain" name="ServerOrgMapForm" scope="request" validate="false"
  * @struts.action-forward name="success" path="/serverlist.do"
  */
 public class ServerSaveAction extends Action {
Index: lams_admin/web/servermaintain.jsp
===================================================================
diff -u -r16cfe3769f94872a900cc625ead3f3ab207eff00 -r154dd0c76d055576f3eadb915647183afef0486c
--- lams_admin/web/servermaintain.jsp	(.../servermaintain.jsp)	(revision 16cfe3769f94872a900cc625ead3f3ab207eff00)
+++ lams_admin/web/servermaintain.jsp	(.../servermaintain.jsp)	(revision 154dd0c76d055576f3eadb915647183afef0486c)
@@ -1,5 +1,8 @@
 <%@ include file="/taglibs.jsp"%>
 
+<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>
+
 <h4>
 	<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a> :
 	<a href="serverlist.do"><fmt:message key="sysadmin.maintain.external.servers" /></a>
@@ -9,7 +12,7 @@
 
 <html:errors/>
 <br />
-<html:form action="serversave.do" method="post">
+<html:form action="serversave.do" styleId="ext-server-form" method="post">
 <html:hidden property="sid" />
 <table>
 	<tr>
@@ -36,15 +39,19 @@
 		<td><fmt:message key="sysadmin.disabled" />:</td>
 		<td><html:checkbox property="disabled" /></td>
 	</tr>
-	<logic:notEqual name="ServerOrgMapForm" property="orgId" value="-1">
 	<tr>
-		<td><fmt:message key="sysadmin.organisation" />:</td>
-		<td>
-			<html:select property="orgId" >
-				<html:options collection="orgs" property="organisationId" labelProperty="name"/> 
-			</html:select> &nbsp; 
-		</td>
-	</tr>
+		<td><fmt:message key="sysadmin.login.request.ttl" />:</td>
+		<td><html:text property="timeToLiveLoginRequest" size="10"/></td>
+	</tr>	
+	<logic:notEqual name="ServerOrgMapForm" property="orgId" value="-1">
+		<tr>
+			<td><fmt:message key="sysadmin.organisation" />:</td>
+			<td>
+				<html:select property="orgId" >
+					<html:options collection="orgs" property="organisationId" labelProperty="name"/> 
+				</html:select> &nbsp; 
+			</td>
+		</tr>
 	</logic:notEqual>
 	<tr>
 		<td><fmt:message key="sysadmin.userinfoUrl" />:</td>
@@ -70,10 +77,40 @@
 </div>
 </html:form>
 <script type="text/javascript" language="javascript">
-<!--
 	function changeStatus(obj){
 		document.forms[0].orgId.disabled = obj.checked;
 		document.forms[0].orgName.disabled = !obj.checked;
 	}
-//->
+	
+	$(document).ready(function(){
+
+		// validate signup form on keyup and submit
+		$("#ext-server-form").validate({
+			rules: {
+				serverid: "required", 
+				serverkey: "required",
+				servername: "required",
+				prefix: "required",
+				userinfoUrl: "required",
+				timeoutUrl: "required",
+				timeToLiveLoginRequest: {
+					required: true,
+					min: 1
+				}
+			},
+			messages: {
+				serverid: "<c:set var="namev"><fmt:message key='sysadmin.serverid' /></c:set><fmt:message key="error.required"><fmt:param>${namev}</fmt:param></fmt:message>",
+				serverkey: "<c:set var="namev"><fmt:message key='sysadmin.serverkey' /></c:set><fmt:message key="error.required"><fmt:param>${namev}</fmt:param></fmt:message>",
+				servername: "<c:set var="namev"><fmt:message key='sysadmin.servername' /></c:set><fmt:message key="error.required"><fmt:param>${namev}</fmt:param></fmt:message>",
+				prefix: "<c:set var="namev"><fmt:message key='sysadmin.prefix' /></c:set><fmt:message key="error.required"><fmt:param>${namev}</fmt:param></fmt:message>",
+				userinfoUrl: "<c:set var="namev"><fmt:message key='sysadmin.userinfoUrl' /></c:set><fmt:message key="error.required"><fmt:param>${namev}</fmt:param></fmt:message>",
+				timeoutUrl: "<c:set var="namev"><fmt:message key='sysadmin.timeoutUrl' /></c:set><fmt:message key="error.required"><fmt:param>${namev}</fmt:param></fmt:message>",
+				timeoutUrl: "<c:set var="namev"><fmt:message key='sysadmin.timeoutUrl' /></c:set><fmt:message key="error.required"><fmt:param>${namev}</fmt:param></fmt:message>",
+				timeToLiveLoginRequest: {
+					required: "<c:set var="namev"><fmt:message key='sysadmin.login.request.ttl' /></c:set><fmt:message key="error.required"><fmt:param>${namev}</fmt:param></fmt:message>",
+					min: "<fmt:message key="error.login.request.ttl.negative" />"
+				}
+			}
+		});
+	});
 </script>