Index: lams_bb_integration/RELEASE_NOTES.TXT
===================================================================
RCS file: /usr/local/cvsroot/lams_bb_integration/RELEASE_NOTES.TXT,v
diff -u -r1.15 -r1.16
--- lams_bb_integration/RELEASE_NOTES.TXT	11 Mar 2015 17:33:54 -0000	1.15
+++ lams_bb_integration/RELEASE_NOTES.TXT	5 May 2015 17:11:26 -0000	1.16
@@ -78,3 +78,6 @@
 ===================
 * LDEV-3446: Join users to the lesson after it was created on a BB side
 
+1.2.10 Release Fixes
+===================
+* LDEV-3473: Start supporting "Course builder" user role
Index: lams_bb_integration/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_bb_integration/build.xml,v
diff -u -r1.16 -r1.17
--- lams_bb_integration/build.xml	11 Mar 2015 17:33:54 -0000	1.16
+++ lams_bb_integration/build.xml	5 May 2015 17:11:26 -0000	1.17
@@ -2,7 +2,7 @@
 <project default="package" name="LAMS/Blackboard Plugin" basedir="./">
 	<property name="project" value="BlackboardPlugin"/>
 	<property name="product" value="lams2-bb-plugin"/>
-	<property name="version" value="1.2.9"/>
+	<property name="version" value="1.2.10"/>
 
 	<property name="build" value="${basedir}/build"/>
 	<property name="build.classes" value="${build}/classes"/>
Index: lams_bb_integration/WEB-INF/bb-manifest.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_bb_integration/WEB-INF/bb-manifest.xml,v
diff -u -r1.21 -r1.22
--- lams_bb_integration/WEB-INF/bb-manifest.xml	11 Mar 2015 17:33:54 -0000	1.21
+++ lams_bb_integration/WEB-INF/bb-manifest.xml	5 May 2015 17:11:26 -0000	1.22
@@ -5,7 +5,7 @@
     <name value= "LAMS Integration Module"/>
     <handle value= "lamscontent"/>
     <description value= "LAMS and Blackboard integration allows LAMS leaning designs to be managed and views in a Blackboard Environment."/>
-    <version value= "1.2.9"/>
+    <version value= "1.2.10"/>
     <requires>
       <bbversion value="9.1.0"/>
     </requires>
Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/Attic/LamsSecurityUtil.java,v
diff -u -r1.26 -r1.27
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java	11 Mar 2015 17:33:54 -0000	1.26
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java	5 May 2015 17:11:26 -0000	1.27
@@ -413,6 +413,9 @@
 	    BbList<CourseMembership> teachingAssistantCourseMemberships = courseMemLoader.loadByCourseIdAndRole(courseId,
 		    CourseMembership.Role.TEACHING_ASSISTANT, null, true);
 	    monitorCourseMemberships.addAll(teachingAssistantCourseMemberships);
+	    BbList<CourseMembership> courseBuilderCourseMemberships = courseMemLoader.loadByCourseIdAndRole(courseId,
+		    CourseMembership.Role.COURSE_BUILDER, null, true);
+	    monitorCourseMemberships.addAll(courseBuilderCourseMemberships);
 	    for (CourseMembership courseMembership : monitorCourseMemberships) {
 		monitorIds += URLEncoder.encode(courseMembership.getUser().getUserName(), "utf8") + ",";
 
Index: lams_bb_integration/web/modules/learnermonitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_bb_integration/web/modules/learnermonitor.jsp,v
diff -u -r1.21 -r1.22
--- lams_bb_integration/web/modules/learnermonitor.jsp	4 May 2015 21:35:15 -0000	1.21
+++ lams_bb_integration/web/modules/learnermonitor.jsp	5 May 2015 17:11:26 -0000	1.22
@@ -103,8 +103,10 @@
 
     // Is the User an Instructor of Teaching Assistant
     boolean instructorstr=false;
-    if (CourseMembership.Role.INSTRUCTOR.equals(courseRole)||CourseMembership.Role.TEACHING_ASSISTANT.equals(courseRole)) {
+    if (CourseMembership.Role.INSTRUCTOR.equals(courseRole) || CourseMembership.Role.TEACHING_ASSISTANT.equals(courseRole)
+	    	|| CourseMembership.Role.COURSE_BUILDER.equals(courseRole)) {
         instructorstr=true;
+        
     } else if (!CourseMembership.Role.STUDENT.equals(courseRole)) {
         // The user is not an Instructor, Teaching Assistant or Student - Access Denied 
         response.sendRedirect("notAllowed.jsp");
Index: lams_bb_integration/web/modules/openLearner.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_bb_integration/web/modules/Attic/openLearner.jsp,v
diff -u -r1.1 -r1.2
--- lams_bb_integration/web/modules/openLearner.jsp	5 Dec 2014 22:33:50 -0000	1.1
+++ lams_bb_integration/web/modules/openLearner.jsp	5 May 2015 17:11:26 -0000	1.2
@@ -55,7 +55,7 @@
 	
 	// if the user is not an Instructor, Teaching Assistant or Student - Access Denied 
 	if (!(courseRole.equals(CourseMembership.Role.INSTRUCTOR) || courseRole.equals(CourseMembership.Role.TEACHING_ASSISTANT) 
-		|| courseRole.equals(CourseMembership.Role.STUDENT))) {
+		||courseRole.equals(CourseMembership.Role.COURSE_BUILDER) || courseRole.equals(CourseMembership.Role.STUDENT))) {
 	    response.sendRedirect("notAllowed.jsp");
 	}
 
Index: lams_bb_integration/web/modules/openMonitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_bb_integration/web/modules/Attic/openMonitor.jsp,v
diff -u -r1.1 -r1.2
--- lams_bb_integration/web/modules/openMonitor.jsp	5 Dec 2014 22:33:50 -0000	1.1
+++ lams_bb_integration/web/modules/openMonitor.jsp	5 May 2015 17:11:26 -0000	1.2
@@ -54,7 +54,8 @@
 	}
 	
 	// if the user is not an Instructor or Teaching Assistant - Access Denied 
-	if (!(courseRole.equals(CourseMembership.Role.INSTRUCTOR) || courseRole.equals(CourseMembership.Role.TEACHING_ASSISTANT))) {
+	if (!(courseRole.equals(CourseMembership.Role.INSTRUCTOR) || courseRole.equals(CourseMembership.Role.TEACHING_ASSISTANT)
+		|| courseRole.equals(CourseMembership.Role.COURSE_BUILDER))) {
 	    response.sendRedirect("notAllowed.jsp");
 	}