Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ExtServerCommonForm.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ExtServerCommonForm.java	(revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ExtServerCommonForm.java	(revision b77e07f34f5d86b1f69b0d10c08ed78b6acdb955)
@@ -0,0 +1,171 @@
+package org.lamsfoundation.lams.admin.web.form;
+
+/**
+ * Superclass for ExtServerForm and LtiConsumerForm, holding LTI consumers' and ExtServers' shared properties.
+ * 
+ * @author Andrey Balan
+ */
+public abstract class ExtServerCommonForm {
+
+    private Integer sid = -1;
+
+    private String serverid;
+
+    private String serverkey;
+
+    private String servername;
+
+    private String serverdesc;
+
+    private String prefix;
+
+    private String lessonFinishUrl;
+    
+    private boolean disabled = false;
+
+    private Boolean learnerPresenceAvailable;
+
+    private Boolean learnerImAvailable;
+
+    private Boolean liveEditEnabled;
+
+    private Boolean enableLessonNotifications;
+
+    /**
+     * Should Learner start the lesson from the beginning each time he enters it.
+     * Content is not removed, LessonProgress is deleted, not archived.
+     */
+    private Boolean forceLearnerRestart;
+
+    /**
+     * Should Learners be allowed to restart the lesson after finishing it.
+     * Content is not removed, LessonProgress is archived and then deleted.
+     */
+    private Boolean allowLearnerRestart;
+
+    /**
+     * Should learners be displayed activity gradebook on lesson complete.
+     */
+    private Boolean gradebookOnComplete;
+
+    public Integer getSid() {
+	return sid;
+    }
+
+    public void setSid(Integer sid) {
+	this.sid = sid;
+    }
+
+    public String getServerid() {
+	return serverid;
+    }
+
+    public void setServerid(String serverid) {
+	this.serverid = serverid;
+    }
+
+    public String getServerkey() {
+	return serverkey;
+    }
+
+    public void setServerkey(String serverkey) {
+	this.serverkey = serverkey;
+    }
+
+    public String getServername() {
+	return servername;
+    }
+
+    public void setServername(String servername) {
+	this.servername = servername;
+    }
+
+    public String getServerdesc() {
+	return serverdesc;
+    }
+
+    public void setServerdesc(String serverdesc) {
+	this.serverdesc = serverdesc;
+    }
+
+    public String getPrefix() {
+	return prefix;
+    }
+
+    public void setPrefix(String prefix) {
+	this.prefix = prefix;
+    }
+
+    public String getLessonFinishUrl() {
+	return lessonFinishUrl;
+    }
+
+    public void setLessonFinishUrl(String lessonFinishUrl) {
+	this.lessonFinishUrl = lessonFinishUrl;
+    }
+
+    public boolean isDisabled() {
+	return disabled;
+    }
+
+    public void setDisabled(boolean disabled) {
+	this.disabled = disabled;
+    }
+
+    public Boolean getLearnerPresenceAvailable() {
+	return learnerPresenceAvailable;
+    }
+
+    public void setLearnerPresenceAvailable(Boolean learnerPresenceAvailable) {
+	this.learnerPresenceAvailable = learnerPresenceAvailable;
+    }
+
+    public Boolean getLearnerImAvailable() {
+	return learnerImAvailable;
+    }
+
+    public void setLearnerImAvailable(Boolean learnerImAvailable) {
+	this.learnerImAvailable = learnerImAvailable;
+    }
+
+    public Boolean getLiveEditEnabled() {
+	return liveEditEnabled;
+    }
+
+    public void setLiveEditEnabled(Boolean liveEditEnabled) {
+	this.liveEditEnabled = liveEditEnabled;
+    }
+
+    public Boolean getEnableLessonNotifications() {
+	return enableLessonNotifications;
+    }
+
+    public void setEnableLessonNotifications(Boolean enableLessonNotifications) {
+	this.enableLessonNotifications = enableLessonNotifications;
+    }
+
+    public Boolean getForceLearnerRestart() {
+	return forceLearnerRestart;
+    }
+
+    public void setForceLearnerRestart(Boolean forceLearnerRestart) {
+	this.forceLearnerRestart = forceLearnerRestart;
+    }
+
+    public Boolean getAllowLearnerRestart() {
+	return allowLearnerRestart;
+    }
+
+    public void setAllowLearnerRestart(Boolean allowLearnerRestart) {
+	this.allowLearnerRestart = allowLearnerRestart;
+    }
+
+    public Boolean getGradebookOnComplete() {
+	return gradebookOnComplete;
+    }
+
+    public void setGradebookOnComplete(Boolean gradebookOnComplete) {
+	this.gradebookOnComplete = gradebookOnComplete;
+    }
+}
+
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ExtServerForm.java
===================================================================
diff -u -r8d8232ae7142c30068360a2a41bbcccc065e775b -rb77e07f34f5d86b1f69b0d10c08ed78b6acdb955
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ExtServerForm.java	(.../ExtServerForm.java)	(revision 8d8232ae7142c30068360a2a41bbcccc065e775b)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ExtServerForm.java	(.../ExtServerForm.java)	(revision b77e07f34f5d86b1f69b0d10c08ed78b6acdb955)
@@ -22,105 +22,19 @@
 
 package org.lamsfoundation.lams.admin.web.form;
 
-public class ExtServerForm {
+/**
+ * Form for managing ExtServers.
+ */
+public class ExtServerForm extends ExtServerCommonForm {
 
-    private Integer sid = -1;
-
-    private String serverid;
-
-    private String serverkey;
-
-    private String servername;
-
-    private String serverdesc;
-
-    private String prefix;
-
     private String userinfoUrl;
 
-    private String lessonFinishUrl;
-
     private String extGroupsUrl;
-
-    private boolean disabled = false;
-
+    
     private boolean timeToLiveLoginRequestEnabled = true;
 
     private Integer timeToLiveLoginRequest = 80;
 
-    private Boolean learnerPresenceAvailable;
-
-    private Boolean learnerImAvailable;
-
-    private Boolean liveEditEnabled;
-
-    private Boolean enableLessonNotifications;
-
-    /**
-     * Should Learner start the lesson from the beginning each time he enters it.
-     * Content is not removed, LessonProgress is deleted, not archived.
-     */
-    private Boolean forceLearnerRestart;
-
-    /**
-     * Should Learners be allowed to restart the lesson after finishing it.
-     * Content is not removed, LessonProgress is archived and then deleted.
-     */
-    private Boolean allowLearnerRestart;
-
-    /**
-     * Should learners be displayed activity gradebook on lesson complete.
-     */
-    private Boolean gradebookOnComplete;
-
-    public Integer getSid() {
-	return sid;
-    }
-
-    public void setSid(Integer sid) {
-	this.sid = sid;
-    }
-
-    public String getServerid() {
-	return serverid;
-    }
-
-    public void setServerid(String serverid) {
-	this.serverid = serverid;
-    }
-
-    public String getServerkey() {
-	return serverkey;
-    }
-
-    public void setServerkey(String serverkey) {
-	this.serverkey = serverkey;
-    }
-
-    public String getServername() {
-	return servername;
-    }
-
-    public void setServername(String servername) {
-	this.servername = servername;
-    }
-
-    public String getServerdesc() {
-	return serverdesc;
-    }
-
-    public void setServerdesc(String serverdesc) {
-	this.serverdesc = serverdesc;
-    }
-
-    public String getPrefix() {
-	return prefix;
-    }
-
-    public void setPrefix(String prefix) {
-	this.prefix = prefix;
-    }
-
     public String getUserinfoUrl() {
 	return userinfoUrl;
     }
@@ -129,14 +43,6 @@
 	this.userinfoUrl = userinfoUrl;
     }
 
-    public String getLessonFinishUrl() {
-	return lessonFinishUrl;
-    }
-
-    public void setLessonFinishUrl(String lessonFinishUrl) {
-	this.lessonFinishUrl = lessonFinishUrl;
-    }
-
     public String getExtGroupsUrl() {
 	return extGroupsUrl;
     }
@@ -145,14 +51,6 @@
 	this.extGroupsUrl = extGroupsUrl;
     }
 
-    public boolean isDisabled() {
-	return disabled;
-    }
-
-    public void setDisabled(boolean disabled) {
-	this.disabled = disabled;
-    }
-
     public boolean isTimeToLiveLoginRequestEnabled() {
 	return timeToLiveLoginRequestEnabled;
     }
@@ -169,59 +67,4 @@
 	this.timeToLiveLoginRequest = timeToLiveLoginRequest;
     }
 
-    public Boolean getLearnerPresenceAvailable() {
-	return learnerPresenceAvailable;
-    }
-
-    public void setLearnerPresenceAvailable(Boolean learnerPresenceAvailable) {
-	this.learnerPresenceAvailable = learnerPresenceAvailable;
-    }
-
-    public Boolean getLearnerImAvailable() {
-	return learnerImAvailable;
-    }
-
-    public void setLearnerImAvailable(Boolean learnerImAvailable) {
-	this.learnerImAvailable = learnerImAvailable;
-    }
-
-    public Boolean getLiveEditEnabled() {
-	return liveEditEnabled;
-    }
-
-    public void setLiveEditEnabled(Boolean liveEditEnabled) {
-	this.liveEditEnabled = liveEditEnabled;
-    }
-
-    public Boolean getEnableLessonNotifications() {
-	return enableLessonNotifications;
-    }
-
-    public void setEnableLessonNotifications(Boolean enableLessonNotifications) {
-	this.enableLessonNotifications = enableLessonNotifications;
-    }
-
-    public Boolean getForceLearnerRestart() {
-	return forceLearnerRestart;
-    }
-
-    public void setForceLearnerRestart(Boolean forceLearnerRestart) {
-	this.forceLearnerRestart = forceLearnerRestart;
-    }
-
-    public Boolean getAllowLearnerRestart() {
-	return allowLearnerRestart;
-    }
-
-    public void setAllowLearnerRestart(Boolean allowLearnerRestart) {
-	this.allowLearnerRestart = allowLearnerRestart;
-    }
-
-    public Boolean getGradebookOnComplete() {
-	return gradebookOnComplete;
-    }
-
-    public void setGradebookOnComplete(Boolean gradebookOnComplete) {
-	this.gradebookOnComplete = gradebookOnComplete;
-    }
 }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/LtiConsumerForm.java
===================================================================
diff -u -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 -rb77e07f34f5d86b1f69b0d10c08ed78b6acdb955
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/LtiConsumerForm.java	(.../LtiConsumerForm.java)	(revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/LtiConsumerForm.java	(.../LtiConsumerForm.java)	(revision b77e07f34f5d86b1f69b0d10c08ed78b6acdb955)
@@ -22,100 +22,15 @@
 
 package org.lamsfoundation.lams.admin.web.form;
 
-public class LtiConsumerForm {
+/**
+ * Form for managing LTI tool consumers (ExtServer instances).
+ * 
+ * @author Andrey Balan
+ */
+public class LtiConsumerForm extends ExtServerCommonForm {
 
-    private Integer sid;
-
-    private String serverid;
-
-    private String serverkey;
-
-    private String servername;
-
-    private String serverdesc;
-
-    private String prefix;
-
-    private boolean disabled = false;
-
-    private String lessonFinishUrl;
-
-    private boolean timeToLiveLoginRequestEnabled = false;
-
     private String ltiToolConsumerMonitorRoles;
 
-    public Integer getSid() {
-	return sid;
-    }
-
-    public void setSid(Integer sid) {
-	this.sid = sid;
-    }
-
-    public String getServerid() {
-	return serverid;
-    }
-
-    public void setServerid(String serverid) {
-	this.serverid = serverid;
-    }
-
-    public String getServerkey() {
-	return serverkey;
-    }
-
-    public void setServerkey(String serverkey) {
-	this.serverkey = serverkey;
-    }
-
-    public String getServername() {
-	return servername;
-    }
-
-    public void setServername(String servername) {
-	this.servername = servername;
-    }
-
-    public String getServerdesc() {
-	return serverdesc;
-    }
-
-    public void setServerdesc(String serverdesc) {
-	this.serverdesc = serverdesc;
-    }
-
-    public String getPrefix() {
-	return prefix;
-    }
-
-    public void setPrefix(String prefix) {
-	this.prefix = prefix;
-    }
-
-    public boolean isDisabled() {
-	return disabled;
-    }
-
-    public void setDisabled(boolean disabled) {
-	this.disabled = disabled;
-    }
-
-    public String getLessonFinishUrl() {
-	return lessonFinishUrl;
-    }
-
-    public void setLessonFinishUrl(String lessonFinishUrl) {
-	this.lessonFinishUrl = lessonFinishUrl;
-    }
-
-    public boolean isTimeToLiveLoginRequestEnabled() {
-	return timeToLiveLoginRequestEnabled;
-    }
-
-    public void setTimeToLiveLoginRequestEnabled(boolean timeToLiveLoginRequestEnabled) {
-	this.timeToLiveLoginRequestEnabled = timeToLiveLoginRequestEnabled;
-    }
-
     public String getLtiToolConsumerMonitorRoles() {
 	return ltiToolConsumerMonitorRoles;
     }