Index: lams_bb_integration/WEB-INF/web.xml
===================================================================
diff -u -re145b2587e58d80c54fb208848e06d290c5473cd -rbbd946d0a18f784ff7f72d0cebaaa3828980dfd0
--- lams_bb_integration/WEB-INF/web.xml	(.../web.xml)	(revision e145b2587e58d80c54fb208848e06d290c5473cd)
+++ lams_bb_integration/WEB-INF/web.xml	(.../web.xml)	(revision bbd946d0a18f784ff7f72d0cebaaa3828980dfd0)
@@ -17,6 +17,10 @@
     <servlet-name>GradebookServlet</servlet-name>
     <servlet-class>org.lamsfoundation.ld.integration.blackboard.GradebookServlet</servlet-class>
   </servlet>
+  <servlet>
+    <servlet-name>GradebookSyncServlet</servlet-name>
+    <servlet-class>org.lamsfoundation.ld.integration.blackboard.GradebookSyncServlet</servlet-class>
+  </servlet>
 
   <servlet-mapping>
     <servlet-name>LamsLearningDesignServlet</servlet-name>
@@ -30,5 +34,9 @@
     <servlet-name>GradebookServlet</servlet-name>
     <url-pattern>/Gradebook</url-pattern>
   </servlet-mapping> 
+  <servlet-mapping>
+    <servlet-name>GradebookSyncServlet</servlet-name>
+    <url-pattern>/GradebookSync</url-pattern>
+  </servlet-mapping>   
  
 </web-app>
Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/GradebookServlet.java
===================================================================
diff -u -r4e613a7dbf696ef45eb9afec223c7abcab5e464f -rbbd946d0a18f784ff7f72d0cebaaa3828980dfd0
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/GradebookServlet.java	(.../GradebookServlet.java)	(revision 4e613a7dbf696ef45eb9afec223c7abcab5e464f)
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/GradebookServlet.java	(.../GradebookServlet.java)	(revision bbd946d0a18f784ff7f72d0cebaaa3828980dfd0)
@@ -47,6 +47,7 @@
 import org.apache.commons.codec.binary.Hex;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.ld.integration.Constants;
+import org.lamsfoundation.ld.util.LineitemUtil;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -85,10 +86,10 @@
 public class GradebookServlet extends HttpServlet {
 
     private static final long serialVersionUID = -3587062723412672084L;
-    static Logger logger = Logger.getLogger(GradebookServlet.class);
+    private static Logger logger = Logger.getLogger(GradebookServlet.class);
 
     /**
-     * Receives call from Lams ab lesson completion. After that get the latest marks for this user in this lesson and stores it in DB. <br>
+     * Receives call from Lams ab lesson completion. After that get the latest marks for this user in this lesson and stores it in DB. 
      */
     public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 
@@ -158,10 +159,7 @@
 		throw new ServletException("User not found with userName:" + userName);
 	    }
 
-	    String serverAddr = LamsSecurityUtil.getServerAddress();
-
-	    Document document = null;
-	    String serviceURL = serverAddr + "/services/xml/LessonManager?"
+	    String serviceURL = LamsSecurityUtil.getServerAddress() + "/services/xml/LessonManager?"
 		    + LamsSecurityUtil.generateAuthenticateParameters(ctx) + "&courseId="
 		    + "&method=toolOutputsUser&lsId=" + lamsLessonIdParam + "&outputsUser="
 		    + URLEncoder.encode(userName, "UTF8");
@@ -188,7 +186,7 @@
 	    // parse xml response
 	    DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
 	    DocumentBuilder db = dbf.newDocumentBuilder();
-	    document = db.parse(is);
+	    Document document = db.parse(is);
 	    
 	    
 	    NodeList activities = document.getDocumentElement().getFirstChild().getChildNodes();
@@ -216,65 +214,31 @@
 		
 	    }
             
-            //get lineitemid from the storage (bbContentId -> lineitemid)
-    	    PortalExtraInfo pei = PortalUtil.loadPortalExtraInfo(null, null, "LamsLineitemStorage");
-    	    ExtraInfo ei = pei.getExtraInfo();
-    	    String lineitemIdStr = ei.getValue(bbContentId);
-	
-	    //TODO remove the following paragraph after a while. (It deals with lineitems created in versions after 1.2 and before 1.2.3)
-	    Lineitem lineitem = null;
-	    if (lineitemIdStr == null) {
-        	CourseDbLoader cLoader = CourseDbLoader.Default.getInstance();
-        	LineitemDbLoader lineitemLoader = LineitemDbLoader.Default.getInstance();
-        
-        	List<Course> userCourses = cLoader.loadByUserId(ctx.getUserId());
-        
-        	// search for appropriate lineitem
-        	lineitem = null;
-        	for (Course userCourse : userCourses) {
-        	    List<Lineitem> lineitems = lineitemLoader.loadByCourseId(userCourse.getId());
-        
-        	    for (Lineitem lineitemIter : lineitems) {
-        		if (lineitemIter.getAssessmentId() != null && lineitemIter.getAssessmentId().equals(lamsLessonIdParam)) {
-        		    lineitem = lineitemIter;
-        		    break;
-        		}
-        	    }
-        	}
-       	    } else {
-       	    
-		Id lineitemId = bbPm.generateId(Lineitem.LINEITEM_DATA_TYPE, lineitemIdStr.trim());
-		LineitemDbLoader lineitemLoader = (LineitemDbLoader) bbPm.getLoader(LineitemDbLoader.TYPE);
-		lineitem = lineitemLoader.loadById(lineitemId);
-       	    }
+	    Lineitem lineitem = LineitemUtil.getLineitem(bbContentId, ctx, lamsLessonIdParam);
 
-	    if (lineitem == null) {
-		throw new ServletException("lineitem not found");
-	    }
-
 	    // store new score
 	    CourseMembershipDbLoader memLoader = (CourseMembershipDbLoader) bbPm
 		    .getLoader(CourseMembershipDbLoader.TYPE);
 	    ScoreDbLoader scoreLoader = (ScoreDbLoader) bbPm.getLoader(ScoreDbLoader.TYPE);
 	    ScoreDbPersister scorePersister = (ScoreDbPersister) bbPm.getPersister(ScoreDbPersister.TYPE);
-	    CourseMembership cms = memLoader.loadByCourseAndUserId(lineitem.getCourseId(), ctx.getUserId());
-	    Score current_score = null;
+	    CourseMembership courseMembership = memLoader.loadByCourseAndUserId(lineitem.getCourseId(), ctx.getUserId());
+	    Score currentScore = null;
 	    try {
-		current_score = scoreLoader.loadByCourseMembershipIdAndLineitemId(cms.getId(), lineitem.getId());
+		currentScore = scoreLoader.loadByCourseMembershipIdAndLineitemId(courseMembership.getId(), lineitem.getId());
 	    } catch (KeyNotFoundException c) {
-		current_score = new Score();
-		current_score.setLineitemId(lineitem.getId());
-		current_score.setCourseMembershipId(cms.getId());
+		currentScore = new Score();
+		currentScore.setLineitemId(lineitem.getId());
+		currentScore.setCourseMembershipId(courseMembership.getId());
 	    }
 
 	    //set score grade. if Lams supplies one (and lineitem will have score type) we set score; otherwise (and lineitme of type Complete/Incomplete) we set 0
 	    float gradebookMark = 0;
 	    if (maxResult > 0) {
 		gradebookMark = (userResult / maxResult) * Constants.GRADEBOOK_POINTS_POSSIBLE;
 	    }
-	    current_score.setGrade(new DecimalFormat("##.##").format(gradebookMark));
-	    current_score.validate();
-	    scorePersister.persist(current_score);
+	    currentScore.setGrade(new DecimalFormat("##.##").format(gradebookMark));
+	    currentScore.validate();
+	    scorePersister.persist(currentScore);
 	    
 	} catch (MalformedURLException e) {
 	    throw new ServletException("Unable to get LAMS learning designs, bad URL: "
Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/GradebookSyncServlet.java
===================================================================
diff -u
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/GradebookSyncServlet.java	(revision 0)
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/GradebookSyncServlet.java	(revision bbd946d0a18f784ff7f72d0cebaaa3828980dfd0)
@@ -0,0 +1,273 @@
+/**************************************************************** 
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) 
+ * ============================================================= 
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/ 
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation. 
+ * 
+ * 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 
+ * **************************************************************** 
+ */
+
+/* $Id$ */
+package org.lamsfoundation.ld.integration.blackboard;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.ConnectException;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.text.DecimalFormat;
+import java.util.Set;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.log4j.Logger;
+import org.lamsfoundation.ld.integration.Constants;
+import org.lamsfoundation.ld.util.LineitemUtil;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+import blackboard.base.BbList;
+import blackboard.data.content.Content;
+import blackboard.data.content.CourseDocument;
+import blackboard.data.course.CourseMembership;
+import blackboard.data.gradebook.Lineitem;
+import blackboard.data.gradebook.Score;
+import blackboard.persist.BbPersistenceManager;
+import blackboard.persist.Container;
+import blackboard.persist.Id;
+import blackboard.persist.PkId;
+import blackboard.persist.content.ContentDbLoader;
+import blackboard.persist.course.CourseMembershipDbLoader;
+import blackboard.persist.gradebook.ScoreDbLoader;
+import blackboard.persist.gradebook.ScoreDbPersister;
+import blackboard.platform.BbServiceManager;
+import blackboard.platform.context.Context;
+import blackboard.platform.context.ContextManager;
+import blackboard.portal.data.ExtraInfo;
+import blackboard.portal.data.PortalExtraInfo;
+import blackboard.portal.servlet.PortalUtil;
+import blackboard.util.StringUtil;
+
+/**
+ * Monitor on BB side calls this servlet to syncronize lesson marks with LAMS Gradebook.
+ */
+public class GradebookSyncServlet extends HttpServlet {
+
+    private static final long serialVersionUID = -3587062723412672084L;
+    private static Logger logger = Logger.getLogger(GradebookSyncServlet.class);
+
+    /**
+     * Monitor on BB side calls this servlet to syncronize lesson marks with LAMS Gradebook. After that get the latest
+     * marks for this user in this lesson and stores it in DB.
+     */
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+	ContextManager ctxMgr = null;
+	int numberUpdatedScores = 0;
+	
+	try {
+	    // get Blackboard context
+	    ctxMgr = (ContextManager) BbServiceManager.lookupService(ContextManager.class);
+	    Context ctx = ctxMgr.setContext(request);
+
+	    // get Parameter values
+	    String lamsLessonIdParam = request.getParameter(Constants.PARAM_LESSON_ID);
+	    // validate method parameter
+	    if (lamsLessonIdParam == null) {
+		throw new RuntimeException("Requred parameters missing. lsid=" + lamsLessonIdParam);
+	    }
+
+	    // check if isGradebookcenter
+	    PortalExtraInfo portalExtraInfo = PortalUtil.loadPortalExtraInfo(null, null, "LamsStorage");
+	    ExtraInfo extraInfo = portalExtraInfo.getExtraInfo();
+	    Set<String> bbContentIds = extraInfo.getKeys();
+	    String bbContentId = null;
+	    for (String bbContentIdIter : bbContentIds) {
+		String lamsLessonId = extraInfo.getValue(bbContentIdIter);
+		if (lamsLessonIdParam.equals(lamsLessonId)) {
+		    bbContentId = bbContentIdIter;
+		    break;
+		}
+	    }
+	    
+	    // exit method as it was created in version prior to 1.2.1 and thus don't have lineitem
+	    if (bbContentId == null) {
+		response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+		response.getWriter().write("Can't syncronize lesson as it was created in version prior to 1.2.1 and thus don't have lineitem.");
+		return;
+	    }
+
+	    // check isGradecenter option is ON
+	    BbPersistenceManager bbPm = BbServiceManager.getPersistenceService().getDbPersistenceManager();
+	    Container bbContainer = bbPm.getContainer();
+	    Id contentId = new PkId(bbContainer, CourseDocument.DATA_TYPE, bbContentId);
+	    ContentDbLoader contentDbLoader = (ContentDbLoader) bbPm.getLoader(ContentDbLoader.TYPE);
+	    Content bbContent = (Content) contentDbLoader.loadById(contentId);
+	    // check isGradecenter option is ON
+	    if (!bbContent.getIsDescribed()) {// (isDescribed field is used for storing isGradecenter parameter)
+		response.setStatus(HttpServletResponse.SC_ACCEPTED);
+		response.getWriter().write("Can't syncronize lesson as it's gradecenter option is OFF.");
+		return;
+	    }
+
+	    String serviceURL = LamsSecurityUtil.getServerAddress() + "/services/xml/LessonManager?"
+		    + LamsSecurityUtil.generateAuthenticateParameters(ctx)
+		    + "&method=gradebookMarksLesson&lsId=" + lamsLessonIdParam;
+
+	    URL url = new URL(serviceURL);
+	    URLConnection conn = url.openConnection();
+	    if (!(conn instanceof HttpURLConnection)) {
+		throw new RuntimeException("Unable to open connection to: " + serviceURL);
+	    }
+
+	    HttpURLConnection httpConn = (HttpURLConnection) conn;
+
+	    if (httpConn.getResponseCode() != HttpURLConnection.HTTP_OK) {
+		String errorMsg = "HTTP Response Code: " + httpConn.getResponseCode() + ", HTTP Response Message: "
+			+ httpConn.getResponseMessage();
+//		response.sendError(HttpServletResponse.SC_UNAUTHORIZED, errorMsg);
+		response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+		response.getWriter().write(errorMsg);
+		return;
+	    }
+	    
+	    CourseMembershipDbLoader courseMemLoader = (CourseMembershipDbLoader) bbPm
+		    .getLoader(CourseMembershipDbLoader.TYPE);
+	    ScoreDbLoader scoreLoader = (ScoreDbLoader) bbPm.getLoader(ScoreDbLoader.TYPE);
+	    ScoreDbPersister scorePersister = (ScoreDbPersister) bbPm.getPersister(ScoreDbPersister.TYPE);
+
+	    // InputStream is = url.openConnection().getInputStream();
+	    InputStream is = conn.getInputStream();
+
+	    // parse xml response
+	    DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+	    DocumentBuilder db = dbf.newDocumentBuilder();
+	    Document document = db.parse(is);
+	    Node lesson = document.getDocumentElement().getFirstChild();
+	    Long lessonMaxPossibleMark = new Long(lesson.getAttributes().getNamedItem("lessonMaxPossibleMark").getNodeValue());
+	    NodeList learnerResults = lesson.getChildNodes();
+
+	    Lineitem lineitem = LineitemUtil.getLineitem(bbContentId, ctx, lamsLessonIdParam);
+	    //in order to reduce DB queries we get scores and courseMemberships all at once
+	    BbList<Score> dbScores = scoreLoader.loadByLineitemId(lineitem.getId());
+	    BbList<CourseMembership> courseMemberships = courseMemLoader.loadByCourseId(lineitem.getCourseId(), null, true);
+	    
+	    //update all marks
+	    for (CourseMembership courseMembership: courseMemberships) {
+		Id courseMembershipId = courseMembership.getId();
+		String userName = courseMembership.getUser().getUserName();
+		
+		// find old score
+		Score currentScore = null;
+		for (Score dbScore : dbScores) {
+		    if (dbScore.getCourseMembershipId().equals(courseMembershipId)) {
+			currentScore = dbScore;
+			break;
+		    }
+		}
+		
+		//find new score
+		for (int i = 0; i < learnerResults.getLength(); i++) {
+		    Node learnerResult = learnerResults.item(i);
+
+		    String extUsername = learnerResult.getAttributes().getNamedItem("extUsername").getNodeValue();
+
+		    if (userName.equals(extUsername)) {
+			String userTotalMarkStr = learnerResult.getAttributes().getNamedItem("userTotalMark")
+				.getNodeValue();
+			if (!StringUtil.isEmpty(userTotalMarkStr)) {
+			    double newScore = new Double(userTotalMarkStr);
+			    
+			    //update old score
+			    if (currentScore == null) {
+				currentScore = new Score();
+				currentScore.setLineitemId(lineitem.getId());
+				currentScore.setCourseMembershipId(courseMembershipId);
+			    }
+			    
+			    // set score grade. if Lams supplies one (and lineitem will have score type) we set score; otherwise (and
+			    // lineitme of type Complete/Incomplete) we set 0
+			    double gradebookMark = 0;
+			    if (lessonMaxPossibleMark > 0) {
+				gradebookMark = (newScore / lessonMaxPossibleMark) * Constants.GRADEBOOK_POINTS_POSSIBLE;
+			    }
+			    
+			    //calculate how many marks updated
+			    if (StringUtil.isEmpty(currentScore.getGrade()) || ! new Double(currentScore.getGrade()).equals(new Double(gradebookMark))) {
+				numberUpdatedScores++;
+			    }
+			    
+			    currentScore.setGrade(new DecimalFormat("##.##").format(gradebookMark));
+			    currentScore.validate();
+			    scorePersister.persist(currentScore);
+			}
+			break;
+		    }
+		}
+	    }
+
+	} catch (MalformedURLException e) {
+	    throw new ServletException("Unable to get LAMS learning designs, bad URL: "
+		    + ", please check lams.properties", e);
+	} catch (IllegalStateException e) {
+	    throw new ServletException(
+		    "LAMS Server timeout, did not get a response from the LAMS server. Please contact your systems administrator",
+		    e);
+	} catch (ConnectException e) {
+	    throw new ServletException(
+		    "LAMS Server timeout, did not get a response from the LAMS server. Please contact your systems administrator",
+		    e);
+	} catch (UnsupportedEncodingException e) {
+	    throw new ServletException(e);
+	} catch (IOException e) {
+	    throw new ServletException(e);
+	} catch (ParserConfigurationException e) {
+	    throw new ServletException(e);
+	} catch (SAXException e) {
+	    throw new ServletException(e);
+	} catch (Exception e) {
+	    throw new ServletException(e);
+	} finally {
+	    // make sure context is released
+	    if (ctxMgr != null) {
+		ctxMgr.releaseContext();
+	    }
+	}
+	
+	response.setContentType("text/html");
+	PrintWriter out = response.getWriter();
+        out.write("Complete! " + numberUpdatedScores + " marks have been updated/added to LMS Gradecenter.");
+	
+    }
+    
+    @Override
+    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+	doGet(req, resp);
+    }
+
+}
Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java
===================================================================
diff -u -r2a5e17d18466c93ae26f6a197fc9c626b58d38a9 -rbbd946d0a18f784ff7f72d0cebaaa3828980dfd0
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java	(.../LamsSecurityUtil.java)	(revision 2a5e17d18466c93ae26f6a197fc9c626b58d38a9)
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java	(.../LamsSecurityUtil.java)	(revision bbd946d0a18f784ff7f72d0cebaaa3828980dfd0)
@@ -49,6 +49,7 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 
+import blackboard.data.user.User;
 import blackboard.persist.PersistenceException;
 import blackboard.platform.context.Context;
 import blackboard.portal.data.ExtraInfo;
@@ -150,7 +151,8 @@
 	}
 
 	String timestamp = new Long(System.currentTimeMillis()).toString();
-	String username = ctx.getUser().getUserName();
+	 User user = ctx.getUser();
+	String username = user.getUserName();
 	String hash = generateAuthenticationHash(timestamp, username, serverId);
 
 	String authenticateParameters = "&serverId=" + serverId + "&datetime=" + timestamp + "&hashValue=" + hash
Index: lams_bb_integration/src/org/lamsfoundation/ld/util/LineitemUtil.java
===================================================================
diff -u -r4e613a7dbf696ef45eb9afec223c7abcab5e464f -rbbd946d0a18f784ff7f72d0cebaaa3828980dfd0
--- lams_bb_integration/src/org/lamsfoundation/ld/util/LineitemUtil.java	(.../LineitemUtil.java)	(revision 4e613a7dbf696ef45eb9afec223c7abcab5e464f)
+++ lams_bb_integration/src/org/lamsfoundation/ld/util/LineitemUtil.java	(.../LineitemUtil.java)	(revision bbd946d0a18f784ff7f72d0cebaaa3828980dfd0)
@@ -52,6 +52,7 @@
 import blackboard.persist.PersistenceException;
 import blackboard.persist.PkId;
 import blackboard.persist.content.ContentDbLoader;
+import blackboard.persist.course.CourseDbLoader;
 import blackboard.persist.gradebook.LineitemDbLoader;
 import blackboard.persist.gradebook.LineitemDbPersister;
 import blackboard.persist.gradebook.ext.OutcomeDefinitionScaleDbLoader;
@@ -226,7 +227,7 @@
 	ExtraInfo ei = pei.getExtraInfo();
 	String lineitemIdStr = ei.getValue(bbContentId);
 	
-	//TODO remove the following paragraph after a while. (It removes lineitems created in versions after 1.2 and before 1.2.3)
+	//TODO remove the entire following if-paragraph (incl. internal content) after a while. (It removes lineitems created in versions after 1.2 and before 1.2.3)
 	if (lineitemIdStr == null) {
 	    // get stored bbContentId -> lamsLessonId.
 	    PortalExtraInfo portalExtraInfo = PortalUtil.loadPortalExtraInfo(null, null, "LamsStorage");
@@ -269,4 +270,53 @@
 	Id lineitemId = bbPm.generateId(Lineitem.LINEITEM_DATA_TYPE, lineitemIdStr.trim());
 	return lineitemId;
     }
+    
+    /**
+     * Gets existing lineitem object.
+     * @throws ServletException 
+     * @throws PersistenceException 
+     */
+    public static Lineitem getLineitem(String bbContentId, Context ctx, String lamsLessonIdParam) throws ServletException, PersistenceException {
+	BbPersistenceManager bbPm = BbServiceManager.getPersistenceService().getDbPersistenceManager();
+	
+	// get lineitemid from the storage (bbContentId -> lineitemid)
+	PortalExtraInfo pei = PortalUtil.loadPortalExtraInfo(null, null, "LamsLineitemStorage");
+	ExtraInfo ei = pei.getExtraInfo();
+	String lineitemIdStr = ei.getValue(bbContentId);
+
+	// TODO remove the entire following if-paragraph (incl. internal content) after a while. (It deals with
+	// lineitems created in versions after 1.2 and before 1.2.3)
+	Lineitem lineitem = null;
+	if (lineitemIdStr == null) {
+	    CourseDbLoader cLoader = CourseDbLoader.Default.getInstance();
+	    LineitemDbLoader lineitemLoader = LineitemDbLoader.Default.getInstance();
+
+	    List<Course> userCourses = cLoader.loadByUserId(ctx.getUserId());
+
+	    // search for appropriate lineitem
+	    lineitem = null;
+	    for (Course userCourse : userCourses) {
+		List<Lineitem> lineitems = lineitemLoader.loadByCourseId(userCourse.getId());
+
+		for (Lineitem lineitemIter : lineitems) {
+		    if (lineitemIter.getAssessmentId() != null
+			    && lineitemIter.getAssessmentId().equals(lamsLessonIdParam)) {
+			lineitem = lineitemIter;
+			break;
+		    }
+		}
+	    }
+	} else {
+
+	    Id lineitemId = bbPm.generateId(Lineitem.LINEITEM_DATA_TYPE, lineitemIdStr.trim());
+	    LineitemDbLoader lineitemLoader = (LineitemDbLoader) bbPm.getLoader(LineitemDbLoader.TYPE);
+	    lineitem = lineitemLoader.loadById(lineitemId);
+	}
+
+	if (lineitem == null) {
+	    throw new ServletException("Lineitem was not found for contentId:" + bbContentId);
+	}
+
+	return lineitem;
+    }
 }
Index: lams_bb_integration/web/links/monitor.jsp
===================================================================
diff -u -r355d2371b4fbb0a4f1da03c97e5328524d0751e2 -rbbd946d0a18f784ff7f72d0cebaaa3828980dfd0
--- lams_bb_integration/web/links/monitor.jsp	(.../monitor.jsp)	(revision 355d2371b4fbb0a4f1da03c97e5328524d0751e2)
+++ lams_bb_integration/web/links/monitor.jsp	(.../monitor.jsp)	(revision bbd946d0a18f784ff7f72d0cebaaa3828980dfd0)
@@ -127,7 +127,7 @@
 	<bbNG:cssFile href="../includes/css/folders.css" />
 	<bbNG:cssBlock> 
 	<style type="text/css"> 
-		#monitor-button {
+		#monitor-button, #sync-button {
 			visibility:hidden;
 		}
 		#buttons {
@@ -138,6 +138,7 @@
 
 	<bbNG:jsFile href="includes/javascript/yahoo-dom-event.js" />
 	<bbNG:jsFile href="includes/javascript/treeview-min.js" />
+	<bbNG:jsFile href="includes/javascript/jquery.js" />
 	
 	<bbNG:breadcrumbBar environment="CTRL_PANEL" isContent="false">
 		<bbNG:breadcrumb>LAMS Monitor</bbNG:breadcrumb>
@@ -153,7 +154,12 @@
 				Monitor this lesson
 			</button>
 		</span>
-	</div> 
+		<span id="sync-button" class="yui-button yui-link-button">
+			<button id="sync-button-but" onclick="syncMarks(); return false;">
+				Sync marks with LAMS server
+			</button>
+		</span>
+	</div>
 	
 	<div id="treeDiv"></div>
 
@@ -168,6 +174,7 @@
 			
 			var visibility = (seqId != 0) ? 'visible' : 'hidden';
 		    document.getElementById('monitor-button').style.visibility=visibility;
+		    document.getElementById('sync-button').style.visibility=visibility;
 		}
 		
         // Open the LAMS Seuence Monitor Window
@@ -195,13 +202,42 @@
             
             return false;
         }
+        
+        // Open the LAMS Seuence Monitor Window
+        function syncMarks() {
+        	$("#sync-button-but").hide();
+        	
+        	//var monitorWin2 = window.open('../GradebookSync?lsId='  + sequenceId,'mWindow','width=1024,height=768,resizable');
+           // monitorWin2.focus();
+           // return;
+        	
+	        $.ajax({
+	        	async: false,
+	            url: '../GradebookSync',
+	            data: 'lsId='  + sequenceId,
+	            type: 'post',
+	            success: function (response) {
+	                $("#sync-button-but").show();
+	            	alert(response);
+	            },
+	            error: function (request, status, error) {
+	                $("#sync-button-but").show();
+	                //alert(request.responseText);
+	               // alert(request.status);
+	                alert(error);
+	            }
+	       	});
+            
+            return false;
+        }
 
 		var tree = new YAHOO.widget.TreeView("treeDiv", <%= strOut %>);
 		tree.getNodeByIndex(1).expand(true);
 		tree.render();
 		tree.subscribe('clickEvent',function(oArgs) {
 			seqSelected(oArgs.node.data.id, oArgs.node.label);
 		});
+
 	</script>
 </bbNG:jsBlock>
 </bbNG:learningSystemPage>
Index: lams_build/lib/lams/lams-gradebook.jar
===================================================================
diff -u -rb128694883b5db515c3f98f6803b573e04d203d2 -rbbd946d0a18f784ff7f72d0cebaaa3828980dfd0
Binary files differ
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r8f035fa8296fc679d82b51bd828d5fedd14c54f0 -rbbd946d0a18f784ff7f72d0cebaaa3828980dfd0
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
===================================================================
diff -u -re8b6f93e5d316929d0c36fb8bd51063d84d3494a -rbbd946d0a18f784ff7f72d0cebaaa3828980dfd0
--- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java	(.../LessonManagerServlet.java)	(revision e8b6f93e5d316929d0c36fb8bd51063d84d3494a)
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java	(.../LessonManagerServlet.java)	(revision bbd946d0a18f784ff7f72d0cebaaa3828980dfd0)
@@ -30,6 +30,8 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.gradebook.GradebookUserLesson;
+import org.lamsfoundation.lams.gradebook.service.IGradebookService;
 import org.lamsfoundation.lams.integration.ExtCourseClassMap;
 import org.lamsfoundation.lams.integration.ExtServerOrgMap;
 import org.lamsfoundation.lams.integration.ExtUserUseridMap;
@@ -83,6 +85,8 @@
     private static IExportToolContentService exportService = null;
 
     private static ILamsCoreToolService toolService = null;
+    
+    private static IGradebookService gradebookService = null;
 
     private static IUserManagementService userManagementService = null;
 
@@ -212,6 +216,17 @@
 
 		element = document.createElement(CentralConstants.ELEM_LESSON);
 		element.setAttribute(CentralConstants.ATTR_LESSON_ID, lsIdStr);
+		
+	    } else if (method.equals("gradebookMarksUser")) {
+		lsId = new Long(lsIdStr);
+		element = getGradebookMarks(document, serverId, datetime, hashValue, username, lsId, null, outputsUser);
+		
+	    } else if (method.equals("gradebookMarksLesson")) {
+		lsId = new Long(lsIdStr);
+		element = getGradebookMarks(document, serverId, datetime, hashValue, username, lsId, null, null);
+		
+	    } else if (method.equals("gradebookMarksCourse")) {
+		element = getGradebookMarks(document, serverId, datetime, hashValue, username, null, courseId, null);
 
 	    } else if (method.equals("toolOutputsAllUsers")) {
 		lsId = new Long(lsIdStr);
@@ -613,6 +628,9 @@
 
 	LessonManagerServlet.toolService = (ILamsCoreToolService) WebApplicationContextUtils
 		.getRequiredWebApplicationContext(getServletContext()).getBean("lamsCoreToolService");
+	
+	LessonManagerServlet.gradebookService = (IGradebookService) WebApplicationContextUtils
+		.getRequiredWebApplicationContext(getServletContext()).getBean("gradebookService");
 
 	LessonManagerServlet.userManagementService = (IUserManagementService) WebApplicationContextUtils
 		.getRequiredWebApplicationContext(getServletContext()).getBean("userManagementService");
@@ -792,7 +810,132 @@
 
 	}
     }
+    
+    /**
+     * This method gets the tool outputs for a lesson or a specific user and returns them in XML format.
+     * 
+     * @param document
+     * @param serverId
+     * @param datetime
+     * @param hashValue
+     * @param username
+     * @param lessonId
+     * @param courseID
+     * @param outputsUser
+     *            if outputsUser is null return results for the whole lesson, otherwise - for the specified learner
+     * @return
+     * @throws Exception
+     */
+    @SuppressWarnings("unchecked")
+    public Element getGradebookMarks(Document document, String serverId, String datetime, String hashValue,
+	    String username, Long lessonIdParam, String courseId, String outputsUser)
+	    throws Exception {
 
+	ExtServerOrgMap serverMap = LessonManagerServlet.integrationService.getExtServerOrgMap(serverId);
+	Authenticator.authenticate(serverMap, datetime, username, hashValue);
+	
+	List<Lesson> lessons = new LinkedList<Lesson>();
+	if (courseId != null) {
+	    
+	    ExtCourseClassMap orgMap = LessonManagerServlet.integrationService.getExtCourseClassMap(serverMap.getSid(),
+		    courseId);
+	    if (orgMap == null) {
+		LessonManagerServlet.log.debug("No course exists for: " + courseId
+			+ ". Cannot get tool outputs report.");
+		throw new Exception("Course with courseId: " + courseId + " could not be found");
+	    }  
+	    Integer organisationId = orgMap.getOrganisation().getOrganisationId();
+	    
+	    lessons.addAll(lessonService.getLessonsByGroup(organisationId));
+	    
+	} else {
+	    Lesson lesson = LessonManagerServlet.lessonService.getLesson(lessonIdParam);
+	    if (lesson == null) {
+		LessonManagerServlet.log.debug("No lesson exists for: " + lessonIdParam
+			+ ". Cannot get tool outputs report.");
+		throw new Exception("Lesson with lessonID: " + lessonIdParam + " could not be found for learner progresses");
+	    }
+	    lessons.add(lesson);
+	}
+	
+	// Create the root node of the xml document
+	Element gradebookMarksElement = document.createElement("GradebookMarks");
+
+	for (Lesson lesson : lessons) {
+	    Long lessonId = lesson.getLessonId();
+	    Element lessonElement = document.createElement(CentralConstants.ELEM_LESSON);
+	    lessonElement.setAttribute(CentralConstants.ATTR_LESSON_ID, "" + lessonId);
+	    lessonElement.setAttribute("lessonName", lesson.getLessonName());
+
+	    // calculate lesson's MaxPossibleMark
+	    Set<ToolActivity> activities = getLessonActivities(lesson);
+	    Long lessonMaxPossibleMark = 0L;
+	    for (ToolActivity activity : activities) {
+		Long activityMaxPossibleMark = LessonManagerServlet.toolService.getActivityMaxPossibleMark(activity);
+		if (activityMaxPossibleMark != null) {
+		    lessonMaxPossibleMark += activityMaxPossibleMark;
+		}
+	    }
+	    lessonElement.setAttribute("lessonMaxPossibleMark", lessonMaxPossibleMark.toString());
+
+	    //get gradebook marks from DB
+	    List<GradebookUserLesson> gradebookUserLessons = new LinkedList<GradebookUserLesson>();
+	    // if outputsUser is null we build results for the whole lesson, otherwise - for the specified learner
+	    if (outputsUser != null) {
+
+		ExtUserUseridMap userMap = LessonManagerServlet.integrationService.getExistingExtUserUseridMap(
+			serverMap, outputsUser);
+		if (userMap == null) {
+		    throw new Exception("No user exists for: " + outputsUser + ". Cannot get tool outputs report.");
+		}
+		User user = userMap.getUser();
+		Integer userId = user.getUserId();
+		
+		GradebookUserLesson gradebookUserLesson = gradebookService.getGradebookUserLesson(lessonId, userId);
+		if (gradebookUserLesson == null) {
+		    gradebookUserLesson = new GradebookUserLesson(lesson, user);
+		}
+		gradebookUserLessons.add(gradebookUserLesson);
+
+	    } else {
+		gradebookUserLessons.addAll(gradebookService.getGradebookUserLesson(lessonId));
+		LessonManagerServlet.log.debug("Getting tool ouputs report for: " + lessonId
+			+ ". With learning design: " + lesson.getLearningDesign().getLearningDesignId());
+	    }
+	    
+	    List<ExtUserUseridMap> allUsers = integrationService.getExtUserUseridMapByServerMap(serverMap);
+
+	    for (GradebookUserLesson gradebookUserLesson : gradebookUserLessons) {
+		Integer userId = gradebookUserLesson.getLearner().getUserId();
+		
+		//find user
+		ExtUserUseridMap extUser = null;
+		for (ExtUserUseridMap extUserIter : allUsers) {
+		    if (extUserIter.getUser().getUserId().equals(userId)) {
+			extUser = extUserIter;
+			break;
+		    }
+		}
+		
+		if (extUser == null) {
+		    throw new Exception("User with userId: " + userId + " doesn't belong to extServer: "
+			    + serverMap.getSid());
+		}
+
+		Element learnerElement = document.createElement("Learner");
+		learnerElement.setAttribute("extUsername", extUser.getExtUsername());
+		String userTotalMark = gradebookUserLesson.getMark() == null ? "" : gradebookUserLesson.getMark().toString();
+		learnerElement.setAttribute("userTotalMark", userTotalMark);
+
+		lessonElement.appendChild(learnerElement);
+	    }
+	    
+	    gradebookMarksElement.appendChild(lessonElement);
+	}
+
+	return gradebookMarksElement;
+    }
+
     /**
      * This method gets the tool outputs for a lesson or a specific user and returns them in XML format.
      * 
Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/IGradebookDAO.java
===================================================================
diff -u -r72e01661ffe932634adbe4b229d9ee44d6928a45 -rbbd946d0a18f784ff7f72d0cebaaa3828980dfd0
--- lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/IGradebookDAO.java	(.../IGradebookDAO.java)	(revision 72e01661ffe932634adbe4b229d9ee44d6928a45)
+++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/IGradebookDAO.java	(.../IGradebookDAO.java)	(revision bbd946d0a18f784ff7f72d0cebaaa3828980dfd0)
@@ -18,38 +18,39 @@
  *
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
- */ 
- 
-/* $Id$ */ 
-package org.lamsfoundation.lams.gradebook.dao; 
+ */
 
+/* $Id$ */
+package org.lamsfoundation.lams.gradebook.dao;
+
 import java.util.List;
 
 import org.lamsfoundation.lams.dao.IBaseDAO;
 import org.lamsfoundation.lams.gradebook.GradebookUserActivity;
 import org.lamsfoundation.lams.gradebook.GradebookUserLesson;
- 
-public interface IGradebookDAO extends IBaseDAO{
-    
-    public GradebookUserLesson getGradebookUserDataForLesson(Long lessonID, Integer userID);
-    
-    public GradebookUserActivity getGradebookUserDataForActivity(Long activityID, Integer userID);
-    
-    public Double getGradebookUserActivityMarkSum(Long lessonID, Integer userID);
-    
-    public List<GradebookUserActivity> getAllGradebookUserActivitiesForActivity(Long activityID);
-    
-    public Double getAverageMarkForLesson(Long lessonID);
-    
-    public long getAverageDurationLesson(Long lessonID);
-    
-    public long getAverageDurationForActivity(Long activityID);
-    
-    public Double getAverageMarkForActivity(Long activityID);
-    
-    public Double getAverageMarkForGroupedActivity(Long activityID, Long groupID);
-    
-    public long getAverageDurationForGroupedActivity(Long activityID, Long groupID);
 
+public interface IGradebookDAO extends IBaseDAO {
+
+    GradebookUserLesson getGradebookUserDataForLesson(Long lessonID, Integer userID);
+
+    List<GradebookUserLesson> getGradebookUserDataForLesson(Long lessonID);
+
+    GradebookUserActivity getGradebookUserDataForActivity(Long activityID, Integer userID);
+
+    Double getGradebookUserActivityMarkSum(Long lessonID, Integer userID);
+
+    List<GradebookUserActivity> getAllGradebookUserActivitiesForActivity(Long activityID);
+
+    Double getAverageMarkForLesson(Long lessonID);
+
+    long getAverageDurationLesson(Long lessonID);
+
+    long getAverageDurationForActivity(Long activityID);
+
+    Double getAverageMarkForActivity(Long activityID);
+
+    Double getAverageMarkForGroupedActivity(Long activityID, Long groupID);
+
+    long getAverageDurationForGroupedActivity(Long activityID, Long groupID);
+
 }
- 
Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
===================================================================
diff -u -r44fece9a7e07417b4d623bf0f93ddb0fe8f724fa -rbbd946d0a18f784ff7f72d0cebaaa3828980dfd0
--- lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java	(.../GradebookDAO.java)	(revision 44fece9a7e07417b4d623bf0f93ddb0fe8f724fa)
+++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java	(.../GradebookDAO.java)	(revision bbd946d0a18f784ff7f72d0cebaaa3828980dfd0)
@@ -38,6 +38,9 @@
 
     private static final String GET_GRADEBOOK_USER_LESSON = "from GradebookUserLesson gles where "
 	    + "gles.learner.userId=:userID and gles.lesson.lessonId=:lessonID";
+    
+    private static final String GET_GRADEBOOK_USER_LESSONS = "from GradebookUserLesson gles where "
+	    + "gles.lesson.lessonId=:lessonID";
 
     private static final String GET_GRADEBOOK_ACTIVITIES_FROM_LESSON_SUM = "select sum(gact.mark) from GradebookUserActivity gact where " +
     		"gact.learner=:userID and gact.activity in (select distinct tses.toolActivity from ToolSession tses where tses.lesson=:lessonID)";
@@ -87,7 +90,14 @@
 	}
 
 	return null;
+    }
+    
+    @SuppressWarnings("unchecked")
+    public List<GradebookUserLesson> getGradebookUserDataForLesson(Long lessonID) {
+	List<GradebookUserLesson> result = getSession().createQuery(GET_GRADEBOOK_USER_LESSONS).setLong("lessonID", lessonID.longValue())
+		.list();
 
+	return result;
     }
 
     @SuppressWarnings("unchecked")
@@ -101,7 +111,6 @@
 	}
 
 	return 0.0;
-
     }
 
     @SuppressWarnings("unchecked")
Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
===================================================================
diff -u -r744f5620f6d13c0fa4f44e42b708dbec50bfe9b4 -rbbd946d0a18f784ff7f72d0cebaaa3828980dfd0
--- lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java	(.../IIntegrationService.java)	(revision 744f5620f6d13c0fa4f44e42b708dbec50bfe9b4)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java	(.../IIntegrationService.java)	(revision bbd946d0a18f784ff7f72d0cebaaa3828980dfd0)
@@ -69,6 +69,17 @@
      */
     ExtUserUseridMap getExtUserUseridMap(ExtServerOrgMap serverMap, String extUsername)
 	    throws UserInfoFetchException, UserInfoValidationException;
+    
+    /**
+     * Returns ExtUserUseridMap from DB, and null if it doesn't exist
+     * 
+     * @param serverMap
+     * @param userId
+     * @return
+     */
+   // ExtUserUseridMap getExtUserUseridMapByUserId(ExtServerOrgMap serverMap, Integer userId);
+    
+    List<ExtUserUseridMap> getExtUserUseridMapByServerMap(ExtServerOrgMap serverMap);
 
     /**
      * Returns ExtUserUseridMap from DB, and null if it doesn't exist
@@ -83,6 +94,15 @@
     ExtServerOrgMap getExtServerOrgMap(Integer sid);
 
     ExtServerOrgMap getExtServerOrgMap(String serverId);
+    
+    /**
+     * Returns ExtCourseClassMap. If ExtCourseClassMap doesn't existent - returns null and does not create a new ExtCourseClassMap.
+     * 
+     * @param extServerOrgMapId
+     * @param extCourseId
+     * @return ExtCourseClassMap if it exists, null otherwise
+     */
+    ExtCourseClassMap getExtCourseClassMap(Integer extServerOrgMapId, String extCourseId);
 
     /**
      * @param serverMap
Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
===================================================================
diff -u -r744f5620f6d13c0fa4f44e42b708dbec50bfe9b4 -rbbd946d0a18f784ff7f72d0cebaaa3828980dfd0
--- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java	(.../IntegrationService.java)	(revision 744f5620f6d13c0fa4f44e42b708dbec50bfe9b4)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java	(.../IntegrationService.java)	(revision bbd946d0a18f784ff7f72d0cebaaa3828980dfd0)
@@ -89,6 +89,7 @@
 	this.service = service;
     }
 
+    @Override
     public ExtServerOrgMap getExtServerOrgMap(String serverId) {
 	List list = service.findByProperty(ExtServerOrgMap.class, "serverid", serverId);
 	if (list == null || list.size() == 0) {
@@ -97,7 +98,21 @@
 	    return (ExtServerOrgMap) list.get(0);
 	}
     }
+    
+    @Override
+    public ExtCourseClassMap getExtCourseClassMap(Integer extServerOrgMapId, String extCourseId) {
+	Map<String, Object> properties = new HashMap<String, Object>();
+	properties.put("courseid", extCourseId);
+	properties.put("extServerOrgMap.sid", extServerOrgMapId);
+	List<ExtCourseClassMap> list = service.findByProperties(ExtCourseClassMap.class, properties);
 
+	if (list == null || list.size() == 0) {
+	    return null;
+	} else {
+	    return (ExtCourseClassMap) list.get(0);
+	}
+    }
+
     // wrapper method for compatibility with original integration modules
     public ExtCourseClassMap getExtCourseClassMap(ExtServerOrgMap serverMap, ExtUserUseridMap userMap,
 	    String extCourseId, String countryIsoCode, String langIsoCode, String prettyCourseName, String method,
@@ -132,50 +147,45 @@
     public ExtCourseClassMap getExtCourseClassMap(ExtServerOrgMap serverMap, ExtUserUseridMap userMap,
 	    String extCourseId, String extCourseName, String countryIsoCode, String langIsoCode, String parentOrgId,
 	    Boolean isTeacher, Boolean prefix) throws UserInfoValidationException {
-	ExtCourseClassMap map;
 	Organisation org;
 	User user = userMap.getUser();
 	
-	Map<String, Object> properties = new HashMap<String, Object>();
-	properties.put("courseid", extCourseId);
-	properties.put("extServerOrgMap.sid", serverMap.getSid());
-	List<ExtCourseClassMap> mapList = service.findByProperties(ExtCourseClassMap.class, properties);
-	if (mapList == null || mapList.size() == 0) {
+	ExtCourseClassMap extCourseClassMap = getExtCourseClassMap(serverMap.getSid(), extCourseId);
+	if (extCourseClassMap == null) {
 	    //create new ExtCourseClassMap
 	    
 	    org = createOrganisation(serverMap, user, extCourseId, extCourseName, countryIsoCode,
 		    langIsoCode, parentOrgId, prefix);
-	    map = new ExtCourseClassMap();
-	    map.setCourseid(extCourseId);
-	    map.setExtServerOrgMap(serverMap);
-	    map.setOrganisation(org);
-	    service.save(map);
+	    extCourseClassMap = new ExtCourseClassMap();
+	    extCourseClassMap.setCourseid(extCourseId);
+	    extCourseClassMap.setExtServerOrgMap(serverMap);
+	    extCourseClassMap.setOrganisation(org);
+	    service.save(extCourseClassMap);
 	    
 	} else {
-	    map = mapList.get(0);
-	    org = map.getOrganisation();
+	    org = extCourseClassMap.getOrganisation();
 
 	    // update external course name if if has changed
 	    String requestedCourseName = prefix ? buildName(serverMap.getPrefix(), extCourseName) : extCourseName;
 	    if (extCourseName != null && !org.getName().equals(requestedCourseName)) {
-		
-		//validate org name
+
+		// validate org name
 		if (!ValidationUtil.isOrgNameValid(requestedCourseName)) {
 		    throw new UserInfoValidationException(
 			    "Can't create organisation due to validation error: "
 				    + "organisation name cannot contain any of these characters < > ^ * @ % $. External server:"
 				    + serverMap.getServerid() + ", orgId:" + extCourseId + ", orgName:"
 				    + requestedCourseName);
 		}
-		
+
 		org.setName(requestedCourseName);
 		service.updateOrganisationandWorkspaceNames(org);
 	    }
 	}
 	
 	updateUserRoles(user, org, isTeacher);
 	
-	return map;
+	return extCourseClassMap;
     }
 
     private void updateUserRoles(User user, Organisation org, Boolean isTeacher) {
@@ -204,6 +214,13 @@
 	    }
 	}
     }
+    
+    public List<ExtUserUseridMap> getExtUserUseridMapByServerMap(ExtServerOrgMap serverMap) {
+	Map<String, Object> properties = new HashMap<String, Object>();
+	properties.put("extServerOrgMap.sid", serverMap.getSid());
+	List list = service.findByProperties(ExtUserUseridMap.class, properties);
+	return list;
+    }
 
     @Override
     public ExtUserUseridMap getExtUserUseridMap(ExtServerOrgMap serverMap, String extUsername, boolean prefix)
@@ -540,7 +557,7 @@
 	    if (extServerLesson != null && StringUtils.isNotBlank(extServerLesson.getExtServer().getLessonFinishUrl())) {
 		ExtServerOrgMap serverMap = extServerLesson.getExtServer();
 
-		ExtUserUseridMap extUserUseridMap = getExistingExtUserUseridMap(serverMap, user);
+		ExtUserUseridMap extUserUseridMap = getExtUserUseridMapByUserId(serverMap, user.getUserId());
 		if (extUserUseridMap != null) {
 		    String extUsername = extUserUseridMap.getExtUsername();
 
@@ -571,10 +588,10 @@
 	}
     }
 
-    private ExtUserUseridMap getExistingExtUserUseridMap(ExtServerOrgMap serverMap, User user) {
+    private ExtUserUseridMap getExtUserUseridMapByUserId(ExtServerOrgMap serverMap, Integer userId) {
 	Map<String, Object> properties = new HashMap<String, Object>();
 	properties.put("extServerOrgMap.sid", serverMap.getSid());
-	properties.put("user.userId", user.getUserId());
+	properties.put("user.userId", userId);
 	List list = service.findByProperties(ExtUserUseridMap.class, properties);
 	if (list == null || list.size() == 0) {
 	    return null;
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java
===================================================================
diff -u -r27f1c5a7f08417a5d6f5e4c7faff092f520078a6 -rbbd946d0a18f784ff7f72d0cebaaa3828980dfd0
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java	(.../ILamsCoreToolService.java)	(revision 27f1c5a7f08417a5d6f5e4c7faff092f520078a6)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java	(.../ILamsCoreToolService.java)	(revision bbd946d0a18f784ff7f72d0cebaaa3828980dfd0)
@@ -255,6 +255,14 @@
      */
     SortedMap<String, ToolOutput> getOutputFromTool(List<String> names, ToolSession toolSession,
 	    Integer learnerId) throws ToolException;
+    
+    /**
+     * Get activity's max possible mark.
+     * 
+     * @param activity
+     * @return activity's max possible mark if available, null otherwise
+     */
+    Long getActivityMaxPossibleMark(ToolActivity activity);
 
     /**
      * Update the tool session data.
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
===================================================================
diff -u -r27f1c5a7f08417a5d6f5e4c7faff092f520078a6 -rbbd946d0a18f784ff7f72d0cebaaa3828980dfd0
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java	(.../LamsCoreToolService.java)	(revision 27f1c5a7f08417a5d6f5e4c7faff092f520078a6)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java	(.../LamsCoreToolService.java)	(revision bbd946d0a18f784ff7f72d0cebaaa3828980dfd0)
@@ -32,6 +32,7 @@
 
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.learningdesign.Activity;
+import org.lamsfoundation.lams.learningdesign.ActivityEvaluation;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.tool.SystemTool;
@@ -462,7 +463,44 @@
 	    throw new ToolException(message, e);
 	}
     }
+    
+    @Override
+    public Long getActivityMaxPossibleMark(ToolActivity activity) {
+	SortedMap<String, ToolOutputDefinition> map = getOutputDefinitionsFromTool(activity.getToolContentId(),
+		ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_CONDITION);
 
+	Set<ActivityEvaluation> actEvals = activity.getActivityEvaluations();
+
+	if (map != null) {
+	    for (String key : map.keySet()) {
+		ToolOutputDefinition definition = map.get(key);
+		if (actEvals != null && actEvals.size() > 0) {
+
+		    // get first evaluation
+		    ActivityEvaluation actEval = actEvals.iterator().next();
+
+		    if (actEval.getToolOutputDefinition().equals(key)) {
+
+			Object upperLimit = definition.getEndValue();
+			if (upperLimit != null && upperLimit instanceof Long) {
+			    return (Long) upperLimit;
+			}
+			break;
+		    }
+		} else {
+		    if (definition.isDefaultGradebookMark() != null && definition.isDefaultGradebookMark()) {
+			Object upperLimit = definition.getEndValue();
+			if (upperLimit != null && upperLimit instanceof Long) {
+			    return (Long) upperLimit;
+			}
+			break;
+		    }
+		}
+	    }
+	}
+	return null;
+    }
+
     @Override
     public void updateToolSession(ToolSession toolSession) {
 	toolSessionDAO.updateToolSession(toolSession);