Index: lams_central/.classpath
===================================================================
RCS file: /usr/local/cvsroot/lams_central/.classpath,v
diff -u -r1.20.2.22 -r1.20.2.23
--- lams_central/.classpath	30 Mar 2016 12:40:31 -0000	1.20.2.22
+++ lams_central/.classpath	27 Sep 2016 06:23:55 -0000	1.20.2.23
@@ -33,6 +33,8 @@
 			<attribute name="javadoc_location" value="http://commons.apache.org/proper/commons-lang/javadocs/api-2.6/"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/httpcomponents/main/httpclient-4.2.1.jar"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/httpcomponents/main/httpcore-4.2.1.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_gradebook"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/codec/main/commons-codec-1.9.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/io/undertow/servlet/main/undertow-servlet-1.1.8.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/undertow"/>
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.111.2.10 -r1.111.2.11
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	26 Aug 2016 15:02:59 -0000	1.111.2.10
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	27 Sep 2016 06:22:58 -0000	1.111.2.11
@@ -674,4 +674,19 @@
 label.your.new.shared.secret  =Your new shared secret: {0}
 label.2FA.shared.secret  =Two-factor authorization shared secret
 
+label.create.lesson  =Create Lesson
+label.organisations  =Select course with the lessons that needs to be export
+label.lesson.id  =Lesson ID
+label.display.design.image =Display sequence image?
+label.select.sequence  =You must select a sequence before proceeding
+label.choose.sequence  =Choose Lams sequence
+label.author.sequence  =Author new LAMS lessons
+label.open.monitor  =Open Monitor
+label.your.progress  =Your Lesson Progress
+label.you.completed.this.lesson  =You have completed this lesson.
+label.total.activities.depend.on.path  =Total activities depend on your learning path.
+label.lesson.not.completed  =Lesson is not yet completed.
+label.you.completed.activities  =You have completed {0} activities
+
+
 #======= End labels: Exported 439 labels for en AU =====
\ No newline at end of file
Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java,v
diff -u -r1.60.2.26 -r1.60.2.27
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	28 Jul 2016 03:44:15 -0000	1.60.2.26
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	27 Sep 2016 06:22:57 -0000	1.60.2.27
@@ -177,10 +177,6 @@
 		return mapping.findForward("lessonIntro");
 	    }
 
-	    if (lesson.getForceLearnerRestart()) {
-		// start the lesson from the beginning each time
-		getLessonService().removeLearnerProgress(lessonId, user.getUserID());
-	    }
 
 	    if (mode != null) {
 		req.setAttribute(AttributeNames.PARAM_MODE, mode);
Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java,v
diff -u -r1.48.2.19 -r1.48.2.20
--- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java	5 Aug 2016 11:49:45 -0000	1.48.2.19
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java	27 Sep 2016 06:22:58 -0000	1.48.2.20
@@ -360,28 +360,28 @@
 	doGet(request, response);
     }
 
-    private Long startLesson(String serverId, String datetime, String hashValue, String username, long ldId,
+    private static Long startLesson(String serverId, String datetime, String hashValue, String username, long ldId,
 	    String courseId, String title, String desc, String countryIsoCode, String langIsoCode, String customCSV,
 	    boolean presenceEnable, boolean imEnable, boolean enableNotifications) throws RemoteException {
 	try {
-	    ExtServerOrgMap serverMap = LessonManagerServlet.integrationService.getExtServerOrgMap(serverId);
+	    ExtServerOrgMap serverMap = integrationService.getExtServerOrgMap(serverId);
 	    Authenticator.authenticate(serverMap, datetime, username, hashValue);
-	    ExtUserUseridMap userMap = LessonManagerServlet.integrationService.getExtUserUseridMap(serverMap, username);
-	    ExtCourseClassMap orgMap = LessonManagerServlet.integrationService.getExtCourseClassMap(serverMap, userMap,
+	    ExtUserUseridMap userMap = integrationService.getExtUserUseridMap(serverMap, username);
+	    ExtCourseClassMap orgMap = integrationService.getExtCourseClassMap(serverMap, userMap,
 		    courseId, countryIsoCode, langIsoCode, null, LoginRequestDispatcher.METHOD_MONITOR);
 	    User user = userMap.getUser();
 	    Organisation organisation = orgMap.getOrganisation();
 
 	    // 1. init lesson
-	    Lesson lesson = LessonManagerServlet.monitoringService.initializeLesson(title, desc, ldId,
+	    Lesson lesson = monitoringService.initializeLesson(title, desc, ldId,
 		    organisation.getOrganisationId(), user.getUserId(), customCSV, false, false, presenceEnable,
 		    imEnable, true, enableNotifications, false, false, null, null);
 	    // 2. create lessonClass for lesson
 	    createLessonClass(lesson, organisation, user);
 	    // 3. start lesson
-	    LessonManagerServlet.monitoringService.startLesson(lesson.getLessonId(), user.getUserId());
+	    monitoringService.startLesson(lesson.getLessonId(), user.getUserId());
 	    // store information which extServer has started the lesson
-	    LessonManagerServlet.integrationService.createExtServerLessonMap(lesson.getLessonId(), serverMap);
+	    integrationService.createExtServerLessonMap(lesson.getLessonId(), serverMap);
 
 	    return lesson.getLessonId();
 	} catch (Exception e) {
@@ -780,17 +780,16 @@
     }
 
     @SuppressWarnings("unchecked")
-    private void createLessonClass(Lesson lesson, Organisation organisation, User creator) {
+    private static void createLessonClass(Lesson lesson, Organisation organisation, User creator) {
 	List<User> staffList = new LinkedList<User>();
 	staffList.add(creator);
 	List<User> learnerList = new LinkedList<User>();
-	Vector<User> learnerVector = LessonManagerServlet.userManagementService
+	Vector<User> learnerVector = userManagementService
 		.getUsersFromOrganisationByRole(organisation.getOrganisationId(), Role.LEARNER, true);
 	learnerList.addAll(learnerVector);
-	LessonManagerServlet.monitoringService.createLessonClassForLesson(lesson.getLessonId(), organisation,
+	monitoringService.createLessonClassForLesson(lesson.getLessonId(), organisation,
 		organisation.getName() + " learners", learnerList, organisation.getName() + " staff", staffList,
 		creator.getUserId());
-
     }
 
     /**
@@ -903,7 +902,11 @@
 		if ((firstNames != null) && ((firstNameArray.length != lastNameArray.length)
 			|| (firstNameArray.length != emailArray.length)
 			|| (firstNameArray.length != (learnerIdArray.length + monitorIdArray.length)))) {
-		    LessonManagerServlet.log.error("Invalid parameters sent: wrong array length.");
+		    LessonManagerServlet.log.error("Invalid parameters sent: wrong array length. " + "learnerIds="
+			    + learnerIds + " &monitorIds=" + monitorIds + " &firstNames=" + firstNames + " &lastNames="
+			    + lastNames + " &emails=" + emails + " &array lengths=" + learnerIdArray.length + "!"
+			    + monitorIdArray.length + "!" + firstNameArray.length + "!" + lastNameArray.length + "!"
+			    + emailArray.length);
 		    return false;
 		}
 
Index: lams_central/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/Attic/struts-config.xml,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_central/web/WEB-INF/struts-config.xml	26 Aug 2016 15:02:59 -0000	1.1.2.2
+++ lams_central/web/WEB-INF/struts-config.xml	27 Sep 2016 06:22:57 -0000	1.1.2.3
@@ -494,6 +494,34 @@
       />
     </action>
     <action
+      path="/lti"
+      type="org.lamsfoundation.lams.web.action.LtiAction"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="addLesson"
+        path="/lti/addLesson.jsp"
+        redirect="false"
+      />
+      <forward
+        name="learnerMonitor"
+        path="/lti/learnerMonitor.jsp"
+        redirect="false"
+      />
+      <forward
+        name="learnerMonitorRedirect"
+        path="/lti.do?method=learnerMonitor"
+        redirect="true"
+      />
+      <forward
+        name="error"
+        path="/error.jsp"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/saveprofile"
       type="org.lamsfoundation.lams.web.ProfileSaveAction"
       name="UserForm"
Index: lams_central/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/Attic/web.xml,v
diff -u -r1.51.2.23 -r1.51.2.24
--- lams_central/web/WEB-INF/web.xml	9 Sep 2016 07:24:20 -0000	1.51.2.23
+++ lams_central/web/WEB-INF/web.xml	27 Sep 2016 06:22:57 -0000	1.51.2.24
@@ -298,6 +298,13 @@
 			org.lamsfoundation.lams.web.LoginRequestServlet
 		</servlet-class>
 	</servlet>
+	
+	<servlet>
+		<servlet-name>LoginRequestLti</servlet-name>
+		<servlet-class>
+			org.lamsfoundation.lams.web.LoginRequestLtiServlet
+		</servlet-class>
+	</servlet>
 
 	<servlet>
 		<servlet-name>LearningDesignRepository</servlet-name>
@@ -416,6 +423,11 @@
 		<servlet-name>LoginRequest</servlet-name>
 		<url-pattern>/LoginRequest</url-pattern>
 	</servlet-mapping>
+	
+	<servlet-mapping>
+		<servlet-name>LoginRequestLti</servlet-name>
+		<url-pattern>/LoginRequestLti</url-pattern>
+	</servlet-mapping>
 
 	<servlet-mapping>
 		<servlet-name>LearningDesignRepository</servlet-name>
@@ -640,6 +652,7 @@
 			<web-resource-name>Public content</web-resource-name>
 			<!-- Integrations -->
 			<url-pattern>/LoginRequest</url-pattern>
+			<url-pattern>/LoginRequestLti</url-pattern>
 			<url-pattern>/services/xml/LessonManager/*</url-pattern>
 			<url-pattern>/services/xml/LearningDesignRepository/*</url-pattern>
 			<url-pattern>/services/LearningDesignSVG/*</url-pattern>
@@ -702,6 +715,7 @@
 		<web-resource-collection>
 			<web-resource-name>Add lesson</web-resource-name>
 			<url-pattern>/addLesson.jsp</url-pattern>
+			<url-pattern>/lti/addLesson.jsp</url-pattern>
 		</web-resource-collection>
 		<auth-constraint>
 			<role-name>MONITOR</role-name>
Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/openUrls.js,v
diff -u -r1.38.2.7 -r1.38.2.8
--- lams_central/web/includes/javascript/openUrls.js	28 Jul 2016 03:44:15 -0000	1.38.2.7
+++ lams_central/web/includes/javascript/openUrls.js	27 Sep 2016 06:22:58 -0000	1.38.2.8
@@ -1,4 +1,3 @@
-	<!--
 		// resolution checking
 		var belowMinRes;
 		if (screen.width <= 800 && screen.height <= 600) {
@@ -102,14 +101,16 @@
 		}
 
 		function openLearner( lessonId ) {
+			var learnerUrl = 'home.do?method=learner&lessonID=' + lessonId;
+			
 			if (isMac) {
-				learnWin = window.open('home.do?method=learner&lessonID='+lessonId,'lWindow','width=' + learner_width + ',height=' + learner_height + ',resizable,scrollbars=yes,status=yes');
+				learnWin = window.open(learnerUrl,'lWindow','width=' + learner_width + ',height=' + learner_height + ',resizable,scrollbars=yes,status=yes');
 			} else {
 				if (learnWin && !learnWin.closed ) {
-					learnWin.location = 'home.do?method=learner&lessonID='+lessonId;		
+					learnWin.location = learnerUrl;		
 					learnWin.focus();
 				} else {
-					learnWin = window.open('home.do?method=learner&lessonID='+lessonId,'lWindow','width=' + learner_width + ',height=' + learner_height + ',resizable,scrollbars=yes,status=yes');
+					learnWin = window.open(learnerUrl,'lWindow','width=' + learner_width + ',height=' + learner_height + ',resizable,scrollbars=yes,status=yes');
 				}
 			}
 		}
@@ -240,4 +241,3 @@
 				gradebookMonLessonWin.focus();
 			}
 		}
-	// -->
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/web/lti/addLesson.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/web/lti/learnerMonitor.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/.classpath
===================================================================
RCS file: /usr/local/cvsroot/lams_common/.classpath,v
diff -u -r1.25.2.29 -r1.25.2.30
--- lams_common/.classpath	20 Apr 2016 16:31:21 -0000	1.25.2.29
+++ lams_common/.classpath	27 Sep 2016 06:23:53 -0000	1.25.2.30
@@ -43,7 +43,7 @@
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/codec/main/commons-codec-1.9.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/io/undertow/core/main/undertow-core-1.1.8.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/undertow"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/io/undertow/servlet/main/undertow-servlet-1.1.8.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/undertow"/>
-	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-gradebook.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-gradebook.jar" sourcepath="/lams_gradebook"/>
 	<classpathentry kind="output" path="bin"/>
 	<referencedentry kind="lib" path="/lams_build/lib/lams/lams.jar" sourcepath=""/>
 </classpath>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerLessonMap.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/Attic/ExtServerLessonMap.hbm.xml,v
diff -u -r1.3.2.2 -r1.3.2.3
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerLessonMap.hbm.xml	27 Apr 2016 13:22:29 -0000	1.3.2.2
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerLessonMap.hbm.xml	27 Sep 2016 06:22:54 -0000	1.3.2.3
@@ -34,6 +34,14 @@
             column="lesson_id"
             not-null="true"
         />
+        
+        <property
+            name="resourceLinkId"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="resource_link_id"
+        />
 
         <many-to-one
             name="extServer"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/Attic/ExtServerOrgMap.hbm.xml,v
diff -u -r1.6.2.5 -r1.6.2.6
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	15 Dec 2015 18:12:05 -0000	1.6.2.5
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	27 Sep 2016 06:22:54 -0000	1.6.2.6
@@ -64,6 +64,14 @@
             column="serverdesc"
             length="65535"
         />
+        
+        <property 
+ 	        name="serverTypeId" 
+ 	        type="java.lang.Integer" 
+ 	        column="server_type_id" 
+ 	        length="11" 
+ 	        not-null="true"
+ 	    />
 
         <property
             name="prefix"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/Attic/ExtUserUseridMap.hbm.xml,v
diff -u -r1.6.2.2 -r1.6.2.3
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml	27 Apr 2016 13:22:29 -0000	1.6.2.2
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml	27 Sep 2016 06:22:54 -0000	1.6.2.3
@@ -61,6 +61,15 @@
                 name="ext_server_org_map_id" 
             />
         </many-to-one>
+        
+        <property
+            name="tcGradebookId"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="tc_gradebook_id"
+            length="250"
+        />
 
         <!--
             To add non XDoclet property mappings, create a file named
Index: lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml,v
diff -u -r1.1.24.7 -r1.1.24.8
--- lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml	15 Dec 2015 18:12:05 -0000	1.1.24.7
+++ lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml	27 Sep 2016 06:22:54 -0000	1.1.24.8
@@ -6,8 +6,10 @@
            				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
            				   
 	<bean id="integrationServiceTarget" class="org.lamsfoundation.lams.integration.service.IntegrationService">
-		<property name="service"><ref bean="userManagementService"/></property>
+		<property name="gradebookService"><ref bean="gradebookService"/></property>
 		<property name="lessonService"><ref bean="lessonService"/></property>
+		<property name="service"><ref bean="userManagementService"/></property>
+		<property name="toolService"><ref bean="lamsCoreToolServiceTarget"/></property>		
 	</bean>
 	
 	<bean id="integrationService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
Index: lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml,v
diff -u -r1.14.2.10 -r1.14.2.11
--- lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml	15 Jun 2016 08:02:53 -0000	1.14.2.10
+++ lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml	27 Sep 2016 06:22:54 -0000	1.14.2.11
@@ -41,6 +41,7 @@
 	</bean>
 	
 	<bean id="lamsCoreToolServiceTarget" class="org.lamsfoundation.lams.tool.service.LamsCoreToolService" scope="prototype">
+		<property name="activityDAO"><ref bean="activityDAO"/></property>
 		<property name="toolContentDAO"><ref bean="toolContentDAO"/></property>
 		<property name="toolSessionDAO"><ref bean="toolSessionDAO"/></property>
 		<property name="systemToolDAO"><ref bean="systemToolDAO"/></property>
Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040069.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerLessonMap.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerLessonMap.java,v
diff -u -r1.2.2.3 -r1.2.2.4
--- lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerLessonMap.java	11 May 2016 07:07:24 -0000	1.2.2.3
+++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerLessonMap.java	27 Sep 2016 06:22:54 -0000	1.2.2.4
@@ -25,13 +25,12 @@
 
 /**
  * Maps a lesson to multiple integrated server instances
- *
- *
  */
 public class ExtServerLessonMap {
 
     private Long uid;
     private Long lessonId;
+    private String resourceLinkId;
     private ExtServerOrgMap extServer;
 
     public ExtServerLessonMap() {
@@ -60,7 +59,25 @@
     public void setLessonId(Long lessonId) {
 	this.lessonId = lessonId;
     }
+    
+    /**
+     * Used only for LTI tool consumer servers. Stores value of the resource_link_id parameter. Which is an opaque
+     * unique identifier that the TC guarantees will be unique within the TC for every placement of the link. If the
+     * tool / activity is placed multiple times in the same context, each of those placements will be distinct. This
+     * value will also change if the item is exported from one system or context and imported into another system or
+     * context. This parameter is required.
+     * 
+     * @hibernate.property column="resource_link_id"
+     *
+     */
+    public String getResourceLinkId() {
+	return resourceLinkId;
+    }
 
+    public void setResourceLinkId(String resourceLinkId) {
+	this.resourceLinkId = resourceLinkId;
+    }
+
     /**
      *
      *
Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerOrgMap.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/Attic/ExtServerOrgMap.java,v
diff -u -r1.6.2.4 -r1.6.2.5
--- lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerOrgMap.java	5 May 2016 08:10:54 -0000	1.6.2.4
+++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerOrgMap.java	27 Sep 2016 06:22:54 -0000	1.6.2.5
@@ -9,6 +9,14 @@
 public class ExtServerOrgMap implements Serializable, Comparable {
 
     private static final long serialVersionUID = 337894825609071182L;
+    
+    /*
+     * static final variables indicating the type of servers available. 
+     */
+    /* **************************************************************** */
+    public static final int INTEGRATION_SERVER_TYPE = 1;
+    public static final int LTI_CONSUMER_SERVER_TYPE = 2;
+    /** *************************************************************** */
 
     /** identifier field */
     private Integer sid;
@@ -24,6 +32,9 @@
 
     /** persistent field */
     private String serverdesc;
+    
+    /** The type of activity */
+    private Integer serverTypeId;
 
     /** persistent field */
     private String prefix;
@@ -103,7 +114,15 @@
     public void setServerdesc(String serverdesc) {
 	this.serverdesc = serverdesc;
     }
+    
+    public Integer getServerTypeId() {
+	return serverTypeId;
+    }
 
+    public void setServerTypeId(Integer serverTypeId) {
+	this.serverTypeId = serverTypeId;
+    }
+
     public String getPrefix() {
 	return this.prefix;
     }
@@ -215,5 +234,13 @@
     public int compareTo(Object o) {
 	return serverid.compareToIgnoreCase(((ExtServerOrgMap) o).getServerid());
     }
+    
+    public boolean isIntegrationServer() {
+	return getServerTypeId().intValue() == ExtServerOrgMap.INTEGRATION_SERVER_TYPE;
+    }
+    
+    public boolean isLtiConsumer() {
+	return getServerTypeId().intValue() == ExtServerOrgMap.LTI_CONSUMER_SERVER_TYPE;
+    }
 
 }
Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java,v
diff -u -r1.4.2.2 -r1.4.2.3
--- lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java	5 May 2016 08:10:54 -0000	1.4.2.2
+++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java	27 Sep 2016 06:22:54 -0000	1.4.2.3
@@ -23,6 +23,9 @@
 
     /** persistent field */
     private ExtServerOrgMap extServerOrgMap;
+    
+    /** id of gradebook item in LTI tool consumer */
+    private String tcGradebookId;
 
     /** full constructor */
     public ExtUserUseridMap(String extUsername, User user, ExtServerOrgMap extServerOrgMap) {
@@ -35,10 +38,6 @@
     public ExtUserUseridMap() {
     }
 
-    /**
-     *
-     *
-     */
     public Integer getSid() {
 	return this.sid;
     }
@@ -47,10 +46,6 @@
 	this.sid = sid;
     }
 
-    /**
-     *
-     *
-     */
     public String getExtUsername() {
 	return this.extUsername;
     }
@@ -59,11 +54,6 @@
 	this.extUsername = extUsername;
     }
 
-    /**
-     *
-     *
-     *
-     */
     public User getUser() {
 	return this.user;
     }
@@ -72,19 +62,22 @@
 	this.user = user;
     }
 
-    /**
-     *
-     *
-     *
-     */
     public ExtServerOrgMap getExtServerOrgMap() {
 	return this.extServerOrgMap;
     }
 
     public void setExtServerOrgMap(ExtServerOrgMap extServerOrgMap) {
 	this.extServerOrgMap = extServerOrgMap;
     }
+    
+    public String getTcGradebookId() {
+	return this.tcGradebookId;
+    }
 
+    public void setTcGradebookId(String tcGradebookId) {
+	this.tcGradebookId = tcGradebookId;
+    }
+
     @Override
     public String toString() {
 	return new ToStringBuilder(this).append("sid", getSid()).append("extUsername", getExtUsername()).toString();
Index: lams_common/src/java/org/lamsfoundation/lams/integration/security/Authenticator.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/security/Authenticator.java,v
diff -u -r1.4.24.4 -r1.4.24.5
--- lams_common/src/java/org/lamsfoundation/lams/integration/security/Authenticator.java	5 May 2016 08:10:59 -0000	1.4.24.4
+++ lams_common/src/java/org/lamsfoundation/lams/integration/security/Authenticator.java	27 Sep 2016 06:22:54 -0000	1.4.24.5
@@ -108,12 +108,9 @@
 
 	//learnerStrictAuth hash [ts + uid + method + lsid + serverID + serverKey]
 	//otherwise [ts + uid + method + serverID + serverKey]
-	String plaintext = (lsid == null)
-		? datetime.toLowerCase().trim() + username.toLowerCase().trim() + method.toLowerCase().trim()
-			+ map.getServerid().toLowerCase().trim() + map.getServerkey().toLowerCase().trim()
-		: datetime.toLowerCase().trim() + username.toLowerCase().trim() + method.toLowerCase().trim()
-			+ lsid.toLowerCase().trim() + map.getServerid().toLowerCase().trim()
-			+ map.getServerkey().toLowerCase().trim();
+	String plaintext = datetime.toLowerCase().trim() + username.toLowerCase().trim() + method.toLowerCase().trim()
+		+ ("learnerStrictAuth".equals(method) ? lsid.toLowerCase().trim() : "")
+		+ map.getServerid().toLowerCase().trim() + map.getServerkey().toLowerCase().trim();
 	Authenticator.checkHash(plaintext, hashValue);
     }
 
Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java,v
diff -u -r1.15.2.6 -r1.15.2.7
--- lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java	19 Jul 2016 09:14:26 -0000	1.15.2.6
+++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java	27 Sep 2016 06:22:54 -0000	1.15.2.7
@@ -95,9 +95,30 @@
     ExtUserUseridMap getExistingExtUserUseridMap(ExtServerOrgMap serverMap, String extUsername)
 	    throws UserInfoFetchException;
 
+    /**
+     * Returns integration server by its automatically-created sid.
+     * 
+     * @param serverId
+     * @return
+     */
     ExtServerOrgMap getExtServerOrgMap(Integer sid);
 
+    /**
+     * Returns integration server by its human-entered serverId.
+     * 
+     * @param serverId
+     * @return
+     */
     ExtServerOrgMap getExtServerOrgMap(String serverId);
+    
+    /**
+     * Returns ExtServerLessonMap for the LTI Tool Consumer identified by serverId. 
+     * 
+     * @param serverId
+     * @param resourceLinkId resource_link_id parameter from LTI request 
+     * @return
+     */
+    ExtServerLessonMap getLtiConsumerLesson(String serverId, String resourceLinkId);
 
     /**
      * Returns ExtCourseClassMap. If ExtCourseClassMap doesn't existent - returns null and does not create a new
@@ -130,7 +151,15 @@
     ExtUserUseridMap getImplicitExtUserUseridMap(ExtServerOrgMap serverMap, String extUsername, String password,
 	    String salt, String firstName, String lastName, String email) throws UserInfoValidationException;
 
-    List getAllExtServerOrgMaps();
+    /**
+     * @return all available integrated servers (that is excluding tool consumers)
+     */
+    List<ExtServerOrgMap> getAllExtServerOrgMaps();
+    
+    /**
+     * @return all available tool consumers
+     */
+    List<ExtServerOrgMap> getAllToolConsumers();
 
     void saveExtServerOrgMap(ExtServerOrgMap map);
 
@@ -143,6 +172,24 @@
     void saveExtServerToolAdapterMap(ExtServerToolAdapterMap map);
 
     void deleteExtServerToolAdapterMap(ExtServerToolAdapterMap map);
+    
+    /**
+     * Creates new ExtServerLessonMap object. Method is suitable for creating lessons via integration servers.
+     * 
+     * @param lessonId
+     * @param extServer
+     */
+    void createExtServerLessonMap(Long lessonId, ExtServerOrgMap extServer);
+    
+    /**
+     * Creates new ExtServerLessonMap object. Method is suitable for creating lessons via LTI tool consumers as long as
+     * they provide resourceLinkId as a parameter and not lessonId.
+     * 
+     * @param lessonId
+     * @param resourceLinkId resource_link_id parameter sent by LTI tool consumer
+     * @param extServer
+     */
+    void createExtServerLessonMap(Long lessonId, String resourceLinkId, ExtServerOrgMap extServer);
 
     /**
      * Checks whether the lesson was created from extServer and returns lessonFinishCallbackUrl if it's not blank.
Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java,v
diff -u -r1.33.2.11 -r1.33.2.12
--- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java	30 Aug 2016 09:00:21 -0000	1.33.2.11
+++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java	27 Sep 2016 06:22:54 -0000	1.33.2.12
@@ -33,6 +33,7 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLEncoder;
+import java.security.GeneralSecurityException;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Date;
@@ -44,6 +45,9 @@
 import org.apache.log4j.Logger;
 import org.apache.tomcat.util.json.JSONArray;
 import org.apache.tomcat.util.json.JSONObject;
+import org.imsglobal.pox.IMSPOXRequest;
+import org.lamsfoundation.lams.gradebook.GradebookUserLesson;
+import org.lamsfoundation.lams.gradebook.service.IGradebookService;
 import org.lamsfoundation.lams.integration.ExtCourseClassMap;
 import org.lamsfoundation.lams.integration.ExtServerLessonMap;
 import org.lamsfoundation.lams.integration.ExtServerOrgMap;
@@ -57,6 +61,7 @@
 import org.lamsfoundation.lams.integration.util.LoginRequestDispatcher;
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.lesson.service.ILessonService;
+import org.lamsfoundation.lams.tool.service.ILamsCoreToolService;
 import org.lamsfoundation.lams.usermanagement.AuthenticationMethod;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.OrganisationState;
@@ -72,6 +77,8 @@
 import org.lamsfoundation.lams.util.ValidationUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 
+import oauth.signpost.exception.OAuthException;
+
 /**
  * <p>
  * <a href="IntegrationService.java.html"><i>View Source</i><a>
@@ -83,24 +90,35 @@
 
     private static Logger log = Logger.getLogger(IntegrationService.class);
 
+    private IGradebookService gradebookService;
     private IUserManagementService service;
     private ILessonService lessonService;
+    private ILamsCoreToolService toolService;
 
+    /**
+     * Returns integration server or LTI tool consumer by its human-entered server key/server id.
+     * 
+     * @param serverId server key/server id
+     * @param isIntegrationServer true in case this is an integration server, false - LTI tool consumer
+     * @return
+     */
     @Override
     public ExtServerOrgMap getExtServerOrgMap(String serverId) {
-	List list = service.findByProperty(ExtServerOrgMap.class, "serverid", serverId);
-	if ((list == null) || (list.size() == 0)) {
+	Map<String, Object> properties = new HashMap<String, Object>();
+	properties.put("serverid", serverId);
+	List<ExtServerOrgMap> list = service.findByProperties(ExtServerOrgMap.class, properties);
+	if (list == null || list.size() == 0) {
 	    return null;
 	} else {
-	    return (ExtServerOrgMap) list.get(0);
+	    return list.get(0);
 	}
     }
 
     @Override
-    public ExtCourseClassMap getExtCourseClassMap(Integer extServerOrgMapId, String extCourseId) {
+    public ExtCourseClassMap getExtCourseClassMap(Integer sid, String extCourseId) {
 	Map<String, Object> properties = new HashMap<String, Object>();
 	properties.put("courseid", extCourseId);
-	properties.put("extServerOrgMap.sid", extServerOrgMapId);
+	properties.put("extServerOrgMap.sid", sid);
 	List<ExtCourseClassMap> list = service.findByProperties(ExtCourseClassMap.class, properties);
 
 	if ((list == null) || (list.size() == 0)) {
@@ -502,9 +520,18 @@
     }
 
     @Override
-    public List getAllExtServerOrgMaps() {
-	return service.findAll(ExtServerOrgMap.class);
+    public List<ExtServerOrgMap> getAllExtServerOrgMaps() {
+	Map<String, Object> properties = new HashMap<String, Object>();
+	properties.put("serverTypeId", ExtServerOrgMap.INTEGRATION_SERVER_TYPE);
+	return service.findByProperties(ExtServerOrgMap.class, properties);
     }
+    
+    @Override
+    public List<ExtServerOrgMap> getAllToolConsumers() {
+	Map<String, Object> properties = new HashMap<String, Object>();
+	properties.put("serverTypeId", ExtServerOrgMap.LTI_CONSUMER_SERVER_TYPE);
+	return service.findByProperties(ExtServerOrgMap.class, properties);
+    }
 
     @Override
     @SuppressWarnings("unchecked")
@@ -549,9 +576,16 @@
 	return (ExtServerOrgMap) service.findById(ExtServerOrgMap.class, sid);
     }
 
+    @Override
     public void createExtServerLessonMap(Long lessonId, ExtServerOrgMap extServer) {
+	createExtServerLessonMap(lessonId, null, extServer);;
+    }
+    
+    @Override
+    public void createExtServerLessonMap(Long lessonId, String resourceLinkId, ExtServerOrgMap extServer) {
 	ExtServerLessonMap map = new ExtServerLessonMap();
 	map.setLessonId(lessonId);
+	map.setResourceLinkId(resourceLinkId);
 	map.setExtServer(extServer);
 	service.save(map);
     }
@@ -567,25 +601,73 @@
 	    Long lessonId = lesson.getLessonId();
 	    ExtServerLessonMap extServerLesson = getExtServerLessonMap(lessonId);
 	    // checks whether the lesson was created from extServer and whether it has lessonFinishCallbackUrl setting
-	    if ((extServerLesson != null)
+	    if (extServerLesson != null
 		    && StringUtils.isNotBlank(extServerLesson.getExtServer().getLessonFinishUrl())) {
-		ExtServerOrgMap serverMap = extServerLesson.getExtServer();
+		ExtServerOrgMap server = extServerLesson.getExtServer();
 
-		ExtUserUseridMap extUserUseridMap = getExtUserUseridMapByUserId(serverMap, user.getUserId());
-		if (extUserUseridMap != null) {
-		    String extUsername = extUserUseridMap.getExtUsername();
+		ExtUserUseridMap extUser = getExtUserUseridMapByUserId(server, user.getUserId());
+		if (extUser != null) {
+		    String extUsername = extUser.getExtUsername();
 
-		    // construct real lessonFinishCallbackUrl
-		    lessonFinishCallbackUrl = serverMap.getLessonFinishUrl();
-		    String timestamp = Long.toString(new Date().getTime());
-		    String hash = hash(serverMap, extUsername, timestamp);
-		    String encodedExtUsername = URLEncoder.encode(extUsername, "UTF8");
+		    //return URL in case of integration server
+		    if (server.getServerTypeId().equals(ExtServerOrgMap.INTEGRATION_SERVER_TYPE)) {
+			// construct real lessonFinishCallbackUrl
+			lessonFinishCallbackUrl = server.getLessonFinishUrl();
+			String timestamp = Long.toString(new Date().getTime());
+			String hash = hash(server, extUsername, timestamp);
+			String encodedExtUsername = URLEncoder.encode(extUsername, "UTF8");
 
-		    // set the values for the parameters
-		    lessonFinishCallbackUrl = lessonFinishCallbackUrl.replaceAll("%username%", encodedExtUsername)
-			    .replaceAll("%lessonid%", lessonId.toString()).replaceAll("%timestamp%", timestamp)
-			    .replaceAll("%hash%", hash);
-		    IntegrationService.log.debug(lessonFinishCallbackUrl);
+			// set the values for the parameters
+			lessonFinishCallbackUrl = lessonFinishCallbackUrl.replaceAll("%username%", encodedExtUsername)
+				.replaceAll("%lessonid%", lessonId.toString()).replaceAll("%timestamp%", timestamp)
+				.replaceAll("%hash%", hash);
+			log.debug(lessonFinishCallbackUrl);
+			
+		    // in case of LTI Tool Consumer - create a new thread to report score back to LMS (in order to do this task in parallel not to slow down later work)
+		    } else {
+			
+			// calculate lesson's MaxPossibleMark
+			Long lessonMaxPossibleMark = toolService.getLessonMaxPossibleMark(lesson);
+			GradebookUserLesson gradebookUserLesson = gradebookService.getGradebookUserLesson(lessonId,
+				user.getUserId());
+			Double userTotalMark = (gradebookUserLesson == null) || (gradebookUserLesson.getMark() == null)
+				? null : gradebookUserLesson.getMark();
+			
+			final String lessonFinishUrl = server.getLessonFinishUrl();
+			if (userTotalMark != null && StringUtils.isNotBlank(lessonFinishUrl)) {
+			    
+			    Double score = lessonMaxPossibleMark.equals(0L) ? 0 : userTotalMark / lessonMaxPossibleMark;
+			    final String scoreStr = (userTotalMark == null) || lessonMaxPossibleMark.equals(0L) ? ""
+				    : score.toString();
+
+			    final String serverKey = server.getServerid();
+			    final String serverSecret = server.getServerkey();
+			    final String tcGradebookId = extUser.getTcGradebookId();
+			    final ExtUserUseridMap extUserFinal = extUser;
+
+			    Thread preaddLearnersMonitorsThread = new Thread(new Runnable() {
+				@Override
+				public void run() {
+				    //send Request directly
+				    try {
+					IMSPOXRequest.sendReplaceResult(lessonFinishUrl, serverKey, serverSecret,
+						tcGradebookId, scoreStr);
+				    } catch (IOException e) {
+					throw new RuntimeException(e);
+				    } catch (OAuthException e) {
+					throw new RuntimeException(e);
+				    } catch (GeneralSecurityException e) {
+					throw new RuntimeException(e);
+				    }
+				    log.debug("Score (" + scoreStr + ") posted to Tool Consumer (serverKey:" + serverKey
+					    + "). extUsername:" + extUserFinal.getExtUsername());
+				}
+			    }, "LAMS_sendScoresLTI_thread");
+			    preaddLearnersMonitorsThread.start();
+
+			}
+		    }
+
 		}
 	    }
 	}
@@ -749,6 +831,16 @@
 	return list == null || list.isEmpty() ? null : list.get(0);
     }
     
+    @Override
+    public ExtServerLessonMap getLtiConsumerLesson(String serverId, String resourceLinkId) {
+	Map<String, Object> properties = new HashMap<String, Object>();
+	properties.put("extServer.serverid", serverId);
+	properties.put("resourceLinkId", resourceLinkId);
+	List<ExtServerLessonMap> list = service.findByProperties(ExtServerLessonMap.class, properties);
+	
+	return (list == null || list.isEmpty()) ? null : list.get(0);
+    }
+    
     private ExtServerLessonMap getExtServerLessonMap(Long lessonId) {
 	List list = service.findByProperty(ExtServerLessonMap.class, "lessonId", lessonId);
 	if ((list == null) || (list.size() == 0)) {
@@ -790,4 +882,13 @@
     public ILessonService getLessonService() {
 	return lessonService;
     }
+    
+    public void setGradebookService(IGradebookService gradebookService) {
+	this.gradebookService = gradebookService;
+    }
+    
+    public void setToolService(ILamsCoreToolService toolService) {
+	this.toolService = toolService;
+    }
+    
 }
\ No newline at end of file
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/integration/util/LtiUtils.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java,v
diff -u -r1.29.2.7 -r1.29.2.8
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java	15 Jun 2016 08:02:53 -0000	1.29.2.7
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java	27 Sep 2016 06:22:54 -0000	1.29.2.8
@@ -290,6 +290,14 @@
     Long getActivityMaxPossibleMark(ToolActivity activity);
 
     /**
+     * Calculates lesson's maximum possible mark by adding up all activities max marks.
+     * 
+     * @param lesson
+     * @return
+     */
+    Long getLessonMaxPossibleMark(Lesson lesson);
+
+    /**
      * Update the tool session data.
      *
      * @param toolSession
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java,v
diff -u -r1.45.2.10 -r1.45.2.11
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java	9 Sep 2016 07:24:17 -0000	1.45.2.10
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java	27 Sep 2016 06:22:54 -0000	1.45.2.11
@@ -38,6 +38,7 @@
 import org.lamsfoundation.lams.learningdesign.Grouping;
 import org.lamsfoundation.lams.learningdesign.GroupingActivity;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
+import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO;
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.tool.SystemTool;
 import org.lamsfoundation.lams.tool.Tool;
@@ -80,6 +81,7 @@
     // Instance variables
     // ---------------------------------------------------------------------
     private ApplicationContext context;
+    private IActivityDAO activityDAO;
     private IToolSessionDAO toolSessionDAO;
     private ISystemToolDAO systemToolDAO;
     private ToolContentIDGenerator contentIDGenerator;
@@ -93,6 +95,10 @@
     public void setApplicationContext(ApplicationContext context) throws BeansException {
 	this.context = context;
     }
+    
+    public void setActivityDAO(IActivityDAO activityDAO) {
+	this.activityDAO = activityDAO;
+    }
 
     /**
      * @param toolSessionDAO
@@ -632,7 +638,53 @@
 	return null;
     }
 
+    
     @Override
+    public Long getLessonMaxPossibleMark(Lesson lesson) {
+	// calculate lesson's MaxPossibleMark
+	Set<ToolActivity> activities = getLessonActivities(lesson);
+	Long lessonMaxPossibleMark = 0L;
+	for (ToolActivity activity : activities) {
+	    Long activityMaxPossibleMark = getActivityMaxPossibleMark(activity);
+	    if (activityMaxPossibleMark != null) {
+		lessonMaxPossibleMark += activityMaxPossibleMark;
+	    }
+	}
+	return lessonMaxPossibleMark;
+    }
+    
+    /**
+     * Returns lesson tool activities. It works almost the same as lesson.getLearningDesign().getActivities() except it
+     * solves problem with first activity unable to cast to ToolActivity.
+     */
+    @SuppressWarnings("unchecked")
+    private Set<ToolActivity> getLessonActivities(Lesson lesson) {
+	Set<Activity> activities = new TreeSet<Activity>();
+	Set<ToolActivity> toolActivities = new TreeSet<ToolActivity>();
+
+	/*
+	 * Hibernate CGLIB is failing to load the first activity in the sequence as a ToolActivity for some mysterious
+	 * reason Causes a ClassCastException when you try to cast it, even if it is a ToolActivity.
+	 *
+	 * THIS IS A HACK to retrieve the first tool activity manually so it can be cast as a ToolActivity - if it is
+	 * one
+	 */
+	Activity firstActivity = activityDAO
+		.getActivityByActivityId(lesson.getLearningDesign().getFirstActivity().getActivityId());
+	activities.add(firstActivity);
+	activities.addAll(lesson.getLearningDesign().getActivities());
+
+	for (Activity activity : activities) {
+	    if (activity instanceof ToolActivity) {
+		ToolActivity toolActivity = (ToolActivity) activity;
+		toolActivities.add(toolActivity);
+	    }
+	}
+
+	return toolActivities;
+    }
+
+    @Override
     public void updateToolSession(ToolSession toolSession) {
 	toolSessionDAO.updateToolSession(toolSession);
     }
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java,v
diff -u -r1.115.2.16 -r1.115.2.17
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	11 Jul 2016 12:45:44 -0000	1.115.2.16
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	27 Sep 2016 06:22:54 -0000	1.115.2.17
@@ -831,7 +831,7 @@
     @Override
     public Theme getDefaultTheme() {
 	String htmlName = Configuration.get(ConfigurationKeys.DEFAULT_THEME);
-	List list = findByProperty(Theme.class, "name", htmlName);
+	List list = findByProperty(Theme.class, "name", "defaultHTML");
 	return list != null ? (Theme) list.get(0) : null;
     }