Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
===================================================================
diff -u -r5863520d75343b47f77b05ad3bd7045a9a39af49 -r1739fd67ef9820e88eff263f08665b281cead9b5
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java	(.../CompleteActivityAction.java)	(revision 5863520d75343b47f77b05ad3bd7045a9a39af49)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java	(.../CompleteActivityAction.java)	(revision 1739fd67ef9820e88eff263f08665b281cead9b5)
@@ -21,7 +21,7 @@
  * ****************************************************************
  */
 
-/* $$Id$$ */	
+/* $$Id$$ */
 package org.lamsfoundation.lams.learning.web.action;
 
 import java.io.IOException;
@@ -33,6 +33,7 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.integration.service.IntegrationService;
 import org.lamsfoundation.lams.learning.service.ICoreLearnerService;
 import org.lamsfoundation.lams.learning.service.LearnerServiceException;
 import org.lamsfoundation.lams.learning.web.form.ActivityForm;
@@ -41,60 +42,73 @@
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.lesson.LearnerProgress;
 import org.lamsfoundation.lams.util.WebUtil;
+import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
  * @author daveg
  * 
- * XDoclet definition:
+ *         XDoclet definition:
  * 
- * @struts:action path="/CompleteActivity" name="activityForm"
- *                validate="false" scope="request"
+ * @struts:action path="/CompleteActivity" name="activityForm" validate="false" scope="request"
  * 
  */
 public class CompleteActivityAction extends ActivityAction {
-    
+
     protected static String className = "CompleteActivity";
-	
-	/**
-	 * Sets the current activity as complete and uses the progress engine to find
-	 * the next activity (may be null).  
-	 * 
-	 * Called when completing an optional activity, or triggered by completeToolSession (via a tool call).
-	 * The activity to be marked as complete must 
-	 * @throws IOException 
-	 * @throws ServletException 
-	 */
-	public ActionForward execute(
-			ActionMapping mapping,
-			ActionForm actionForm,
-			HttpServletRequest request,
-			HttpServletResponse response) throws IOException, ServletException {
-		ActivityMapping actionMappings = LearningWebUtil.getActivityMapping(this.getServlet().getServletContext());
-		
-		ICoreLearnerService learnerService = getLearnerService();
+    private static IntegrationService integrationService = null;
 
-		Integer learnerId = LearningWebUtil.getUserId();
-		Activity activity = LearningWebUtil.getActivityFromRequest(request, learnerService);
-		
-		// This must get the learner progress from the progress id, not cached from the request,
-		// otherwise we may be using an old version of a lesson while a teacher is starting a 
-		// live edit, and then the lock flag can't be checked correctly.
-	    LearnerProgress progress = learnerService.getProgressById(WebUtil.readLongParam(request,LearningWebUtil.PARAM_PROGRESS_ID, true));
+    /**
+     * Sets the current activity as complete and uses the progress engine to find the next activity (may be null).
+     * 
+     * Called when completing an optional activity, or triggered by completeToolSession (via a tool call). The activity
+     * to be marked as complete must
+     * 
+     * @throws IOException
+     * @throws ServletException
+     */
+    public ActionForward execute(ActionMapping mapping, ActionForm actionForm, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	ActivityMapping actionMappings = LearningWebUtil.getActivityMapping(this.getServlet().getServletContext());
 
-		ActionForward forward = null;
-		// Set activity as complete
-		try {
-			forward = LearningWebUtil.completeActivity(request, response,
-		    		actionMappings, progress, activity, 
-		    			learnerId, learnerService, false);
-		}
-		catch (LearnerServiceException e) {
-			return mapping.findForward("error");
-		}
+	ICoreLearnerService learnerService = getLearnerService();
 
-		LearningWebUtil.setupProgressInRequest((ActivityForm)actionForm, request, progress);
-		return forward;
+	Integer learnerId = LearningWebUtil.getUserId();
+	Activity activity = LearningWebUtil.getActivityFromRequest(request, learnerService);
+
+	// This must get the learner progress from the progress id, not cached from the request,
+	// otherwise we may be using an old version of a lesson while a teacher is starting a
+	// live edit, and then the lock flag can't be checked correctly.
+	LearnerProgress progress = learnerService.getProgressById(WebUtil.readLongParam(request,
+		LearningWebUtil.PARAM_PROGRESS_ID, true));
+
+	// if user has already completed the lesson - we need to let integrations servers know to come and pick up
+	// updated marks (as it won't happen at lessoncomplete.jsp page)
+	if (progress.isComplete()) {
+	    String lessonFinishCallbackUrl = getIntegrationService().getLessonFinishCallbackUrl(progress.getUser(),
+		    progress.getLesson());
+	    if (lessonFinishCallbackUrl != null) {
+		request.setAttribute("lessonFinishUrl", lessonFinishCallbackUrl);
+	    }
 	}
 
-	
+	ActionForward forward = null;
+	// Set activity as complete
+	try {
+	    forward = LearningWebUtil.completeActivity(request, response, actionMappings, progress, activity,
+		    learnerId, learnerService, false);
+	} catch (LearnerServiceException e) {
+	    return mapping.findForward("error");
+	}
+
+	LearningWebUtil.setupProgressInRequest((ActivityForm) actionForm, request, progress);
+	return forward;
+    }
+    
+    private IntegrationService getIntegrationService() {
+	if (integrationService == null) {
+	    integrationService = (IntegrationService) WebApplicationContextUtils.getRequiredWebApplicationContext(
+		    getServlet().getServletContext()).getBean("integrationService");
+	}
+	return integrationService;
+    }
 }
Index: lams_learning/web/close.jsp
===================================================================
diff -u -rc7d9c7ec6090e62933ae91ca029b6402fa7fb974 -r1739fd67ef9820e88eff263f08665b281cead9b5
--- lams_learning/web/close.jsp	(.../close.jsp)	(revision c7d9c7ec6090e62933ae91ca029b6402fa7fb974)
+++ lams_learning/web/close.jsp	(.../close.jsp)	(revision 1739fd67ef9820e88eff263f08665b281cead9b5)
@@ -22,7 +22,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 
- 	<script language="JavaScript" type="text/Javascript"><!--
+ <script language="JavaScript" type="text/Javascript">
     function doCloseRedirect() {
         if ( window.name.match("LearnerActivity") != null ) {
         	<%-- In popup window (ie have revisited a completed activity. Just the one activity in the window so close --%>
@@ -39,17 +39,20 @@
             </c:if>
         }
     }
+    
     window.onload = doCloseRedirect;
-    //-->
-    </script>
+</script>
 
-	<div id="content">
+<div id="content">
 
-		<p><fmt:message key="message.window.closing"/></p>
+	<p><fmt:message key="message.window.closing"/></p>
 
-	</div>  <!--closes content-->
+</div>  <!--closes content-->
 
 
-	<div id="footer">
-	</div><!--closes footer-->
+<div id="footer">
+</div><!--closes footer-->
 
+<c:if test="${not empty lessonFinishUrl}">
+	<img width="0" height="0" style="border: none;" src="${lessonFinishUrl}" />
+</c:if>
\ No newline at end of file