Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java
===================================================================
diff -u -r11b64f81e406ff277c7c35988304b0064300de57 -r953f62a7fc515e2dc5c4ad983df233070cf7a82c
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java	(.../ServerSaveAction.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java	(.../ServerSaveAction.java)	(revision 953f62a7fc515e2dc5c4ad983df233070cf7a82c)
@@ -70,7 +70,7 @@
 
 	DynaActionForm extServerForm = (DynaActionForm) form;
 	ActionMessages errors = new ActionMessages();
-	String[] requiredFields = { "serverid", "serverkey", "servername", "prefix", "userinfoUrl", "timeoutUrl" };
+	String[] requiredFields = { "serverid", "serverkey", "servername", "prefix", "userinfoUrl" };
 	for (String requiredField : requiredFields) {
 	    if (StringUtils.trimToNull(extServerForm.getString(requiredField)) == null) {
 		errors.add(requiredField,
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LtiConsumerManagementAction.java
===================================================================
diff -u -r11b64f81e406ff277c7c35988304b0064300de57 -r953f62a7fc515e2dc5c4ad983df233070cf7a82c
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LtiConsumerManagementAction.java	(.../LtiConsumerManagementAction.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LtiConsumerManagementAction.java	(.../LtiConsumerManagementAction.java)	(revision 953f62a7fc515e2dc5c4ad983df233070cf7a82c)
@@ -171,7 +171,6 @@
 		ltiConsumer.setSid(null);
 		ltiConsumer.setServerTypeId(ExtServer.LTI_CONSUMER_SERVER_TYPE);
 		ltiConsumer.setUserinfoUrl("blank");
-		ltiConsumer.setTimeoutUrl("blank");
 	    } else {
 		ltiConsumer = integrationService.getExtServer(sid);
 		BeanUtils.copyProperties(ltiConsumer, extServerForm);
Index: lams_admin/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r2062745d4734a2543b83d689762d932d7dcbc0db -r953f62a7fc515e2dc5c4ad983df233070cf7a82c
--- lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 2062745d4734a2543b83d689762d932d7dcbc0db)
+++ lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 953f62a7fc515e2dc5c4ad983df233070cf7a82c)
@@ -104,8 +104,6 @@
 	<form-property name="serverdesc" type="java.lang.String" />
 	<form-property name="prefix" type="java.lang.String"/>
 	<form-property name="userinfoUrl" type="java.lang.String" />
-	<form-property name="serverUrl" type="java.lang.String" />
-	<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="extGroupsUrl" type="java.lang.String"/>
 	<form-property name="disabled" type="java.lang.Boolean" initial="false"/>
Index: lams_admin/web/servermaintain.jsp
===================================================================
diff -u -r11b64f81e406ff277c7c35988304b0064300de57 -r953f62a7fc515e2dc5c4ad983df233070cf7a82c
--- lams_admin/web/servermaintain.jsp	(.../servermaintain.jsp)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
+++ lams_admin/web/servermaintain.jsp	(.../servermaintain.jsp)	(revision 953f62a7fc515e2dc5c4ad983df233070cf7a82c)
@@ -56,14 +56,6 @@
 		<td><html:text property="userinfoUrl" size="70" styleClass="form-control"/></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="sysadmin.serverUrl" /></td>
-		<td><html:text property="serverUrl" size="70" styleClass="form-control"/></td>
-	</tr>
-	<tr>
-		<td><fmt:message key="sysadmin.timeoutUrl" />&nbsp;*</td>
-		<td><html:text property="timeoutUrl" size="70" styleClass="form-control"/></td>
-	</tr>
-	<tr>
 		<td><fmt:message key="sysadmin.lessonFinishUrl" /></td>
 		<td><html:text property="lessonFinishUrl" size="70" styleClass="form-control"/></td>
 	</tr>
@@ -98,7 +90,6 @@
 				servername: "required",
 				prefix: "required",
 				userinfoUrl: "required",
-				timeoutUrl: "required",
 				timeToLiveLoginRequest: {
 					required: true,
 					min: 1
@@ -110,7 +101,6 @@
 				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>",
 				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" />"
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r4340b53d8412d3838eb7400ddfc821018234a1e9 -r953f62a7fc515e2dc5c4ad983df233070cf7a82c
Binary files differ
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml
===================================================================
diff -u -r380ede712d98f28edcaea21f3525f12cc52b3237 -r953f62a7fc515e2dc5c4ad983df233070cf7a82c
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	(.../ExtServerOrgMap.hbm.xml)	(revision 380ede712d98f28edcaea21f3525f12cc52b3237)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	(.../ExtServerOrgMap.hbm.xml)	(revision 953f62a7fc515e2dc5c4ad983df233070cf7a82c)
@@ -95,26 +95,6 @@
         />
 
         <property
-            name="serverUrl"
-            type="java.lang.String"
-            update="true"
-            insert="true"
-            column="server_url"
-            length="255"
-            not-null="false"
-        />
-
-        <property
-            name="timeoutUrl"
-            type="java.lang.String"
-            update="true"
-            insert="true"
-            column="timeout_url"
-            length="65535"
-            not-null="true"
-        />
-
-        <property
             name="lessonFinishUrl"
             type="java.lang.String"
             update="true"
Fisheye: Tag 5df0d44b0e94fca808f5d4f70fc01c0c428c3dfe refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040085.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtServer.java
===================================================================
diff -u -r380ede712d98f28edcaea21f3525f12cc52b3237 -r953f62a7fc515e2dc5c4ad983df233070cf7a82c
--- lams_common/src/java/org/lamsfoundation/lams/integration/ExtServer.java	(.../ExtServer.java)	(revision 380ede712d98f28edcaea21f3525f12cc52b3237)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtServer.java	(.../ExtServer.java)	(revision 953f62a7fc515e2dc5c4ad983df233070cf7a82c)
@@ -42,12 +42,6 @@
     private String userinfoUrl;
 
     /** persistent field */
-    private String serverUrl;
-
-    /** persistent field */
-    private String timeoutUrl;
-
-    /** persistent field */
     private String lessonFinishUrl;
 
     private String extGroupsUrl;
@@ -140,22 +134,6 @@
 	this.userinfoUrl = userinfoUrl;
     }
 
-    public String getServerUrl() {
-	return this.serverUrl;
-    }
-
-    public void setServerUrl(String serverUrl) {
-	this.serverUrl = serverUrl;
-    }
-
-    public String getTimeoutUrl() {
-	return this.timeoutUrl;
-    }
-
-    public void setTimeoutUrl(String timeoutUrl) {
-	this.timeoutUrl = timeoutUrl;
-    }
-
     public String getLessonFinishUrl() {
 	return this.lessonFinishUrl;
     }