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.102 -r1.103
--- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	22 Sep 2016 10:42:00 -0000	1.102
+++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	25 Nov 2016 15:25:17 -0000	1.103
@@ -525,6 +525,7 @@
 label.edit.tool.consumer  =Edit tool consumer details
 label.add.tool.consumer  =Add new tool consumer
 sysadmin.serversecret  =Secret
+sysadmin.lti.consumer.monitor.roles  =Comma-separated list of monitor roles
 label.tool.consumers.count  =LTI Tool Consumers(s) in total
 
 #======= End labels: Exported 515 labels for en AU =====
Index: lams_admin/conf/xdoclet/struts-forms.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/xdoclet/struts-forms.xml,v
diff -u -r1.50 -r1.51
--- lams_admin/conf/xdoclet/struts-forms.xml	22 Sep 2016 14:39:13 -0000	1.50
+++ lams_admin/conf/xdoclet/struts-forms.xml	25 Nov 2016 15:25:17 -0000	1.51
@@ -93,6 +93,7 @@
 	<form-property name="disabled" type="java.lang.Boolean" initial="false"/>
 	<form-property name="lessonFinishUrl" type="java.lang.String"/>
 	<form-property name="timeToLiveLoginRequestEnabled" type="java.lang.Boolean" initial="false"/>
+	<form-property name="ltiToolConsumerMonitorRoles" type="java.lang.String"/>
 </form-bean>
 
 <form-bean name="ConfigForm" type="org.apache.struts.action.DynaActionForm">
Index: lams_admin/web/lti/ltiConsumer.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/lti/ltiConsumer.jsp,v
diff -u -r1.1 -r1.2
--- lams_admin/web/lti/ltiConsumer.jsp	22 Sep 2016 10:42:00 -0000	1.1
+++ lams_admin/web/lti/ltiConsumer.jsp	25 Nov 2016 15:25:17 -0000	1.2
@@ -88,6 +88,10 @@
 			<td><fmt:message key="sysadmin.lessonFinishUrl" />:</td>
 			<td>${lessonFinishUrl}</td>
 		</tr>
+		<tr>
+			<td><fmt:message key="sysadmin.lti.consumer.monitor.roles" />:</td>
+			<td><html:text property="ltiToolConsumerMonitorRoles" size="30"/></td>
+		</tr>
 	</table>
 	
 	<div align="center">
Index: lams_build/lib/lams/lams.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v
diff -u -r1.503 -r1.504
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java,v
diff -u -r1.2 -r1.3
--- lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java	23 Sep 2016 04:25:14 -0000	1.2
+++ lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java	25 Nov 2016 15:25:33 -0000	1.3
@@ -124,14 +124,15 @@
 	}
 	ExtServerLessonMap lesson = integrationService.getLtiConsumerLesson(consumerKey, resourceLinkId);
 
-	//determine method based on role parameter
+	//Determine method based on role parameter. Monitor roles can be either LTI standard ones or tool consumer's custom ones set on a sysadmin page  
 	String method;
-	if (LtiUtils.isLearner(roles) && !LtiUtils.isStaff(roles) && !LtiUtils.isAdmin(roles)) {
-	    method = LoginRequestDispatcher.METHOD_LEARNER_STRICT_AUTHENTICATION;
-	} else if (lesson == null) {
-	    method = LoginRequestDispatcher.METHOD_AUTHOR;
+	boolean isCustomMonitorRole = LtiUtils.isToolConsumerCustomRole(roles,
+		extServer.getLtiToolConsumerMonitorRoles());
+	if (LtiUtils.isStaff(roles) || LtiUtils.isAdmin(roles) || isCustomMonitorRole) {
+	    method = (lesson == null) ? LoginRequestDispatcher.METHOD_AUTHOR : LoginRequestDispatcher.METHOD_MONITOR;
+
 	} else {
-	    method = LoginRequestDispatcher.METHOD_MONITOR;
+	    method = LoginRequestDispatcher.METHOD_LEARNER_STRICT_AUTHENTICATION;
 	}
 	
 	//provide empty lessonId in case of learner accesses LTI link before teacher authored it
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServer.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServer.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServer.hbm.xml	22 Sep 2016 14:39:27 -0000	1.1
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServer.hbm.xml	25 Nov 2016 15:25:15 -0000	1.2
@@ -161,6 +161,16 @@
             insert="true"
             column="time_to_live_login_request"
         />
+        
+        <property
+            name="ltiToolConsumerMonitorRoles"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="lti_consumer_monitor_roles"
+            length="65535"
+            not-null="false"
+        />
 
         <set
             name="extCourseClassMaps"
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040076.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040076.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040076.sql	25 Nov 2016 15:25:15 -0000	1.1
@@ -0,0 +1,8 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+-- LDEV-4096 Add role management feature for LTI tool consumers
+ALTER TABLE lams_ext_server_org_map ADD COLUMN lti_consumer_monitor_roles text DEFAULT NULL;
+
+COMMIT;
+SET AUTOCOMMIT = 1;
Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtServer.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/ExtServer.java,v
diff -u -r1.1 -r1.2
--- lams_common/src/java/org/lamsfoundation/lams/integration/ExtServer.java	22 Sep 2016 14:39:27 -0000	1.1
+++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtServer.java	25 Nov 2016 15:25:15 -0000	1.2
@@ -66,6 +66,11 @@
 
     /** persistent field */
     private Set extUserUseridMaps;
+    
+    /**
+     * Comma-separated list of roles that LTI tool consumer uses to indicate user monitor role
+     */
+    private String ltiToolConsumerMonitorRoles;
 
     /** default constructor */
     public ExtServer() {
@@ -212,7 +217,15 @@
     public void setExtUserUseridMaps(Set extUserUseridMaps) {
 	this.extUserUseridMaps = extUserUseridMaps;
     }
+    
+    public String getLtiToolConsumerMonitorRoles() {
+	return this.ltiToolConsumerMonitorRoles;
+    }
 
+    public void setLtiToolConsumerMonitorRoles(String ltiToolConsumerMonitorRoles) {
+	this.ltiToolConsumerMonitorRoles = ltiToolConsumerMonitorRoles;
+    }    
+
     @Override
     public String toString() {
 	return new ToStringBuilder(this).append("sid", getSid()).append("serverid", getServerid())
Index: lams_common/src/java/org/lamsfoundation/lams/integration/util/LtiUtils.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/util/LtiUtils.java,v
diff -u -r1.1 -r1.2
--- lams_common/src/java/org/lamsfoundation/lams/integration/util/LtiUtils.java	22 Sep 2016 11:09:57 -0000	1.1
+++ lams_common/src/java/org/lamsfoundation/lams/integration/util/LtiUtils.java	25 Nov 2016 15:25:15 -0000	1.2
@@ -1,5 +1,6 @@
 package org.lamsfoundation.lams.integration.util;
 
+import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -37,6 +38,15 @@
 	
 	return hasRole(roles, rolesToSearchFor);
     }
+    
+    public static boolean isToolConsumerCustomRole(String roles, String toolConsumerCustomRoles) {
+	if (roles == null || toolConsumerCustomRoles == null) {
+	    return false;
+	}
+	
+	List<String> rolesToSearchFor = Arrays.asList(toolConsumerCustomRoles.split(","));
+	return hasRole(roles, rolesToSearchFor);
+    }
 
     /**
      * Return <code>true</code> if the user is a learner.