Index: lams_central/.classpath
===================================================================
diff -u -r5a70ca6f5834da3b63f32b40d0a38ebeb555597d -rde884cf8c730a25d2f2296f7a768d3fd45508c99
--- lams_central/.classpath	(.../.classpath)	(revision 5a70ca6f5834da3b63f32b40d0a38ebeb555597d)
+++ lams_central/.classpath	(.../.classpath)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -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
===================================================================
diff -u -r9eaeb8328024c0c652dd7d17372dc4caf3a5852c -rde884cf8c730a25d2f2296f7a768d3fd45508c99
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 9eaeb8328024c0c652dd7d17372dc4caf3a5852c)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -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
===================================================================
diff -u -r0ddeb3a1dcf29cbbba6ed0fccbd139f9c31c347f -rde884cf8c730a25d2f2296f7a768d3fd45508c99
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision 0ddeb3a1dcf29cbbba6ed0fccbd139f9c31c347f)
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -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);
Index: lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -0,0 +1,234 @@
+/**
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ */
+package org.lamsfoundation.lams.web;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URLEncoder;
+import java.util.Enumeration;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.log4j.Logger;
+import org.imsglobal.lti.BasicLTIConstants;
+import org.imsglobal.lti.launch.LtiLaunch;
+import org.imsglobal.lti.launch.LtiOauthVerifier;
+import org.imsglobal.lti.launch.LtiVerificationException;
+import org.imsglobal.lti.launch.LtiVerificationResult;
+import org.imsglobal.lti.launch.LtiVerifier;
+import org.lamsfoundation.lams.integration.ExtServerLessonMap;
+import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.service.IntegrationService;
+import org.lamsfoundation.lams.integration.util.LoginRequestDispatcher;
+import org.lamsfoundation.lams.integration.util.LtiUtils;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.CentralConstants;
+import org.lamsfoundation.lams.util.HashUtil;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ * The LoginRequestLtiServlet handles login request by LTI tool consumers. This servlet checks for the correctly signed by OAuth parameters,
+ * and if it's valid it redirects it to LoginRequestServlet for actual authentication.
+ *
+ * @author Andrey Balan
+ */
+@SuppressWarnings("serial")
+public class LoginRequestLtiServlet extends HttpServlet {
+
+    private static Logger log = Logger.getLogger(LoginRequestLtiServlet.class);
+
+    private static IntegrationService integrationService = null;
+
+    private static IUserManagementService userManagementService = null;
+
+    private final String DEFAULT_FIRST_NAME = "John";
+
+    private final String DEFAULT_LAST_NAME = "Doe";
+
+    @Override
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+	initServices();
+
+	String extUsername = request.getParameter(BasicLTIConstants.USER_ID);
+	String roles = request.getParameter(BasicLTIConstants.ROLES);
+	// implicit login params
+	String firstName = request.getParameter(BasicLTIConstants.LIS_PERSON_NAME_GIVEN);
+	String lastName = request.getParameter(BasicLTIConstants.LIS_PERSON_NAME_FAMILY);
+	String email = request.getParameter(BasicLTIConstants.LIS_PERSON_CONTACT_EMAIL_PRIMARY);
+
+	String locale = request.getParameter(BasicLTIConstants.LAUNCH_PRESENTATION_LOCALE);
+	String country = LoginRequestLtiServlet.getCountry(locale);
+	String lang = LoginRequestLtiServlet.getLanguage(locale);
+
+	String consumerKey = request.getParameter(LtiUtils.OAUTH_CONSUMER_KEY);
+	String resourceLinkId = request.getParameter(BasicLTIConstants.RESOURCE_LINK_ID);
+	String contextId = request.getParameter(BasicLTIConstants.CONTEXT_ID);
+	String contextLabel = request.getParameter(BasicLTIConstants.CONTEXT_LABEL);
+
+	if ((extUsername == null) || (consumerKey == null)) {
+	    response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Login Failed - login parameters missing");
+	    return;
+	}
+
+	//verify whether request was correctly signed by OAuth
+	ExtServerOrgMap extServer = integrationService.getExtServerOrgMap(consumerKey);
+	String secret = extServer.getServerkey();// retrieve corresponding secret for key from db
+	LtiVerificationResult ltiResult = null;
+	try {
+	    LtiVerifier ltiVerifier = new LtiOauthVerifier();
+	    ltiResult = ltiVerifier.verify(request, secret);
+	} catch (LtiVerificationException e) {
+	    log.error("Authentication error: ", e);
+	    response.sendError(HttpServletResponse.SC_UNAUTHORIZED,
+		    "Login Failed - authentication error. " + e.getMessage());
+	    return;
+	}
+	LtiLaunch ltiLaunch = ltiResult.getLtiLaunchResult();
+	if (!ltiResult.getSuccess()) {
+	    log.warn("Authentication error: " + ltiResult.getMessage());
+	    response.sendError(HttpStatus.SC_UNAUTHORIZED,
+		    "Login Failed - authentication error. " + ltiResult.getMessage());
+	    return;
+	}
+
+	//provide default values for user names, as we can't fetch them from LTI Tool consumer
+	if (StringUtils.isBlank(firstName)) {
+	    firstName = DEFAULT_FIRST_NAME;
+	}
+	if (StringUtils.isBlank(firstName)) {
+	    lastName = DEFAULT_LAST_NAME;
+	}
+	ExtServerLessonMap lesson = integrationService.getLtiConsumerLesson(consumerKey, resourceLinkId);
+
+	//determine method based on role parameter
+	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;
+	} else {
+	    method = LoginRequestDispatcher.METHOD_MONITOR;
+	}
+	
+	//provide empty lessonId in case of learner accesses LTI link before teacher authored it
+	String lessonId = lesson == null ? "" : lesson.getLessonId().toString();
+
+	String timestamp = String.valueOf(System.currentTimeMillis());
+
+	// in case of learnerStrictAuth we should also include lsid value when creating hash: [ts + uid + method + lsid + serverID + serverKey]
+	// regular case: [ts + uid + method + serverID + serverKey]
+	String plaintext = timestamp.toLowerCase().trim() + extUsername.toLowerCase().trim()
+		+ method.toLowerCase().trim()
+		+ (LoginRequestDispatcher.METHOD_LEARNER_STRICT_AUTHENTICATION.equals(method) ? lessonId
+			: "")
+		+ consumerKey.toLowerCase().trim() + secret.toLowerCase().trim();
+	String hash = HashUtil.sha1(plaintext);
+
+	try {
+
+	    // constructing redirectUrl by getting request.getQueryString() for POST requests 
+	    URIBuilder redirectUrl = new URIBuilder("lti.do");
+	    for (Enumeration<String> e = request.getParameterNames(); e.hasMoreElements();) {
+		String paramName = e.nextElement();
+
+		//skip parameters starting with oath_
+		if (LtiUtils.OAUTH_CONSUMER_KEY.equals(paramName)
+			|| !paramName.startsWith(BasicLTIConstants.OAUTH_PREFIX)) {
+		    redirectUrl.addParameter(paramName, request.getParameter(paramName));
+		}
+		redirectUrl.addParameter("_" + LoginRequestDispatcher.PARAM_METHOD, method);
+	    }
+
+	    URIBuilder url = new URIBuilder("LoginRequest");
+	    url.addParameter(LoginRequestDispatcher.PARAM_USER_ID, URLEncoder.encode(extUsername, "UTF8"));
+	    url.addParameter(LoginRequestDispatcher.PARAM_METHOD, method);
+	    url.addParameter(LoginRequestDispatcher.PARAM_TIMESTAMP, timestamp);
+	    url.addParameter(LoginRequestDispatcher.PARAM_SERVER_ID, consumerKey);
+	    url.addParameter(LoginRequestDispatcher.PARAM_HASH, hash);
+	    url.addParameter(LoginRequestDispatcher.PARAM_COURSE_ID, contextId);
+	    url.addParameter(CentralConstants.PARAM_COURSE_NAME, contextLabel);
+	    url.addParameter(LoginRequestDispatcher.PARAM_COUNTRY, country);
+	    url.addParameter(LoginRequestDispatcher.PARAM_LANGUAGE, lang);
+	    url.addParameter(LoginRequestDispatcher.PARAM_FIRST_NAME, firstName);//TODO ?? URLEncoder.encode(queryString, "UTF-8");
+	    url.addParameter(LoginRequestDispatcher.PARAM_LAST_NAME, lastName);//TODO ?? URLEncoder.encode(queryString, "UTF-8");
+	    url.addParameter(LoginRequestDispatcher.PARAM_LESSON_ID, lessonId);
+	    url.addParameter(LoginRequestDispatcher.PARAM_EMAIL, email);
+	    url.addParameter("redirectURL", redirectUrl.build().toString());
+	    response.sendRedirect(response.encodeRedirectURL(url.build().toString()));
+
+	} catch (URISyntaxException e) {
+	    throw new ServletException("Error creating URL for LoginRequest", e);
+	}
+
+    }
+
+    @Override
+    public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+	doGet(request, response);
+    }
+
+    /**
+     * 
+     * @param localeStr
+     *            the full balckboard locale string
+     * @return the language
+     */
+    private static String getLanguage(String localeStr) {
+	if (localeStr == null)
+	    return "xx";
+	String[] split = localeStr.split("_");
+	return split[0];
+    }
+
+    /**
+     * 
+     * @param localeStr
+     *            the full balckboard locale string
+     * @return the country
+     */
+    private static String getCountry(String localeStr) {
+	if (localeStr == null)
+	    return "XX";
+	String[] split = localeStr.split("_");
+
+	//default country set to AU
+	String country = split.length > 1 ? split[1] : "AU";
+	return country;
+    }
+
+    private void initServices() {
+	if (integrationService == null) {
+	    integrationService = (IntegrationService) WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServletContext()).getBean("integrationService");
+	}
+
+	if (userManagementService == null) {
+	    userManagementService = (IUserManagementService) WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServletContext()).getBean("userManagementService");
+	}
+    }
+}
Index: lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -0,0 +1,308 @@
+package org.lamsfoundation.lams.web.action;
+
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionRedirect;
+import org.apache.tomcat.util.json.JSONException;
+import org.imsglobal.lti.BasicLTIConstants;
+import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
+import org.lamsfoundation.lams.integration.ExtCourseClassMap;
+import org.lamsfoundation.lams.integration.ExtServerLessonMap;
+import org.lamsfoundation.lams.integration.ExtServerOrgMap;
+import org.lamsfoundation.lams.integration.ExtUserUseridMap;
+import org.lamsfoundation.lams.integration.UserInfoFetchException;
+import org.lamsfoundation.lams.integration.UserInfoValidationException;
+import org.lamsfoundation.lams.integration.service.IIntegrationService;
+import org.lamsfoundation.lams.integration.service.IntegrationService;
+import org.lamsfoundation.lams.integration.util.LoginRequestDispatcher;
+import org.lamsfoundation.lams.integration.util.LtiUtils;
+import org.lamsfoundation.lams.learningdesign.service.ILearningDesignService;
+import org.lamsfoundation.lams.lesson.LearnerProgress;
+import org.lamsfoundation.lams.lesson.Lesson;
+import org.lamsfoundation.lams.lesson.dto.LearnerProgressDTO;
+import org.lamsfoundation.lams.lesson.service.ILessonService;
+import org.lamsfoundation.lams.monitoring.service.IMonitoringService;
+import org.lamsfoundation.lams.security.ISecurityService;
+import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.Role;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.usermanagement.exception.UserAccessDeniedException;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.CentralConstants;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.lamsfoundation.lams.workspace.service.IWorkspaceManagementService;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ * Shows either addLesson.jsp or learnerMonitor.jsp pages.
+ * 
+ * @author Andrey Balan
+ */
+public class LtiAction extends LamsDispatchAction {
+
+    private static Logger log = Logger.getLogger(LtiAction.class);
+    private static IIntegrationService integrationService = null;
+    private static IMonitoringService monitoringService = null;
+    private static IUserManagementService userManagementService = null;
+    private static ILearningDesignService learningDesignService;
+    private static ILessonService lessonService = null;
+    private static IWorkspaceManagementService workspaceManagementService;
+    private static ISecurityService securityService;
+
+    /**
+     * Single entry point to LAMS LTI processing mechanism. It determines here whether to show author or learnerMonitor
+     * pages
+     */
+    public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, UserAccessDeniedException, JSONException,
+	    RepositoryCheckedException, UserInfoFetchException, UserInfoValidationException {
+	initServices();
+	String consumerKey = request.getParameter(LtiUtils.OAUTH_CONSUMER_KEY);
+	String resourceLinkId = request.getParameter(BasicLTIConstants.RESOURCE_LINK_ID);
+	String tcGradebookId = request.getParameter(BasicLTIConstants.LIS_RESULT_SOURCEDID);
+	String extUserId = request.getParameter(BasicLTIConstants.USER_ID);
+	
+	ExtServerLessonMap lesson = integrationService.getLtiConsumerLesson(consumerKey, resourceLinkId);
+	
+	//update lessonFinishCallbackUrl. We store it one time during the very first call to LAMS and it stays the same all the time afterwards
+	String lessonFinishCallbackUrl = request.getParameter(BasicLTIConstants.LIS_OUTCOME_SERVICE_URL);
+	ExtServerOrgMap extServer = integrationService.getExtServerOrgMap(consumerKey);
+	if (StringUtils.isNotBlank(lessonFinishCallbackUrl) && StringUtils.isBlank(extServer.getLessonFinishUrl())) {
+	    extServer.setLessonFinishUrl(lessonFinishCallbackUrl);
+	    userManagementService.save(extServer);
+	}
+
+	//check if learner tries to access the link that hasn't been authored by teacher yet
+	String method = request.getParameter("_" + LoginRequestDispatcher.PARAM_METHOD);
+	if (LoginRequestDispatcher.METHOD_LEARNER_STRICT_AUTHENTICATION.equals(method) && lesson == null) {
+	    String errorMsg = "Learner tries to access the link that hasn't been authored by teacher yet. resource_link_id: "
+		    + tcGradebookId;
+	    log.debug(errorMsg);
+	    request.setAttribute("error", errorMsg);
+	    request.setAttribute("javax.servlet.error.exception", new UserAccessDeniedException(errorMsg));
+	    return mapping.findForward("error");
+	}
+
+	//determine whether to show author or learnerMonitor pages	
+	if (lesson == null) {
+	    return addLesson(mapping, form, request, response);
+	    
+	} else {
+
+	    //as per LTI spec we need to update tool consumer's gradebook id on every LTI call 
+	    ExtUserUseridMap extUserMap = integrationService.getExistingExtUserUseridMap(extServer, extUserId);
+	    extUserMap.setTcGradebookId(tcGradebookId);
+	    userManagementService.save(extUserMap);
+
+	    return learnerMonitor(mapping, form, request, response);
+	}
+
+    }
+
+    /**
+     * When teacher accesses link for the very first time, we show him addLesson page where he can choose learning
+     * design and start a lesson.
+     */
+    public ActionForward addLesson(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, UserAccessDeniedException, JSONException,
+	    RepositoryCheckedException, UserInfoFetchException, UserInfoValidationException {
+	initServices();
+	Integer userId = getUser().getUserID();
+	String contextId = request.getParameter(BasicLTIConstants.CONTEXT_ID);
+	String consumerKey = request.getParameter(LtiUtils.OAUTH_CONSUMER_KEY);
+	String resourceLinkId = request.getParameter(BasicLTIConstants.RESOURCE_LINK_ID);
+	String resourceLinkTitle = request.getParameter(BasicLTIConstants.RESOURCE_LINK_TITLE);
+	String resourceLinkDescription = request.getParameter(BasicLTIConstants.RESOURCE_LINK_DESCRIPTION);
+
+	ExtServerOrgMap extServer = integrationService.getExtServerOrgMap(consumerKey);
+	ExtCourseClassMap orgMap = integrationService.getExtCourseClassMap(extServer.getSid(), contextId);
+	Integer organisationId = orgMap.getOrganisation().getOrganisationId();
+	//only monitors are allowed to create lesson
+	if (!securityService.isGroupMonitor(organisationId, userId, "add lesson", false)) {
+	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a monitor in the organisation");
+	    return null;
+	}
+
+	// get all user accessible folders and LD descriptions as JSON
+	String folderContentsJSON = workspaceManagementService.getFolderContentsJSON(null, userId, false);
+	request.setAttribute("folderContents", folderContentsJSON);
+	request.setAttribute(LtiUtils.OAUTH_CONSUMER_KEY, consumerKey);
+	request.setAttribute(BasicLTIConstants.RESOURCE_LINK_ID, resourceLinkId);
+	request.setAttribute(CentralConstants.ATTR_COURSE_ID, organisationId);
+	request.setAttribute(BasicLTIConstants.CONTEXT_ID, contextId);
+	request.setAttribute(CentralConstants.PARAM_TITLE, resourceLinkTitle);
+	request.setAttribute(CentralConstants.PARAM_DESC, resourceLinkDescription);
+
+	return mapping.findForward("addLesson");
+    }
+
+    /**
+     * Starts a lesson. Then prompts to learnerMonitor page.
+     */
+    public ActionForward startLesson(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, UserAccessDeniedException, JSONException,
+	    RepositoryCheckedException, UserInfoValidationException, UserInfoFetchException {
+	initServices();
+	Integer userId = getUser().getUserID();
+	User user = getRealUser(getUser());
+
+	String consumerKey = request.getParameter(LtiUtils.OAUTH_CONSUMER_KEY);
+	String resourceLinkId = request.getParameter(BasicLTIConstants.RESOURCE_LINK_ID);
+	String title = request.getParameter(CentralConstants.PARAM_TITLE);
+	String desc = request.getParameter(CentralConstants.PARAM_DESC);
+	String ldIdStr = request.getParameter(CentralConstants.PARAM_LEARNING_DESIGN_ID);
+	String contextId = request.getParameter(BasicLTIConstants.CONTEXT_ID);
+	Integer organisationId = new Integer(WebUtil.readIntParam(request, CentralConstants.ATTR_COURSE_ID));
+	boolean enableLessonIntro = WebUtil.readBooleanParam(request, "enableLessonIntro", false);
+	
+	//only monitors are allowed to create lesson
+	if (!securityService.isGroupMonitor(organisationId, userId, "add lesson", false)) {
+	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a monitor in the organisation");
+	    return null;
+	}
+
+	ExtServerOrgMap extServer = integrationService.getExtServerOrgMap(consumerKey);
+	Organisation organisation = monitoringService.getOrganisation(organisationId);
+
+	// 1. init lesson
+	Lesson lesson = monitoringService.initializeLesson(title, desc, new Long(ldIdStr),
+		organisation.getOrganisationId(), user.getUserId(), null, false, enableLessonIntro, false, false,
+		true, true, false, false, null, null);
+	// 2. create lessonClass for lesson
+	List<User> staffList = new LinkedList<User>();
+	staffList.add(user);
+	List<User> learnerList = new LinkedList<User>();
+	Vector<User> learnerVector = userManagementService
+		.getUsersFromOrganisationByRole(organisation.getOrganisationId(), Role.LEARNER, true);
+	learnerList.addAll(learnerVector);
+	monitoringService.createLessonClassForLesson(lesson.getLessonId(), organisation,
+		organisation.getName() + "Learners", learnerList, organisation.getName() + "Staff", staffList,
+		user.getUserId());
+	// 3. start lesson
+	monitoringService.startLesson(lesson.getLessonId(), user.getUserId());
+	// store information which extServer has started the lesson
+	integrationService.createExtServerLessonMap(lesson.getLessonId(), resourceLinkId, extServer);
+
+	//set roles to contain monitor so that the user can see monitor link
+	ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig("learnerMonitorRedirect"));
+	redirect.addParameter(LtiUtils.OAUTH_CONSUMER_KEY, consumerKey);
+	redirect.addParameter(BasicLTIConstants.RESOURCE_LINK_ID, resourceLinkId);
+	redirect.addParameter(BasicLTIConstants.CONTEXT_ID, contextId);
+	return redirect;
+    }
+
+    /**
+     * Once lesson was created, start showing learnerMonitor page to everybody regardless of his role.
+     */
+    public ActionForward learnerMonitor(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, UserAccessDeniedException, JSONException,
+	    RepositoryCheckedException, UserInfoValidationException, UserInfoFetchException {
+	initServices();
+	Integer userId = getUser().getUserID();
+	String consumerKey = request.getParameter(LtiUtils.OAUTH_CONSUMER_KEY);
+	String resourceLinkId = request.getParameter(BasicLTIConstants.RESOURCE_LINK_ID);
+	
+	//get orgId
+//	String contextId = request.getParameter(BasicLTIConstants.CONTEXT_ID);
+//	ExtServer extServer = integrationService.getExtServer(consumerKey);
+//	ExtCourseClassMap orgMap = integrationService.getExtCourseClassMap(extServer.getSid(), contextId);
+//	Integer organisationId = orgMap.getOrganisation().getOrganisationId();
+
+	//get lesson
+	ExtServerLessonMap extLesson = integrationService.getLtiConsumerLesson(consumerKey, resourceLinkId);
+	Long lessonId = extLesson.getLessonId();
+	Lesson lesson = (Lesson) userManagementService.findById(Lesson.class, lessonId);
+
+	//set all required attributes for jsp
+	request.setAttribute("lessonId", lessonId);
+	request.setAttribute("ldId", lesson.getLearningDesign().getLearningDesignId());
+	request.setAttribute("title", lesson.getLessonName());
+	request.setAttribute("description", lesson.getLessonDescription());
+	request.setAttribute("isDisplayDesignImage", lesson.isDisplayDesignImage());
+	boolean isMonitor = securityService.isLessonMonitor(lessonId, userId, "learner monitor", false);
+	request.setAttribute("isMonitor", isMonitor);
+
+	//get learnerProgressDto
+	LearnerProgress learnProg = lessonService.getUserProgressForLesson(userId, lessonId);
+	if (learnProg != null) {
+	    LearnerProgressDTO learnerProgress = learnProg.getLearnerProgressData();
+	    request.setAttribute("learnerProgressDto", learnerProgress);
+	}
+	
+	// check if we need to create svg, png files on the server
+//	if (lesson.isDisplayDesignImage() && lesson.getLearnerProgresses().isEmpty()) {
+//	    Long learningDesignId = lesson.getLearningDesign().getLearningDesignId();
+//	    learningDesignService.createLearningDesignSVG(learningDesignId, SVGGenerator.OUTPUT_FORMAT_SVG);
+//	    learningDesignService.createLearningDesignSVG(learningDesignId, SVGGenerator.OUTPUT_FORMAT_PNG);
+//	}
+
+	return mapping.findForward("learnerMonitor");
+    }
+
+    private UserDTO getUser() {
+	HttpSession ss = SessionManager.getSession();
+	return (UserDTO) ss.getAttribute(AttributeNames.USER);
+    }
+
+    private User getRealUser(UserDTO dto) {
+	return userManagementService.getUserByLogin(dto.getLogin());
+    }
+
+    private void initServices() {
+	if (integrationService == null) {
+	    integrationService = (IntegrationService) WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServlet().getServletContext()).getBean("integrationService");
+	}
+
+	if (monitoringService == null) {
+	    monitoringService = (IMonitoringService) WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServlet().getServletContext()).getBean("monitoringService");
+	}
+
+	if (userManagementService == null) {
+	    userManagementService = (IUserManagementService) WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServlet().getServletContext())
+		    .getBean("userManagementService");
+	}
+	
+	if (learningDesignService == null) {
+	    learningDesignService = (ILearningDesignService) WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServlet().getServletContext())
+		    .getBean("learningDesignService");
+	}
+
+	if (lessonService == null) {
+	    lessonService = (ILessonService) WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServlet().getServletContext()).getBean("lessonService");
+	}
+
+	if (workspaceManagementService == null) {
+	    WebApplicationContext webContext = WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServlet().getServletContext());
+	    workspaceManagementService = (IWorkspaceManagementService) webContext.getBean("workspaceManagementService");
+	}
+
+	if (securityService == null) {
+	    WebApplicationContext webContext = WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServlet().getServletContext());
+	    securityService = (ISecurityService) webContext.getBean("securityService");
+	}
+    }
+
+}
Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
===================================================================
diff -u -r209169e5b23bcde0a00dc86cd250e83c9ac76492 -rde884cf8c730a25d2f2296f7a768d3fd45508c99
--- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java	(.../LessonManagerServlet.java)	(revision 209169e5b23bcde0a00dc86cd250e83c9ac76492)
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java	(.../LessonManagerServlet.java)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -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
===================================================================
diff -u -r9eaeb8328024c0c652dd7d17372dc4caf3a5852c -rde884cf8c730a25d2f2296f7a768d3fd45508c99
--- lams_central/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 9eaeb8328024c0c652dd7d17372dc4caf3a5852c)
+++ lams_central/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -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
===================================================================
diff -u -r654c98e30631f9b0cb5bd4ebab7d82b2cfb8e384 -rde884cf8c730a25d2f2296f7a768d3fd45508c99
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 654c98e30631f9b0cb5bd4ebab7d82b2cfb8e384)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -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
===================================================================
diff -u -r0ddeb3a1dcf29cbbba6ed0fccbd139f9c31c347f -rde884cf8c730a25d2f2296f7a768d3fd45508c99
--- lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision 0ddeb3a1dcf29cbbba6ed0fccbd139f9c31c347f)
+++ lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -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();
 			}
 		}
-	// -->
Index: lams_central/web/lti/addLesson.jsp
===================================================================
diff -u
--- lams_central/web/lti/addLesson.jsp	(revision 0)
+++ lams_central/web/lti/addLesson.jsp	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -0,0 +1,281 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
+		"http://www.w3.org/TR/html4/loose.dtd">
+
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-function" prefix="fn"%>
+<c:set var="lams" ><lams:LAMSURL/></c:set>
+
+<lams:html>
+<lams:head>
+	<title><fmt:message key="title.author.window"/></title>
+	
+	<lams:css />
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-redmond-theme.css" type="text/css" media="screen">
+	<link type="text/css" rel="stylesheet" href="<lams:LAMSURL/>css/yui/treeview.css">
+	<link type="text/css" rel="stylesheet" href="<lams:LAMSURL/>css/yui/folders.css">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/authoring.css" type="text/css" media="screen">
+	<style>
+		a, a:hover {
+			border-bottom: none;
+		}
+		/*.ygtvfocus .ygtvlabel, .ygtvfocus .ygtvlabel:link, .ygtvfocus ygtvlabel:visited, .ygtvfocus .ygtvlabel:hover {
+			background-color: white;
+		}*/
+		#title-table {
+			padding-top: 10px;
+			padding-bottom: 20px;
+		}
+		#preview-button {
+			visibility: hidden;
+		}
+		#design-image {
+			margin-top: 10px;
+		}
+	</style>
+	
+	<script type="text/javascript" src="includes/javascript/yui/yahoo-dom-event.js" ></script>
+	<script type="text/javascript" src="includes/javascript/yui/animation-min.js"></script>
+	<script type="text/javascript" src="includes/javascript/yui/json-min.js" ></script> 
+	<script type="text/javascript" src="includes/javascript/yui/treeview-min.js" ></script>
+	<script type="text/javascript" src="includes/javascript/getSysInfo.js"></script>
+	<script type="text/javascript" src="loadVars.jsp"></script>
+	<script type="text/javascript" src="includes/javascript/openUrls.js"></script>
+	<script type="text/javascript" src="includes/javascript/addLesson.js"></script>	
+	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="includes/javascript/jquery.dialogextend.js"></script>	
+	<script type="text/javascript" src="includes/javascript/dialog.js"></script>
+	<script type="text/javascript" src="includes/javascript/groupDisplay.js"></script>	
+	<script type="text/javascript">
+    	var isSelected = false;
+		var tree;
+		var userId = '<lams:user property="userID"/>',
+			LAMS_URL = '<lams:LAMSURL/>',
+			LABEL_RUN_SEQUENCES_FOLDER = '<fmt:message key="label.tab.lesson.sequence.folder" />',
+			LABEL_NAME_INVALID_CHARACTERS = '<fmt:message key="error.lessonname.invalid.characters" />';
+	
+	$(document).ready(function (){
+
+		// generate LD initial tree; folderContents is declared in newLesson.jsp
+		var treeNodes = parseFolderContents(${folderContents});
+		
+		// there should be no focus, just highlight
+		//YAHOO.widget.TreeView.FOCUS_CLASS_NAME = null;
+		tree = new YAHOO.widget.TreeView('learningDesignTree', treeNodes);
+		tree.setDynamicLoad(function(node, callback){
+			// load subfolder contents
+			$.ajax({
+				url : LAMS_URL + 'home.do',
+				data : {
+					'method' : 'getFolderContents',
+					'folderID' : node.data.folderID
+				},
+				cache : false,
+				async: false,
+				dataType : 'json',
+				success : function(result) {
+					var childNodeData = parseFolderContents(result);
+					$.each(childNodeData, function(){
+							new YAHOO.widget.TextNode(this, node);
+						});
+					}
+				}
+			);
+			
+			// required by YUI
+			callback();
+		});
+
+		tree.singleNodeHighlight = true;
+		tree.subscribe('clickEvent', function(event){
+	         // if the selected object is a sequence (id!=0) then we assign the id to the hidden ldId
+	         // also if the name is blank we just add the name of the sequence to the name too.
+	         var obj = event.node.data.learningDesignId;
+				
+	         document.getElementsByName("ldId")[0].value = obj;
+
+	         if ((typeof obj === "undefined") || (obj==0)) {
+	         	isSelected = false;
+	     		document.getElementById('preview-button').style.visibility='hidden';
+	     		
+	         } else {
+	         	if (document.getElementsByName("title")[0].value == '') {
+	         	    document.getElementsByName("title")[0].value = name;
+	         	}
+	         	isSelected = true;
+	         	document.getElementById('preview-button').style.visibility='visible';
+	         }
+		});
+		tree.subscribe('clickEvent',tree.onEventToggleHighlight);
+		tree.render();
+		
+		// expand the first (user) folder
+		tree.getRoot().children[0].expand();
+
+	});
+
+	function openPreview() {
+    	var ldId = document.getElementsByName("ldId")[0].value;
+        var title = document.lessonForm.title.value;
+		
+		// initialize, create and enter the preview lesson
+		$.ajax({
+			url : LAMS_URL + 'monitoring/monitoring.do',
+			data : {
+				'method' : 'initializeLesson',
+				'learningDesignID' : ldId,
+				'copyType' : 3,
+				'lessonName' : "<fmt:message key='authoring.fla.preview.lesson.default.title' />"
+			},
+			cache : false,
+			dataType : 'text',
+			success : function(lessonID) {
+				if (!lessonID) {
+					alert("<fmt:message key='authoring.fla.preview.error' />");
+					return;
+				}
+				
+				$.ajax({
+					url : LAMS_URL + 'monitoring/monitoring.do',
+					data : {
+						'method' : 'startPreviewLesson',
+						'lessonID' : lessonID
+					},
+					cache : false,
+					dataType : 'text',
+					success : function() {
+						// open preview pop up window
+						window.open(LAMS_URL + 'home.do?method=learner&mode=preview&lessonID='+lessonID,'Preview',
+									'width=920,height=700,resizable,status=yes');
+					}
+				});
+
+			}
+		});
+	}
+     
+     // Refresh the LAMS sequence list (tigra tree)
+     function refreshSeqList() {
+        document.getElementById("ldId").value="0";
+        document.location.reload();
+     }
+     
+     // Do form vaildation
+     // Check that a title has been supplied
+	function confirmSubmit() {
+         
+		var title = rettrim(document.lessonForm.title.value);
+		if ((title == "")||(title == null)) {
+			alert("<fmt:message key='authoring.fla.save.sequence.title.prompt' />");
+			return false;
+		}
+         if(!isSelected) {
+             //Error Message
+             alert("<fmt:message key='label.select.sequence' />");
+             return false;
+         }
+	}
+		
+     // Utility function to trim
+     function rettrim(stringToTrim) {
+         return stringToTrim.replace(/^\s+|\s+$/g,"");
+     }
+     
+     function receiveMessage(event) {
+     	var lamsServerUrl = "${lams}";
+     	alert(""+lamsServerUrl.substring(0, event.origin.length) + "!" + event.origin +"!" +event.data);
+     	
+     	// verify the sender of this message
+     	if ((lamsServerUrl.substring(0, event.origin.length) === event.origin) && (event.data == "refresh")) {
+     		window.location.reload();
+     	}
+     }
+     
+	if (window.addEventListener){
+		window.addEventListener("message", receiveMessage, false);
+	} else if (window.attachEvent){
+		window.attachEvent("message", receiveMessage);
+	}		
+
+	</script>
+	
+</lams:head>
+
+<body class="stripes">
+<c:set var="titlePage"><fmt:message key="label.create.lesson"/></c:set>
+<lams:Page type="learner" title="${titlePage}">
+		
+	<%-- Form to Collect ID of Selected LAMS Sequence --%>
+    <form name="lessonForm" id="lesson-form" action="lti.do?method=startLesson" method="post" onSubmit="return confirmSubmit();">
+    	<input type="hidden" name="oauth_consumer_key" value="${oauth_consumer_key}">
+    	<input type="hidden" name="resource_link_id" value="${resource_link_id}">
+        <input type="hidden" name="courseId" value="${courseId}">
+        <input type="hidden" name="context_id" value="${context_id}">
+    	<input type="hidden" name="ldId" id="ldId" value="0">
+    	
+    	<table class="table  table-no-border">
+			<tr>
+				<td>
+					<label for="title">
+						<fmt:message key="authoring.fla.page.dialog.ld.title" />
+					</label>
+				</td>
+				<td>
+					<input type="text" name="title" size="70" id="title" value="${title}" class="form-control"/>
+				<td>
+			</tr>
+			
+			<tr>
+				<td>
+					<label for="desc">
+						<fmt:message key="authoring.fla.page.prop.description" />
+					</label>
+				</td>
+				<td>
+					<textarea name="desc" cols="70" rows="3" id="desc" class="form-control">${desc}</textarea>
+				</td>
+			</tr>
+		</table>
+            
+		<lams:SimplePanel titleKey="label.choose.sequence">
+		
+			<%-- Preview and Author Buttons --%>			    
+			<div class="pull-right">
+				<a id="preview-button" class="btn btn-default" href="javascript:openPreview();" title="<fmt:message key="authoring.fla.preview.lesson.default.title" />">
+					<fmt:message key="authoring.fla.preview.lesson.default.title" />
+				</a>
+				
+				<a class="btn btn-default" href="javascript:showAuthoringDialog();" title="<fmt:message key="label.author.sequence" />">
+					<fmt:message key="label.author.sequence" />
+				</a>
+				
+				<a class="btn btn-default" href="javascript:window.location.reload();" title="<fmt:message key="authoring.fla.refresh.button" />">
+					<fmt:message key="authoring.fla.refresh.button" />
+				</a>
+			</div>
+	            
+			<div id="learningDesignTree"></div>
+			<div id="updatesequence"></div>
+					
+			<p>
+				<input type="checkbox" name="enableLessonIntro" class="noBorder" id="design-image" value="true"/>
+				<label for="design-image">
+					<fmt:message key="label.display.design.image" />
+				</label>
+			</p>
+		</lams:SimplePanel>
+		
+		<input type="submit" class="btn btn-primary pull-right" name="addNewLtiConsumer" value="<fmt:message key='authoring.fla.save.button' />" />
+    </form>
+	   
+	<div id="footer"></div>
+	
+</lams:Page>
+</body>
+	
+</lams:html>
+ 
Index: lams_central/web/lti/learnerMonitor.jsp
===================================================================
diff -u
--- lams_central/web/lti/learnerMonitor.jsp	(revision 0)
+++ lams_central/web/lti/learnerMonitor.jsp	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -0,0 +1,105 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
+		"http://www.w3.org/TR/html4/loose.dtd">
+
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-function" prefix="fn"%>
+<c:set var="lams" ><lams:LAMSURL/></c:set>
+
+<lams:html>
+<lams:head>
+	<title><fmt:message key="title.author.window"/></title>
+	
+	<lams:css/>
+	<style type="text/css">
+		.smalltext {
+			text-align:right;
+			font-size: 0.75em;
+		}
+		.super {
+			position:relative;
+			bottom:0.5em;
+			color:red;
+			font-size:0.8em;
+		}
+		
+		#sequence-preview {padding: 10px; text-align: center;}
+	</style>
+	
+	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="includes/javascript/getSysInfo.js"></script>
+	<script type="text/javascript" src="loadVars.jsp"></script>
+	<script type="text/javascript" src="includes/javascript/openUrls.js"></script>
+	
+</lams:head>
+
+<body class="stripes">
+	
+	<lams:Page type="learner" title="${title}">
+
+		<c:if test="${not empty description}">
+			<p>
+				<c:out value="${description}" escapeXml="false"/>
+			</p>
+		</c:if>
+    
+		<c:if test="${isDisplayDesignImage}">
+			<div id="sequence-preview">
+				<img src="<lams:LAMSURL/>home.do?method=getLearningDesignThumbnail&ldId=${ldId}" alt="Sequence Preview" />
+			</div>
+		</c:if>
+    
+		<c:if test="${fn:length(learnerProgressDto.attemptedActivities) > 0 || learnerProgressDto.lessonComplete}">
+			<lams:SimplePanel titleKey="label.your.progress">
+		    	
+		    	<c:choose>    	
+			    	<c:when test="${!learnerProgressDto.lessonComplete}">
+				    	<p>
+				    		<fmt:message key="label.lesson.not.completed"/>
+				    	</p>
+				    	
+				    	<p>
+				    		<fmt:message key="label.you.completed.activities">
+				    			<fmt:param>
+				    				${fn:length(learnerProgressDto.completedActivities)}
+				    			</fmt:param>
+				    		</fmt:message> 
+				    		<span class="super">[*]</span>
+				    	</p>
+				    	
+				    	<div class="smalltext">
+				    		<span class="super">*</span>
+				    		<fmt:message key="label.total.activities.depend.on.path"/>
+				    	</div>
+				    </c:when>
+				    
+			    	<c:otherwise>
+			    	 	<p>
+				    		<fmt:message key="label.you.completed.this.lesson"/>
+				    	</p>
+			    	 </c:otherwise>
+		    	 </c:choose>
+		    </lams:SimplePanel>
+		</c:if>	
+		
+		<div class="voffset10 pull-right">
+	        <c:if test="${isMonitor}">
+	        	<a class="btn btn-default" href="javascript:openMonitorLesson(${lessonId});" title="<fmt:message key='label.open.monitor'/>">
+					<fmt:message key="label.open.monitor" />
+				</a>
+	        </c:if>
+	        
+	        <a class="btn btn-default" href="javascript:openLearner(${lessonId});" title="<fmt:message key='label.open.lesson'/>">
+				<fmt:message key="label.open.lesson" />
+			</a>
+        </div>
+        
+		<div id="footer"></div>
+
+	</lams:Page>
+
+</body>	
+</lams:html>
Index: lams_common/.classpath
===================================================================
diff -u -rf494ac5c2f49f92be600b6392d9c85c291df7bb7 -rde884cf8c730a25d2f2296f7a768d3fd45508c99
--- lams_common/.classpath	(.../.classpath)	(revision f494ac5c2f49f92be600b6392d9c85c291df7bb7)
+++ lams_common/.classpath	(.../.classpath)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -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
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -rde884cf8c730a25d2f2296f7a768d3fd45508c99
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerLessonMap.hbm.xml	(.../ExtServerLessonMap.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerLessonMap.hbm.xml	(.../ExtServerLessonMap.hbm.xml)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -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
===================================================================
diff -u -rd0a703641dee45b84a2cd9a011376a8f0d72c9fb -rde884cf8c730a25d2f2296f7a768d3fd45508c99
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	(.../ExtServerOrgMap.hbm.xml)	(revision d0a703641dee45b84a2cd9a011376a8f0d72c9fb)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	(.../ExtServerOrgMap.hbm.xml)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -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
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -rde884cf8c730a25d2f2296f7a768d3fd45508c99
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml	(.../ExtUserUseridMap.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml	(.../ExtUserUseridMap.hbm.xml)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -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/dbupdates/patch2040069.sql
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040069.sql	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040069.sql	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -0,0 +1,21 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+-- LDEV-3997 LAMS to become LTI compliant tool provider (version 1.1)
+CREATE TABLE lams_ext_server_type (
+       server_type_id INT(11) NOT NULL DEFAULT 0
+     , description VARCHAR(255) NOT NULL
+     , PRIMARY KEY (server_type_id)
+)ENGINE=InnoDB;
+
+INSERT INTO lams_ext_server_type VALUES (1, 'INTEGRATED SERVER');
+INSERT INTO lams_ext_server_type VALUES (2, 'LTI TOOL CONSUMER');
+
+ALTER TABLE lams_ext_server_org_map ADD COLUMN server_type_id INT(11) NOT NULL DEFAULT 1, ADD CONSTRAINT FK_lams_ext_server_type FOREIGN KEY (server_type_id) REFERENCES lams_ext_server_type(server_type_id);
+UPDATE lams_ext_server_org_map SET server_type_id=1;
+
+ALTER TABLE lams_ext_server_lesson_map ADD COLUMN resource_link_id VARCHAR(255);
+ALTER TABLE lams_ext_user_userid_map ADD COLUMN tc_gradebook_id VARCHAR(250);
+
+COMMIT;
+SET AUTOCOMMIT = 1;
Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerLessonMap.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rde884cf8c730a25d2f2296f7a768d3fd45508c99
--- lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerLessonMap.java	(.../ExtServerLessonMap.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerLessonMap.java	(.../ExtServerLessonMap.java)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -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
===================================================================
diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -rde884cf8c730a25d2f2296f7a768d3fd45508c99
--- lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerOrgMap.java	(.../ExtServerOrgMap.java)	(revision 5773f84ed608838de3521ecde87c52f3c72d478c)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerOrgMap.java	(.../ExtServerOrgMap.java)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -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
===================================================================
diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -rde884cf8c730a25d2f2296f7a768d3fd45508c99
--- lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java	(.../ExtUserUseridMap.java)	(revision 5773f84ed608838de3521ecde87c52f3c72d478c)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java	(.../ExtUserUseridMap.java)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -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
===================================================================
diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -rde884cf8c730a25d2f2296f7a768d3fd45508c99
--- lams_common/src/java/org/lamsfoundation/lams/integration/security/Authenticator.java	(.../Authenticator.java)	(revision 5773f84ed608838de3521ecde87c52f3c72d478c)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/security/Authenticator.java	(.../Authenticator.java)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -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
===================================================================
diff -u -r04324aeb5a29d6d1748ef57d871f24003fd32502 -rde884cf8c730a25d2f2296f7a768d3fd45508c99
--- lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java	(.../IIntegrationService.java)	(revision 04324aeb5a29d6d1748ef57d871f24003fd32502)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java	(.../IIntegrationService.java)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -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
===================================================================
diff -u -r098952533edfd1768dd3298aa0b939b6700a68ca -rde884cf8c730a25d2f2296f7a768d3fd45508c99
--- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java	(.../IntegrationService.java)	(revision 098952533edfd1768dd3298aa0b939b6700a68ca)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java	(.../IntegrationService.java)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -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
Index: lams_common/src/java/org/lamsfoundation/lams/integration/util/LtiUtils.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/integration/util/LtiUtils.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/util/LtiUtils.java	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -0,0 +1,79 @@
+package org.lamsfoundation.lams.integration.util;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class LtiUtils {
+
+    public static final String OAUTH_CONSUMER_KEY = "oauth_consumer_key";
+    
+    /**
+     * Return <code>true</code> if the user is an administrator.
+     * {Method added by LAMS}
+     *
+     * @return <code>true</code> if the user has a role of administrator
+     */
+    public static boolean isAdmin(String roles) {
+	List<String> rolesToSearchFor = new LinkedList<String>();
+	rolesToSearchFor.add("urn:lti:role:ims/lis/Administrator");
+	rolesToSearchFor.add("urn:lti:sysrole:ims/lis/SysAdmin");
+	rolesToSearchFor.add("urn:lti:sysrole:ims/lis/Administrator");
+	rolesToSearchFor.add("urn:lti:instrole:ims/lis/Administrator");
+	
+	return hasRole(roles, rolesToSearchFor);
+    }
+
+    /**
+     * Return <code>true</code> if the user is staff.
+     * {Method added by LAMS}
+     *
+     * @return <code>true</code> if the user has a role of instructor, contentdeveloper or teachingassistant
+     */
+    public static boolean isStaff(String roles) {
+	List<String> rolesToSearchFor = new LinkedList<String>();
+	rolesToSearchFor.add("urn:lti:role:ims/lis/Instructor");
+	rolesToSearchFor.add("urn:lti:role:ims/lis/ContentDeveloper");
+	rolesToSearchFor.add("urn:lti:role:ims/lis/TeachingAssistant");
+	
+	return hasRole(roles, rolesToSearchFor);
+    }
+
+    /**
+     * Return <code>true</code> if the user is a learner.
+     * {Method added by LAMS}
+     *
+     * @return <code>true</code> if the user has a role of learner
+     */
+    public static boolean isLearner(String roles) {
+	List<String> rolesToSearchFor = new LinkedList<String>();
+	rolesToSearchFor.add("urn:lti:role:ims/lis/Learner");
+	
+	return hasRole(roles, rolesToSearchFor);
+    }
+
+    /*
+     * Check whether the user has a specified role name.
+     * {Method added by LAMS}
+     *
+     * @param role
+     *            Name of role
+     *
+     * @return <code>true</code> if the user has the specified role
+     */
+    private static boolean hasRole(String roles, List<String> rolesToSearchFor) {
+	String[] roleArray = roles.split(",");
+	
+	boolean hasRole = false;
+	for (String role : roleArray) {
+	    for (String roleToSearchFor : rolesToSearchFor) {
+		if (role.equals(roleToSearchFor)) {
+		    hasRole = true;
+		    break;
+		}
+	    }
+	}
+
+	return hasRole;
+    }
+
+}
Index: lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml
===================================================================
diff -u -rd0a703641dee45b84a2cd9a011376a8f0d72c9fb -rde884cf8c730a25d2f2296f7a768d3fd45508c99
--- lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml	(.../integrationContext.xml)	(revision d0a703641dee45b84a2cd9a011376a8f0d72c9fb)
+++ lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml	(.../integrationContext.xml)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -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/tool/service/ILamsCoreToolService.java
===================================================================
diff -u -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 -rde884cf8c730a25d2f2296f7a768d3fd45508c99
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java	(.../ILamsCoreToolService.java)	(revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java	(.../ILamsCoreToolService.java)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -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
===================================================================
diff -u -r654c98e30631f9b0cb5bd4ebab7d82b2cfb8e384 -rde884cf8c730a25d2f2296f7a768d3fd45508c99
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java	(.../LamsCoreToolService.java)	(revision 654c98e30631f9b0cb5bd4ebab7d82b2cfb8e384)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java	(.../LamsCoreToolService.java)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -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/toolApplicationContext.xml
===================================================================
diff -u -rce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3 -rde884cf8c730a25d2f2296f7a768d3fd45508c99
--- lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml	(.../toolApplicationContext.xml)	(revision ce9f4e0c6d1e5814bf0dcb0fa16ae888a8c854a3)
+++ lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml	(.../toolApplicationContext.xml)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -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>
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
diff -u -rd0fb93bf0f849bdb0eaf6c02b664d8ec599a9878 -rde884cf8c730a25d2f2296f7a768d3fd45508c99
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision d0fb93bf0f849bdb0eaf6c02b664d8ec599a9878)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
@@ -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;
     }