Index: lams_build/lib/lams/lams.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v
diff -u -r1.400 -r1.401
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java,v
diff -u -r1.22 -r1.23
--- lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java	17 Jan 2014 22:37:08 -0000	1.22
+++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java	2 Feb 2014 17:18:38 -0000	1.23
@@ -76,6 +76,11 @@
      */
     public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException,
 	    ToolException;
+    
+    /**
+     * Removes content previously added by the given user.
+     */
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException;
 
     /**
      * Export the XML fragment for the tool's content, along with any files needed for the content.
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java,v
diff -u -r1.25 -r1.26
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java	17 Jan 2014 22:37:09 -0000	1.25
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java	2 Feb 2014 17:18:38 -0000	1.26
@@ -176,8 +176,13 @@
      * @throws ToolException
      */
     public void notifyToolToDeleteContent(ToolActivity toolActivity) throws ToolException;
-
+    
     /**
+     * Ask a tool to delete content entered by the given user, if exists.
+     */
+    public void notifyToolToDeleteLearnerContent(ToolActivity toolActivity, Integer userId) throws ToolException;
+    
+    /**
      * Ask a tool for its OutputDefinitions, based on the given toolContentId. If the tool doesn't have any content
      * matching the toolContentId then it should create the OutputDefinitions based on the tool's default content.
      * 
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java,v
diff -u -r1.41 -r1.42
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java	17 Jan 2014 22:37:09 -0000	1.41
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java	2 Feb 2014 17:18:38 -0000	1.42
@@ -268,6 +268,19 @@
 	    throw new ToolException(message, e);
 	}
     }
+    
+    @Override
+    public void notifyToolToDeleteLearnerContent(ToolActivity toolActivity, Integer userId) throws ToolException {
+	try {
+	    ToolContentManager contentManager = (ToolContentManager) findToolService(toolActivity.getTool());
+	    contentManager.removeLearnerContent(toolActivity.getToolContentId(), userId);
+	} catch (NoSuchBeanDefinitionException e) {
+	    String message = "A tool which is defined in the database appears to missing from the classpath. Unable to delete learner content. ToolActivity "
+		    + toolActivity;
+	    LamsCoreToolService.log.error(message, e);
+	    throw new ToolException(message, e);
+	}
+    }
 
     @Override
     public SortedMap<String, ToolOutputDefinition> getOutputDefinitionsFromTool(Long toolContentId, int definitionType)
Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.61 -r1.62
--- lams_monitoring/conf/language/lams/ApplicationResources.properties	27 Dec 2013 13:40:26 -0000	1.61
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties	2 Feb 2014 17:18:46 -0000	1.62
@@ -279,6 +279,9 @@
 force.complete.click  =Click on an activity to move learner "[0]" or outside any activity to cancel.
 force.complete.end.lesson.confirm  =Are you sure you want to move learner "[0]" to the end of lesson?
 force.complete.activity.confirm  =Are you sure you want to move learner "[0]" to activity "[1]"?
+force.complete.remove.content  =You are moving learner "[0]" to activity "[1]". You can opt to delete the content of activities that have been previously done, so the learner has to enter the content/answers again.
+force.complete.remove.content.yes =Delete content
+force.complete.remove.content.no =Keep content
 force.complete.drop.fail  =You have dropped the learner "[0]" on either its current or on its completed activity "[1]".
 force.complete.end.lesson.tooltip  =To move a learner to the end of lesson, drag the learner icon over to this bar.
 learner.group.list.title  =Learners:
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java,v
diff -u -r1.19 -r1.20
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java	27 Aug 2013 16:15:14 -0000	1.19
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java	2 Feb 2014 17:18:46 -0000	1.20
@@ -41,6 +41,7 @@
     public static final String PARAM_LESSON_START_DATE = "lessonStartDate";
     public static final String PARAM_SCHEDULED_NUMBER_DAYS_TO_LESSON_FINISH = "scheduledNumberDaysToLessonFinish";
     public static final String PARAM_LEARNER_ID = "learnerID";
+    public static final String PARAM_REMOVE_LEARNER_CONTENT = "removeContent";
     public static final String KEY_GROUPING_ACTIVITY = "groupingActivityID";
     public static final String KEY_GROUPS = "groups";
     public static final String KEY_GROUP_NAME = "groupName";
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java,v
diff -u -r1.108 -r1.109
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	27 Jan 2014 14:17:00 -0000	1.108
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	2 Feb 2014 17:18:47 -0000	1.109
@@ -75,8 +75,8 @@
     public Lesson initializeLessonWithoutLDcopy(String lessonName, String lessonDescription, long learningDesignID,
 	    User user, String customCSV, Boolean enableLessonIntro, Boolean displayDesignImage,
 	    Boolean learnerExportAvailable, Boolean learnerPresenceAvailable, Boolean learnerImAvailable,
-	    Boolean liveEditEnabled, Boolean enableLessonNotifications, Boolean learnerRestart, Integer scheduledNumberDaysToLessonFinish,
-	    Lesson precedingLesson);
+	    Boolean liveEditEnabled, Boolean enableLessonNotifications, Boolean learnerRestart,
+	    Integer scheduledNumberDaysToLessonFinish, Lesson precedingLesson);
 
     /**
      * Initialize a new lesson so as to start the learning process. It needs to notify lams which learning design it
@@ -281,7 +281,8 @@
      */
     public Boolean setLiveEditEnabled(long lessonId, Integer userId, Boolean liveEditEnabled);
 
-    public String forceCompleteActivitiesByUser(Integer learnerId, Integer requesterId, long lessonId, Long activityId);
+    public String forceCompleteActivitiesByUser(Integer learnerId, Integer requesterId, long lessonId, Long activityId,
+	    boolean removeLearnerContent);
 
     /**
      * Archive the specified lesson. When archived, the data is retained but the learners cannot access the details.
@@ -425,7 +426,7 @@
      * @throws IOException
      */
     public String getLearningDesignDetails(Long lessonID) throws IOException;
-    
+
     public List<ContributeActivityDTO> getAllContributeActivityDTO(Long lessonID);
 
     /**
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java,v
diff -u -r1.189 -r1.190
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	27 Jan 2014 14:17:00 -0000	1.189
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	2 Feb 2014 17:18:46 -0000	1.190
@@ -1274,7 +1274,8 @@
      * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#forceCompleteLessonByUser(Integer,long,long)
      */
     @Override
-    public String forceCompleteActivitiesByUser(Integer learnerId, Integer requesterId, long lessonId, Long activityId) {
+    public String forceCompleteActivitiesByUser(Integer learnerId, Integer requesterId, long lessonId, Long activityId,
+	    boolean removeLearnerContent) {
 	Lesson lesson = lessonDAO.getLesson(new Long(lessonId));
 	checkOwnerOrStaffMember(requesterId, lesson, "force complete");
 
@@ -1308,7 +1309,7 @@
 			    .getCompletedActivities().containsKey(parentActivity) || ((parentActivity
 			    .getParentActivity() != null) && learnerProgress.getCompletedActivities().containsKey(
 			    parentActivity.getParentActivity())))))) {
-		return forceUncompleteActivity(learnerProgress, stopActivity);
+		return forceUncompleteActivity(learnerProgress, stopActivity, removeLearnerContent);
 	    }
 	}
 
@@ -1496,20 +1497,23 @@
      * achieve it.
      */
     @SuppressWarnings("unchecked")
-    private String forceUncompleteActivity(LearnerProgress learnerProgress, Activity targetActivity) {
+    private String forceUncompleteActivity(LearnerProgress learnerProgress, Activity targetActivity,
+	    boolean removeLearnerContent) {
 	User learner = learnerProgress.getUser();
 	Activity currentActivity = learnerProgress.getCurrentActivity();
+	// set of activities for which "attempted" and "completed" status will be removed
+	Set<Activity> uncompleteActivities = new HashSet<Activity>();
+	uncompleteActivities.add(targetActivity);
+	
 	if (currentActivity == null) {
 	    // Learner has finished the whole lesson. Find the last activity by traversing the transition.
 	    currentActivity = learnerProgress.getLesson().getLearningDesign().getFirstActivity();
 	    while (currentActivity.getTransitionFrom() != null) {
 		currentActivity = currentActivity.getTransitionFrom().getToActivity();
 	    }
+	    uncompleteActivities.add(currentActivity);
 	}
 
-	// set of activities for which "attempted" and "completed" status will be removed
-	Set<Activity> uncompleteActivities = new HashSet<Activity>();
-
 	// check if the target is a part of complex activity
 	CompletedActivityProgress completedActivityProgress = learnerProgress.getCompletedActivities().get(
 		targetActivity);
@@ -1547,7 +1551,7 @@
 	Set<Activity> groupings = new HashSet<Activity>();
 
 	// remove completed activities step by step, all the way from current to target activity
-	do {
+	while (!currentActivity.equals(targetActivity)) {
 	    uncompleteActivities.add(currentActivity);
 
 	    if (currentActivity.isComplexActivity()) {
@@ -1600,17 +1604,19 @@
 		    groupings.add(currentActivity);
 		}
 	    }
+	}
 
-	} while (!currentActivity.equals(targetActivity));
-
 	// forget that user completed and attempted activiites
 	for (Activity activity : uncompleteActivities) {
 	    learnerProgress.getAttemptedActivities().remove(activity);
 	    learnerProgress.getCompletedActivities().remove(activity);
+	    if (removeLearnerContent && activity.isToolActivity()) {
+		// remove learner content from this activity
+		lamsCoreToolService.notifyToolToDeleteLearnerContent((ToolActivity) activity, learner.getUserId());
+	    }
 	}
 
 	// set target activity as attempted
-	learnerProgress.getCompletedActivities().remove(targetActivity);
 	learnerProgress.getAttemptedActivities().put(targetActivity, completedActivityProgress.getStartDate());
 	if (targetParentActivity != null) {
 	    // set parent as attempted
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v
diff -u -r1.111 -r1.112
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	27 Jan 2014 14:16:59 -0000	1.111
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	2 Feb 2014 17:18:46 -0000	1.112
@@ -201,8 +201,8 @@
 	Boolean liveEditEnabled = WebUtil.readBooleanParam(request, "liveEditEnabled", false);
 	Boolean learnerRestart = WebUtil.readBooleanParam(request, "learnerRestart", false);
 	Lesson newLesson = monitoringService.initializeLesson(title, desc, ldId, organisationId, getUserId(), null,
-		false, false, learnerExportAvailable, learnerPresenceAvailable, learnerImAvailable,
-		liveEditEnabled, false, learnerRestart, null, null);
+		false, false, learnerExportAvailable, learnerPresenceAvailable, learnerImAvailable, liveEditEnabled,
+		false, learnerRestart, null, null);
 
 	PrintWriter writer = response.getWriter();
 	writer.println(newLesson.getLessonId());
@@ -549,8 +549,11 @@
 	long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
 	Integer learnerId = new Integer(WebUtil.readIntParam(request, MonitoringConstants.PARAM_LEARNER_ID));
 	Integer requesterId = getUserId();
+	boolean removeLearnerContent = WebUtil.readBooleanParam(request,
+		MonitoringConstants.PARAM_REMOVE_LEARNER_CONTENT, false);
 
-	String message = monitoringService.forceCompleteActivitiesByUser(learnerId, requesterId, lessonId, activityId);
+	String message = monitoringService.forceCompleteActivitiesByUser(learnerId, requesterId, lessonId, activityId,
+		removeLearnerContent);
 
 	if (LamsDispatchAction.log.isDebugEnabled()) {
 	    LamsDispatchAction.log.debug("Force complete for learner " + learnerId + " lesson " + lessonId + ". "
Index: lams_monitoring/web/monitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/monitor.jsp,v
diff -u -r1.23 -r1.24
--- lams_monitoring/web/monitor.jsp	17 Jan 2014 22:37:13 -0000	1.23
+++ lams_monitoring/web/monitor.jsp	2 Feb 2014 17:18:46 -0000	1.24
@@ -21,64 +21,69 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/raphael/raphael.js"></script>
 	<script type="text/javascript" src="includes/javascript/monitorLesson.js"></script>
 	<script type="text/javascript">
-		var userId = '<lams:user property="userID"/>';
-		var lessonId = ${lesson.lessonID};
-		var ldId = ${lesson.learningDesignID};
-		var lessonStateId = ${lesson.lessonStateID};
-		var createDateTimeStr = '${lesson.createDateTimeStr}';
-		// settings for progress bar
-		var isHorizontalBar = true;
-		var hasContentFrame = false;
-		var presenceEnabled =  false;
-		var hasDialog = false;
-		
-		var LAMS_URL = '<lams:LAMSURL/>';
-		
-		var FORCE_COMPLETE_CLICK_LABEL = '<fmt:message key="force.complete.click"/>';
-		var FORCE_COMPLETE_BUTTON_LABEL = '<fmt:message key="button.force.complete"/>';
-		var FORCE_COMPLETE_END_LESSON_CONFIRM_LABEL = '<fmt:message key="force.complete.end.lesson.confirm"/>';
-		var FORCE_COMPLETE_ACTIVITY_CONFIRM_LABEL = '<fmt:message key="force.complete.activity.confirm"/>';
-		var FORCE_COMPLETE_DROP_FAIL_LABEL = '<fmt:message key="force.complete.drop.fail"/>';
-		var LEARNER_GROUP_COUNT_LABEL = '<fmt:message key="learner.group.count"/>';
-		var LEARNER_GROUP_SHOW_LABEL = '<fmt:message key="learner.group.show"/>';
-		var LEARNER_GROUP_REMOVE_PROGRESS = '<fmt:message key="learner.group.remove.progress"/>';
-		var LEARNER_GROUP_LIST_TITLE_LABEL = '<fmt:message key="learner.group.list.title"/>';
-		var VIEW_LEARNER_BUTTON_LABEL = '<fmt:message key="button.view.learner"/>';
-		var EMAIL_BUTTON_LABEL = '<fmt:message key="button.email"/>';
-		var CLOSE_BUTTON_LABEL = '<fmt:message key="button.close"/>';
-		var NOTIFCATIONS_LABEL = '<fmt:message key="email.notifications"/>';
-		var LEARNER_FINISHED_COUNT_LABEL = '<fmt:message key="learner.finished.count"/>';
-		var LEARNER_FINISHED_DIALOG_TITLE_LABEL = '<fmt:message key="learner.finished.dialog.title"/>';
-		var LESSON_PRESENCE_ENABLE_ALERT_LABEL = '<fmt:message key="lesson.enable.presence.alert"/>';
-		var LESSON_PRESENCE_DISABLE_ALERT_LABEL = '<fmt:message key="lesson.disable.presence.alert"/>';
-		var LESSON_IM_ENABLE_ALERT_LABEL = '<fmt:message key="lesson.enable.im.alert"/>';
-		var LESSON_IM_DISABLE_ALERT_LABEL = '<fmt:message key="lesson.disable.im.alert"/>';
-		var LESSON_REMOVE_ALERT_LABEL = '<fmt:message key="lesson.remove.alert"/>';
-		var LESSON_REMOVE_DOUBLECHECK_ALERT_LABEL = '<fmt:message key="lesson.remove.doublecheck.alert"/>';
-		var LESSON_STATE_CREATED_LABEL = '<fmt:message key="lesson.state.created"/>';
-		var LESSON_STATE_SCHEDULED_LABEL = '<fmt:message key="lesson.state.scheduled"/>';
-		var LESSON_STATE_STARTED_LABEL = '<fmt:message key="lesson.state.started"/>';
-		var LESSON_STATE_SUSPENDED_LABEL = '<fmt:message key="lesson.state.suspended"/>';
-		var LESSON_STATE_FINISHED_LABEL = '<fmt:message key="lesson.state.finished"/>';
-		var LESSON_STATE_ARCHIVED_LABEL = '<fmt:message key="lesson.state.archived"/>';
-		var LESSON_STATE_REMOVED_LABEL = '<fmt:message key="lesson.state.removed"/>';
-		var LESSON_STATE_ACTION_DISABLE_LABEL = '<fmt:message key="lesson.state.action.disable"/>';
-		var LESSON_STATE_ACTION_ACTIVATE_LABEL = '<fmt:message key="lesson.state.action.activate"/>';
-		var LESSON_STATE_ACTION_REMOVE_LABEL = '<fmt:message key="lesson.state.action.remove"/>';
-		var LESSON_STATE_ACTION_ARCHIVE_LABEL = '<fmt:message key="lesson.state.action.archive"/>';
-		var LESSON_ERROR_SCHEDULE_DATE_LABEL = '<fmt:message key="error.lesson.schedule.date"/>';
-		var LESSON_EDIT_CLASS_LABEL = '<fmt:message key="button.edit.class"/>';
-		var LESSON_GROUP_DIALOG_CLASS_LABEL = '<fmt:message key="lesson.group.dialog.class"/>';
-		var CURRENT_ACTIVITY_LABEL = '<fmt:message key="label.learner.progress.activity.current.tooltip"/>';
-		var COMPLETED_ACTIVITY_LABEL = '<fmt:message key="label.learner.progress.activity.completed.tooltip"/>';
-		var ATTEMPTED_ACTIVITY_LABEL = '<fmt:message key="label.learner.progress.activity.attempted.tooltip"/>';
-		var TOSTART_ACTIVITY_LABEL = '<fmt:message key="label.learner.progress.activity.tostart.tooltip"/>';
-		var SUPPORT_ACTIVITY_LABEL = '<fmt:message key="label.learner.progress.activity.support.tooltip"/>';
-		var EXPORT_PORTFOLIO_LABEL = '<fmt:message key="button.export"/>';
-		var EXPORT_PORTFOLIO_LEARNER_TOOLTIP_LABEL = '<fmt:message key="button.export.learner.tooltip"/>';
-	    var TIME_CHART_LABEL = '<fmt:message key="button.timechart"/>';
-	    var TIME_CHART_TOOLTIP_LABEL = '<fmt:message key="button.timechart.tooltip"/>';
-		var LIVE_EDIT_CONFIRM_LABEL = '<fmt:message key="button.live.edit.confirm"/>';
+		var userId = '<lams:user property="userID"/>',
+			lessonId = ${lesson.lessonID},
+			ldId = ${lesson.learningDesignID},
+			lessonStateId = ${lesson.lessonStateID},
+			createDateTimeStr = '${lesson.createDateTimeStr}',
+			// settings for progress bar
+			isHorizontalBar = true,
+			hasContentFrame = false,
+			presenceEnabled =  false,
+			hasDialog = false,
+			
+			LAMS_URL = '<lams:LAMSURL/>',
+			
+			LABELS = {
+				FORCE_COMPLETE_CLICK : '<fmt:message key="force.complete.click"/>',
+				FORCE_COMPLETE_BUTTON : '<fmt:message key="button.force.complete"/>',
+				FORCE_COMPLETE_END_LESSON_CONFIRM : '<fmt:message key="force.complete.end.lesson.confirm"/>',
+				FORCE_COMPLETE_ACTIVITY_CONFIRM : '<fmt:message key="force.complete.activity.confirm"/>',
+				FORCE_COMPLETE_REMOVE_CONTENT : '<fmt:message key="force.complete.remove.content"/>',
+				FORCE_COMPLETE_REMOVE_CONTENT_YES : '<fmt:message key="force.complete.remove.content.yes"/>',
+				FORCE_COMPLETE_REMOVE_CONTENT_NO : '<fmt:message key="force.complete.remove.content.no"/>',
+				FORCE_COMPLETE_DROP_FAIL : '<fmt:message key="force.complete.drop.fail"/>',
+				LEARNER_GROUP_COUNT : '<fmt:message key="learner.group.count"/>',
+				LEARNER_GROUP_SHOW : '<fmt:message key="learner.group.show"/>',
+				LEARNER_GROUP_REMOVE_PROGRESS : '<fmt:message key="learner.group.remove.progress"/>',
+				LEARNER_GROUP_LIST_TITLE : '<fmt:message key="learner.group.list.title"/>',
+				VIEW_LEARNER_BUTTON : '<fmt:message key="button.view.learner"/>',
+				EMAIL_BUTTON : '<fmt:message key="button.email"/>',
+				CLOSE_BUTTON : '<fmt:message key="button.close"/>',
+				NOTIFCATIONS : '<fmt:message key="email.notifications"/>',
+				LEARNER_FINISHED_COUNT : '<fmt:message key="learner.finished.count"/>',
+				LEARNER_FINISHED_DIALOG_TITLE : '<fmt:message key="learner.finished.dialog.title"/>',
+				LESSON_PRESENCE_ENABLE_ALERT : '<fmt:message key="lesson.enable.presence.alert"/>',
+				LESSON_PRESENCE_DISABLE_ALERT : '<fmt:message key="lesson.disable.presence.alert"/>',
+				LESSON_IM_ENABLE_ALERT : '<fmt:message key="lesson.enable.im.alert"/>',
+				LESSON_IM_DISABLE_ALERT : '<fmt:message key="lesson.disable.im.alert"/>',
+				LESSON_REMOVE_ALERT : '<fmt:message key="lesson.remove.alert"/>',
+				LESSON_REMOVE_DOUBLECHECK_ALERT : '<fmt:message key="lesson.remove.doublecheck.alert"/>',
+				LESSON_STATE_CREATED : '<fmt:message key="lesson.state.created"/>',
+				LESSON_STATE_SCHEDULED : '<fmt:message key="lesson.state.scheduled"/>',
+				LESSON_STATE_STARTED : '<fmt:message key="lesson.state.started"/>',
+				LESSON_STATE_SUSPENDED : '<fmt:message key="lesson.state.suspended"/>',
+				LESSON_STATE_FINISHED : '<fmt:message key="lesson.state.finished"/>',
+				LESSON_STATE_ARCHIVED : '<fmt:message key="lesson.state.archived"/>',
+				LESSON_STATE_REMOVED : '<fmt:message key="lesson.state.removed"/>',
+				LESSON_STATE_ACTION_DISABLE : '<fmt:message key="lesson.state.action.disable"/>',
+				LESSON_STATE_ACTION_ACTIVATE : '<fmt:message key="lesson.state.action.activate"/>',
+				LESSON_STATE_ACTION_REMOVE : '<fmt:message key="lesson.state.action.remove"/>',
+				LESSON_STATE_ACTION_ARCHIVE : '<fmt:message key="lesson.state.action.archive"/>',
+				LESSON_ERROR_SCHEDULE_DATE : '<fmt:message key="error.lesson.schedule.date"/>',
+				LESSON_EDIT_CLASS : '<fmt:message key="button.edit.class"/>',
+				LESSON_GROUP_DIALOG_CLASS : '<fmt:message key="lesson.group.dialog.class"/>',
+				CURRENT_ACTIVITY : '<fmt:message key="label.learner.progress.activity.current.tooltip"/>',
+				COMPLETED_ACTIVITY : '<fmt:message key="label.learner.progress.activity.completed.tooltip"/>',
+				ATTEMPTED_ACTIVITY : '<fmt:message key="label.learner.progress.activity.attempted.tooltip"/>',
+				TOSTART_ACTIVITY : '<fmt:message key="label.learner.progress.activity.tostart.tooltip"/>',
+				SUPPORT_ACTIVITY : '<fmt:message key="label.learner.progress.activity.support.tooltip"/>',
+				EXPORT_PORTFOLIO : '<fmt:message key="button.export"/>',
+				EXPORT_PORTFOLIO_LEARNER_TOOLTIP : '<fmt:message key="button.export.learner.tooltip"/>',
+			    TIME_CHART : '<fmt:message key="button.timechart"/>',
+			    TIME_CHART_TOOLTIP : '<fmt:message key="button.timechart.tooltip"/>',
+				LIVE_EDIT_CONFIRM : '<fmt:message key="button.live.edit.confirm"/>'
+			}
 	    
 	    
 		$(document).ready(function(){
@@ -451,6 +456,8 @@
 		</div>
 	</c:if>
 	
+	<div id="forceBackwardsDialog" class="dialogContainer"></div>
+	
 	<div id="tooltip"></div>
 </div>
 </body>
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/includes/javascript/monitorLesson.js,v
diff -u -r1.35 -r1.36
--- lams_monitoring/web/includes/javascript/monitorLesson.js	22 Jan 2014 14:10:53 -0000	1.35
+++ lams_monitoring/web/includes/javascript/monitorLesson.js	2 Feb 2014 17:18:46 -0000	1.36
@@ -93,13 +93,13 @@
 				
 				if (checked) {
 					$('#imAvailableField').attr('disabled', null);
-					alert(LESSON_PRESENCE_ENABLE_ALERT_LABEL);
+					alert(LABELS.LESSON_PRESENCE_ENABLE_ALERT);
 				} else {
 					$('#imAvailableField').attr({
 						'checked'  : null,
 						'disabled' : 'disabled'
 					});
-					alert(LESSON_PRESENCE_DISABLE_ALERT_LABEL);
+					alert(LABELS.LESSON_PRESENCE_DISABLE_ALERT);
 				}
 			}
 		});
@@ -120,10 +120,10 @@
 			success : function() {
 				if (checked) {
 					$('#openImButton').css('display', 'inline');
-					alert(LESSON_IM_ENABLE_ALERT_LABEL);
+					alert(LABELS.LESSON_IM_ENABLE_ALERT);
 				} else {
 					$('#openImButton').css('display', 'none');
-					alert(LESSON_IM_DISABLE_ALERT_LABEL);
+					alert(LABELS.LESSON_IM_DISABLE_ALERT);
 				}
 			}
 		});
@@ -230,7 +230,7 @@
 		'resizable' : false,
 		'show'      : 'fold',
 		'hide'      : 'fold',
-		'title'     : EMAIL_BUTTON_LABEL,
+		'title'     : LABELS.EMAIL_BUTTON,
 		'open'      : function(){
 			autoRefreshBlocked = true;
 			$('#emailFrame').attr('src',
@@ -259,7 +259,7 @@
 			'classOnly' : true
 		},
 		success : function(response) {
-			 showLearnerGroupDialog(null, LESSON_GROUP_DIALOG_CLASS_LABEL, response, false, false, true);
+			 showLearnerGroupDialog(null, LABELS.LESSON_GROUP_DIALOG_CLASS, response, false, false, true);
 		}
 	});
 }
@@ -288,8 +288,8 @@
 			method = "archiveLesson";
 			break;
 		case 7: //FINISHED
-			if (confirm(LESSON_REMOVE_ALERT_LABEL)){
-				if (confirm(LESSON_REMOVE_DOUBLECHECK_ALERT_LABEL)) {
+			if (confirm(LABELS.LESSON_REMOVE_ALERT)){
+				if (confirm(LABELS.LESSON_REMOVE_DOUBLECHECK_ALERT)) {
 					method = "removeLesson";
 				}
 			}
@@ -337,25 +337,25 @@
 			var label = null;
 			switch (lessonStateId) {
 				case 1:
-					label = LESSON_STATE_CREATED_LABEL;
+					label = LABELS.LESSON_STATE_CREATED;
 					break;
 				case 2:
-					label = LESSON_STATE_SCHEDULED_LABEL;
+					label = LABELS.LESSON_STATE_SCHEDULED;
 					break;
 				case 3:
-					label = LESSON_STATE_STARTED_LABEL;
+					label = LABELS.LESSON_STATE_STARTED;
 					break;
 				case 4:
-					label = LESSON_STATE_SUSPENDED_LABEL;
+					label = LABELS.LESSON_STATE_SUSPENDED;
 					break;
 				case 5:
-					label = LESSON_STATE_FINISHED_LABEL;
+					label = LABELS.LESSON_STATE_FINISHED;
 					break;
 				case 6:
-					label = LESSON_STATE_ARCHIVED_LABEL;
+					label = LABELS.LESSON_STATE_ARCHIVED;
 					break;
 				case 7:
-					label = LESSON_STATE_REMOVED_LABEL;
+					label = LABELS.LESSON_STATE_REMOVED;
 					break;
 			}
 			$('#lessonStateLabel').text(label);
@@ -366,20 +366,20 @@
 			selectField.children('option:not([value="-1"])').remove();
 			switch (lessonStateId) {
 				case 3:
-					$('<option />').attr('value', 4).text(LESSON_STATE_ACTION_DISABLE_LABEL).appendTo(selectField);
-					$('<option />').attr('value', 6).text(LESSON_STATE_ACTION_ARCHIVE_LABEL).appendTo(selectField);
-					$('<option />').attr('value', 7).text(LESSON_STATE_ACTION_REMOVE_LABEL).appendTo(selectField);
+					$('<option />').attr('value', 4).text(LABELS.LESSON_STATE_ACTION_DISABLE).appendTo(selectField);
+					$('<option />').attr('value', 6).text(LABELS.LESSON_STATE_ACTION_ARCHIVE).appendTo(selectField);
+					$('<option />').attr('value', 7).text(LABELS.LESSON_STATE_ACTION_REMOVE).appendTo(selectField);
 					break;
 				case 4:
-					$('<option />').attr('value', 3).text(LESSON_STATE_ACTION_ACTIVATE_LABEL).appendTo(selectField);
-					$('<option />').attr('value', 6).text(LESSON_STATE_ACTION_ARCHIVE_LABEL).appendTo(selectField);
-					$('<option />').attr('value', 7).text(LESSON_STATE_ACTION_REMOVE_LABEL).appendTo(selectField);
+					$('<option />').attr('value', 3).text(LABELS.LESSON_STATE_ACTION_ACTIVATE).appendTo(selectField);
+					$('<option />').attr('value', 6).text(LABELS.LESSON_STATE_ACTION_ARCHIVE).appendTo(selectField);
+					$('<option />').attr('value', 7).text(LABELS.LESSON_STATE_ACTION_REMOVE).appendTo(selectField);
 					break;
 				case 5:
 					break;
 				case 6:
-					$('<option />').attr('value', 3).text(LESSON_STATE_ACTION_ACTIVATE_LABEL).appendTo(selectField);
-					$('<option />').attr('value', 7).text(LESSON_STATE_ACTION_REMOVE_LABEL).appendTo(selectField);
+					$('<option />').attr('value', 3).text(LABELS.LESSON_STATE_ACTION_ACTIVATE).appendTo(selectField);
+					$('<option />').attr('value', 7).text(LABELS.LESSON_STATE_ACTION_REMOVE).appendTo(selectField);
 					break;
 			}
 			
@@ -424,7 +424,7 @@
 			}
 		});
 	} else {
-		alert(LESSON_ERROR_SCHEDULE_DATE_LABEL);
+		alert(LABELS.LESSON_ERROR_SCHEDULE_DATE);
 	}
 }
 
@@ -544,7 +544,7 @@
 			},
 			'buttons' : [
 			             {
-			            	'text'   : FORCE_COMPLETE_BUTTON_LABEL,
+			            	'text'   : LABELS.FORCE_COMPLETE_BUTTON,
 			            	'id'     : 'learnerGroupDialogForceCompleteButton',
 			            	'class'  : 'learnerGroupDialogSelectableButton',
 			            	'click'  : function() {
@@ -562,12 +562,12 @@
 			            							selectedLearner.text(), event.pageX, event.pageY);
 			            				});
 				            		$(this).dialog('close');
-				            		alert(FORCE_COMPLETE_CLICK_LABEL.replace('[0]', selectedLearner.text()));
+				            		alert(LABELS.FORCE_COMPLETE_CLICK.replace('[0]', selectedLearner.text()));
 			            		}
 							}
 			             },
 			             {
-			            	'text'   : VIEW_LEARNER_BUTTON_LABEL,
+			            	'text'   : LABELS.VIEW_LEARNER_BUTTON,
 			            	'id'     : 'learnerGroupDialogViewButton',
 			            	'class'  : 'learnerGroupDialogSelectableButton',
 			            	'click'  : function() {
@@ -579,7 +579,7 @@
 							}
 			             },
 			             {
-			            	'text'   : EMAIL_BUTTON_LABEL,
+			            	'text'   : LABELS.EMAIL_BUTTON,
 			            	'id'     : 'learnerGroupDialogEmailButton',
 			            	'class'  : 'learnerGroupDialogSelectableButton',
 			            	'click'  : function() {
@@ -590,7 +590,7 @@
 			            	}	
 			             },
 			             {
-			            	'text'   : CLOSE_BUTTON_LABEL,
+			            	'text'   : LABELS.CLOSE_BUTTON,
 			            	'id'     : 'learnerGroupDialogCloseButton',
 			            	'click'  : function() {
 								$(this).dialog('close');
@@ -627,6 +627,48 @@
 			}, sequenceInfoTimeout);
 		}
 	});
+	
+	$('#forceBackwardsDialog').dialog({
+		'autoOpen'  : false,
+		'modal'     : true,
+		'resizable' : false,
+		'minWidth'  : 350,
+		'show'      : 'fold',
+		'hide'      : 'fold',
+		'title'		: LABELS.FORCE_COMPLETE_BUTTON,
+		'open'      : function(){
+			autoRefreshBlocked = true;
+		},
+		'close' 	: function(){
+			autoRefreshBlocked = false;
+		},
+		'buttons' : [
+		             {
+		            	'text'   : LABELS.FORCE_COMPLETE_REMOVE_CONTENT_YES,
+		            	'click'  : function() {
+							$(this).dialog('close');
+		            		forceCompleteExecute($(this).dialog('option', 'learnerId'),
+		            							 $(this).dialog('option', 'activityId'),
+		            							 true);
+						}
+		             },
+		             {
+		            	'text'   : LABELS.FORCE_COMPLETE_REMOVE_CONTENT_NO,
+		            	'click'  : function() {
+		            		$(this).dialog('close');
+		            		forceCompleteExecute($(this).dialog('option', 'learnerId'),
+       							 				 $(this).dialog('option', 'activityId'),
+       							 				 false);
+						}
+		             },
+		             {
+		            	'text'   : LABELS.CLOSE_BUTTON,
+		            	'click'  : function() {
+							$(this).dialog('close');
+						} 
+		             }
+		]
+	});
 }
 	
 
@@ -789,38 +831,52 @@
 			var executeForceComplete = false;
 			
 			if (act.attr('id') == 'completedLearnersContainer') {
-				executeForceComplete =  currentActivityId && confirm(FORCE_COMPLETE_END_LESSON_CONFIRM_LABEL
+				executeForceComplete =  currentActivityId && confirm(LABELS.FORCE_COMPLETE_END_LESSON_CONFIRM
 						.replace('[0]',learnerName));
 			} else {
 				var targetActivityId = act.parent().attr('id');
 				if (currentActivityId != targetActivityId) {
-					var targetActivityName = act.is('polygon') ? "Gate" 
+					
+					var precedingActivityId = currentActivityId,
+						targetActivityName = act.is('polygon') ? "Gate" 
 							: act.siblings('text[id^="TextElement"]').text();
-					executeForceComplete = confirm(FORCE_COMPLETE_ACTIVITY_CONFIRM_LABEL
-								.replace('[0]', learnerName).replace('[1]', targetActivityName));
+					
+					// find out if we are moving learner forward or backwards
+					while (precedingActivityId){
+						// find transition line and extract activity IDs from them
+						var transitionLine = $('line[id$="to_' 
+								+ precedingActivityId + '"]:not([id^="arrow"])'
+								, sequenceCanvas);
+						precedingActivityId = transitionLine.length == 1 ? 
+								transitionLine.attr('id').split('_')[0] : null;
+						if (targetActivityId == precedingActivityId) {
+							break;
+						}
+					};
+					
+					// check if the target activity was found or we are moving the learner from end of lesson
+					if (!currentActivityId || precedingActivityId) {
+						// move the learner backwards
+						$('#forceBackwardsDialog').text(LABELS.FORCE_COMPLETE_REMOVE_CONTENT
+									.replace('[0]', learnerName).replace('[1]', targetActivityName))
+									.dialog('option', {
+										'learnerId' : learnerId,
+										'activityId': targetActivityId
+									})
+									.dialog('open');
+						// so autoRefreshBlocked = false is not set
+						return;
+					} else {
+						// move the learner forward
+						executeForceComplete = confirm(LABELS.FORCE_COMPLETE_ACTIVITY_CONFIRM
+									.replace('[0]', learnerName).replace('[1]', targetActivityName));
+					}
 				}
 			}
 			
 			if (executeForceComplete) {
-				// tell server to force complete the learner
-				$.ajax({
-					dataType : 'text',
-					url : LAMS_URL + 'monitoring/monitoring.do',
-					cache : false,
-					data : {
-						'method'     		 : 'forceComplete',
-						'lessonID'   		 : lessonId,
-						'learnerID'  		 : learnerId,
-						'activityID' 		 : targetActivityId
-					},
-					success : function(response) {
-						// inform user of result
-						alert(response);
-												
-						// progress changed, show it to monitor
-						refreshMonitor('sequence');
-					}
-				});
+				
+				forceCompleteExecute(learnerId, targetActivityId, false);
 			}
 			// we found our target, stop iteration
 			return false;
@@ -832,6 +888,32 @@
 
 
 /**
+ * Tell server to force complete the learner.
+ */
+function forceCompleteExecute(learnerId, activityId, removeContent) {
+	$.ajax({
+		dataType : 'text',
+		url : LAMS_URL + 'monitoring/monitoring.do',
+		cache : false,
+		data : {
+			'method'     		 : 'forceComplete',
+			'lessonID'   		 : lessonId,
+			'learnerID'  		 : learnerId,
+			'activityID' 		 : activityId,
+			'removeContent'		 : removeContent
+		},
+		success : function(response) {
+			// inform user of result
+			alert(response);
+									
+			// progress changed, show it to monitor
+			refreshMonitor('sequence');
+		}
+	});
+}
+
+
+/**
  * Draw user icons on top of activities.
  */
 function addLearnerIcons(activity) {
@@ -860,8 +942,8 @@
 	
 	// add group of users icon
 	var actRightBorder = actX + (isGate? 40 : +activityShape.attr('width')),
-		groupTitle = activity.learners.length + ' ' + LEARNER_GROUP_COUNT_LABEL
-		+ ' ' + LEARNER_GROUP_SHOW_LABEL,
+		groupTitle = activity.learners.length + ' ' + LABELS.LEARNER_GROUP_COUNT
+		+ ' ' + LABELS.LEARNER_GROUP_SHOW,
 	// if icons do not fit in shape anymore, show a group icon
 		element = appendXMLElement('image', {
 		'id'         : 'act' + activity.id + 'learnerGroup',
@@ -883,7 +965,7 @@
 	}, activity.learners.length, activityGroup[0]);
 	appendXMLElement('title', null, groupTitle, element);
 
-	var actTooltip = LEARNER_GROUP_LIST_TITLE_LABEL;
+	var actTooltip = LABELS.LEARNER_GROUP_LIST_TITLE;
 	// draw single user icons for the first few
 	if (!isGate) {
 		$.each(activity.learners, function(learnerIndex, learner){
@@ -982,7 +1064,7 @@
 	var completedLearnerCount = (learners ? learners.length : 0 );
 	// show (current/total) label
 	$('<span />').attr({
-		'title' : LEARNER_FINISHED_COUNT_LABEL
+		'title' : LABELS.LEARNER_FINISHED_COUNT
 			.replace('[0]', completedLearnerCount).replace('[1]', learnerTotalCount)
 	}).text('(' + completedLearnerCount + '/' + learnerTotalCount + ')')
 	  .appendTo(iconsContainer);
@@ -1024,10 +1106,10 @@
 		// show a group icon
 		$('<img />').attr({
 			'src' : LAMS_URL + 'images/icons/group.png',
-			'title'      : LEARNER_GROUP_SHOW_LABEL
+			'title'      : LABELS.LEARNER_GROUP_SHOW
 		}).css('cursor', 'pointer')
 		  .dblclick(function(){
-			showLearnerGroupDialog(null, LEARNER_FINISHED_DIALOG_TITLE_LABEL, learners, true, false);
+			showLearnerGroupDialog(null, LABELS.LEARNER_FINISHED_DIALOG_TITLE, learners, true, false);
 		}).appendTo(iconsContainer);
 	}
 }
@@ -1079,7 +1161,7 @@
 	$('#classDialog')
 		.dialog('option',
 			{
-			 'title' : LESSON_EDIT_CLASS_LABEL
+			 'title' : LABELS.LESSON_EDIT_CLASS
 			})
 		.dialog('open');
 }
@@ -1151,7 +1233,7 @@
  * Opens Authoring for live edit.
  */
 function openLiveEdit(){
-	if (confirm(LIVE_EDIT_CONFIRM_LABEL)) {
+	if (confirm(LABELS.LIVE_EDIT_CONFIRM)) {
 		$.ajax({
 			dataType : 'text',
 			url : LAMS_URL + 'monitoring/monitoring.do',
@@ -1299,17 +1381,17 @@
 		learnerProgressCellsTemplate =
 		  '<tr><td class="progressBarLabel" id="progressBarLabel;00;"><div>;11;</div>'
 		+ '<a class="button" title="' 
-		+ EXPORT_PORTFOLIO_LEARNER_TOOLTIP_LABEL + '" href="#" onClick="javascript:openPopUp(\''
+		+ LABELS.EXPORT_PORTFOLIO_LEARNER_TOOLTIP + '" href="#" onClick="javascript:openPopUp(\''
 		+ LAMS_URL + 'learning/exportWaitingPage.jsp?mode=learner&role=teacher&lessonID='
 		+ lessonId + '&userID=;00;\',\'ExportPortfolio\',240,640,true)">'
-		+ EXPORT_PORTFOLIO_LABEL
+		+ LABELS.EXPORT_PORTFOLIO
 		+ '</a><a class="button" title="'
-		+ TIME_CHART_TOOLTIP_LABEL + '" href="#" onClick="javascript:openPopUp(\''
+		+ LABELS.TIME_CHART_TOOLTIP + '" href="#" onClick="javascript:openPopUp(\''
 		+ LAMS_URL + 'monitoring/monitoring.do?method=viewTimeChart&lessonID='
 		+ lessonId + '&learnerID=;00;\',\'TimeChart\',600,800,true)">'
-		+ TIME_CHART_LABEL 
+		+ LABELS.TIME_CHART 
 		+ '</a><a class="button" href="#" onClick="javascript:showEmailDialog(;00;)">'
-		+ EMAIL_BUTTON_LABEL
+		+ LABELS.EMAIL_BUTTON
 		+ '</a></td></tr><tr><td class="progressBarCell" id="progressBar;00;"></td></tr>';
 	}
 	
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java,v
diff -u -r1.36 -r1.37
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	17 Jan 2014 21:35:00 -0000	1.36
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	2 Feb 2014 17:18:52 -0000	1.37
@@ -1260,7 +1260,31 @@
 	}
 	assessmentDao.delete(assessment);
     }
+    
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (log.isDebugEnabled()) {
+	    log.debug("Removing Assessment results for user ID " + userId + " and toolContentId " + toolContentId);
+	}
+	List<AssessmentSession> sessions = assessmentSessionDao.getByContentId(toolContentId);
+	for (AssessmentSession session : sessions) {
+	    List<AssessmentResult> results = assessmentResultDao.getAssessmentResultsBySession(session.getSessionId(),
+		    userId.longValue());
+	    for (AssessmentResult result : results) {
+		for (AssessmentQuestionResult questionResult : result.getQuestionResults()) {
+		    assessmentQuestionResultDao.removeObject(AssessmentQuestionResult.class, questionResult.getUid());
+		}
+		assessmentResultDao.removeObject(AssessmentResult.class, result.getUid());
+	    }
 
+	    AssessmentUser user = assessmentUserDao.getUserByUserIDAndSessionID(userId.longValue(),
+		    session.getSessionId());
+	    if (user != null) {
+		user.setSessionFinished(false);
+		assessmentUserDao.saveObject(user);
+	    }
+	}
+    }
+    
     public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException {
 	AssessmentSession session = new AssessmentSession();
 	session.setSessionId(toolSessionId);
Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java,v
diff -u -r1.4 -r1.5
--- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java	17 Jan 2014 21:35:50 -0000	1.4
+++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java	2 Feb 2014 17:19:27 -0000	1.5
@@ -204,7 +204,13 @@
 	    ToolException {
 	// TODO Auto-generated method stub
     }
-
+    
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (logger.isDebugEnabled()) {
+	    logger.debug("This tool does not support learner content removing yet.");
+	}
+    }
+    
     /**
      * Export the XML fragment for the tool's content, along with any files needed for the content.
      * 
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java,v
diff -u -r1.59 -r1.60
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java	17 Jan 2014 21:36:39 -0000	1.59
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java	2 Feb 2014 17:18:53 -0000	1.60
@@ -30,6 +30,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.Set;
 import java.util.SortedMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Matcher;
@@ -227,6 +228,36 @@
 	// TODO Auto-generated method stub
     }
 
+    @SuppressWarnings("unchecked")
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (logger.isDebugEnabled()) {
+	    logger.debug("Removing Chat messages for user ID " + userId + " and toolContentId " + toolContentId);
+	}
+	Chat chat = chatDAO.getByContentId(toolContentId);
+	if (chat == null) {
+	    logger.warn("Did not find activity with toolContentId: " + toolContentId + " to remove learner content");
+	    return;
+	}
+
+	for (ChatSession session : (Set<ChatSession>) chat.getChatSessions()) {
+	    ChatUser user = chatUserDAO.getByUserIdAndSessionId(userId.longValue(), session.getSessionId());
+	    if (user != null) {
+		List<ChatMessage> messages = chatMessageDAO.getForUser(user);
+		if (!messages.isEmpty()) {
+		    for (ChatMessage message : messages) {
+			chatMessageDAO.delete(message);
+			session.getChatMessages().remove(message);
+		    }
+		}
+
+		user.setFinishedActivity(false);
+		user.setLastPresence(null);
+		chatUserDAO.update(user);
+	    }
+
+	}
+    }
+    
     /**
      * Export the XML fragment for the tool's content, along with any files needed for the content.
      * 
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java,v
diff -u -r1.16 -r1.17
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java	17 Jan 2014 21:42:48 -0000	1.16
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java	2 Feb 2014 17:19:11 -0000	1.17
@@ -723,7 +723,33 @@
 	}
 	dacoDao.removeObject(Daco.class, daco.getUid());
     }
-
+    
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (log.isDebugEnabled()) {
+	    log.debug("Removing Daco data for user ID " + userId + " and toolContentId " + toolContentId);
+	}
+	List<DacoSession> sessions = dacoSessionDao.getByContentId(toolContentId);
+	for (DacoSession session : sessions) {
+	    DacoUser user = dacoUserDao.getUserByUserIdAndSessionId(userId.longValue(), session.getSessionId());
+	    if (user != null) {
+		for (DacoAnswer answer : user.getAnswers()) {
+		    if (answer.getFileUuid() != null) {
+			try {
+			    dacoToolContentHandler.deleteFile(answer.getFileUuid());
+			} catch (Exception e) {
+			    throw new ToolException("Error while removing Daco file", e);
+			}
+		    }
+		    dacoAnswerDao.removeObject(DacoAnswer.class, answer.getUid());
+		}
+		user.getAnswers().clear();
+		
+		user.setSessionFinished(false);
+		dacoUserDao.saveObject(user);
+	    }
+	}
+    }
+    
     public void removeToolSession(Long toolSessionId) throws DataMissingException, ToolException {
 	dacoSessionDao.deleteBySessionId(toolSessionId);
     }
Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java,v
diff -u -r1.9 -r1.10
--- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java	17 Jan 2014 21:42:40 -0000	1.9
+++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java	2 Feb 2014 17:18:54 -0000	1.10
@@ -1051,6 +1051,12 @@
 	eadventureDao.delete(eadventure);
     }
     
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (log.isDebugEnabled()) {
+	    log.debug("This tool does not support learner content removing yet.");
+	}
+    }
+    
     public void removeParams(Long toolContentId){
 	List<EadventureParam> params = getEadventureParamByContentId(toolContentId);
 	if (params!=null){
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java,v
diff -u -r1.118 -r1.119
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	31 Jan 2014 16:18:04 -0000	1.118
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	2 Feb 2014 17:18:58 -0000	1.119
@@ -758,6 +758,29 @@
 	forumDao.delete(forum);
     }
 
+    @SuppressWarnings("unchecked")
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (log.isDebugEnabled()) {
+	    log.debug("Hiding Forum messages for user ID " + userId + " and toolContentId " + toolContentId);
+	}
+	List<ForumToolSession> sessionList = forumToolSessionDao.getByContentId(toolContentId);
+
+	for (ForumToolSession session : sessionList) {
+	    Long sessionId = session.getSessionId();
+	    ForumUser learner = forumUserDao.getByUserIdAndSessionId(userId.longValue(), sessionId);
+	    if (learner != null) {
+		List<Message> messages = messageDao.getByUserAndSession(learner.getUid(), sessionId);
+		for (Message message : messages) {
+		    message.setHideFlag(true);
+		    messageDao.update(message);
+		}
+		
+		learner.setSessionFinished(false);
+		forumUserDao.save(learner);
+	    }
+	}
+    }
+
     /**
      * Export the XML fragment for the tool's content, along with any files needed for the content.
      * 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java,v
diff -u -r1.21 -r1.22
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	17 Jan 2014 21:45:00 -0000	1.21
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	2 Feb 2014 17:19:16 -0000	1.22
@@ -30,6 +30,7 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Hashtable;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.SortedMap;
@@ -226,6 +227,34 @@
 	// TODO Auto-generated method stub
     }
 
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (logger.isDebugEnabled()) {
+	    logger.debug("Removing Gmap markers for user ID " + userId + " and toolContentId " + toolContentId);
+	}
+	Gmap gmap = gmapDAO.getByContentId(toolContentId);
+	if (gmap == null) {
+	    logger.warn("Did not find activity with toolContentId: " + toolContentId + " to remove learner content");
+	    return;
+	}
+	
+	Iterator<GmapMarker> markerIterator = gmap.getGmapMarkers().iterator();
+	while (markerIterator.hasNext()) {
+	    GmapMarker marker = markerIterator.next();
+	    if (!marker.isAuthored() && marker.getCreatedBy().getUserId().equals(userId.longValue())) {
+		gmapMarkerDAO.delete(marker);
+		markerIterator.remove();
+	    }
+	}
+
+	for (GmapSession session : gmap.getGmapSessions()) {
+	    GmapUser user = gmapUserDAO.getByUserIdAndSessionId(userId.longValue(), session.getSessionId());
+	    if (user != null) {
+		user.setFinishedActivity(false);
+		gmapUserDAO.update(user);
+	    }
+	}
+    }
+    
     /**
      * Export the XML fragment for the tool's content, along with any files needed for the content.
      * 
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java,v
diff -u -r1.26 -r1.27
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	17 Jan 2014 21:44:57 -0000	1.26
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	2 Feb 2014 17:18:42 -0000	1.27
@@ -865,6 +865,68 @@
 	imageGalleryDao.delete(imageGallery);
     }
 
+    @SuppressWarnings("unchecked")
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (log.isDebugEnabled()) {
+	    log.debug("Removing Image Gallery content for user ID " + userId + " and toolContentId " + toolContentId);
+	}
+	ImageGallery gallery = imageGalleryDao.getByContentId(toolContentId);
+	if (gallery == null) {
+	    log.warn("Did not find activity with toolContentId: " + toolContentId + " to remove learner content");
+	    return;
+	}
+	
+	Iterator<ImageGalleryItem> itemIterator = gallery.getImageGalleryItems().iterator();
+	while (itemIterator.hasNext()) {
+	    ImageGalleryItem item = itemIterator.next();
+
+	    Iterator<ImageComment> commentIterator = item.getComments().iterator();
+	    while (commentIterator.hasNext()) {
+		ImageComment comment = commentIterator.next();
+		if (comment.getCreateBy().getUserId().equals(userId.longValue())) {
+		    imageCommentDao.removeObject(ImageComment.class, comment.getUid());
+		    commentIterator.remove();
+		}
+	    }
+
+	    ImageVote vote = imageVoteDao.getImageVoteByImageAndUser(item.getUid(), userId.longValue());
+	    if (vote != null) {
+		imageVoteDao.removeObject(ImageVote.class, vote.getUid());
+	    }
+
+	    ImageRating rating = imageRatingDao.getImageRatingByImageAndUser(item.getUid(), userId.longValue());
+	    if (rating != null) {
+		imageRatingDao.removeObject(ImageRating.class, rating.getUid());
+	    }
+
+	    if (!item.isCreateByAuthor() && item.getCreateBy().getUserId().equals(userId.longValue())) {
+		try {
+		    if (item.getOriginalFileUuid() != null) {
+			imageGalleryToolContentHandler.deleteFile(item.getOriginalFileUuid());
+		    }
+		    if (item.getMediumFileUuid() != null) {
+			imageGalleryToolContentHandler.deleteFile(item.getMediumFileUuid());
+		    }
+		    if (item.getThumbnailFileUuid() != null) {
+			imageGalleryToolContentHandler.deleteFile(item.getThumbnailFileUuid());
+		    }
+		} catch (Exception e) {
+		    throw new ToolException("Error while removing a file in Image Gallery", e);
+		}
+
+		imageGalleryItemDao.removeObject(ImageGalleryItem.class, item.getUid());
+		itemIterator.remove();
+	    }
+	}
+
+	ImageGalleryUser user = imageGalleryUserDao.getUserByUserIDAndContentID(userId.longValue(), toolContentId);
+	if (user != null) {
+	    user.setSessionFinished(false);
+	    imageGalleryUserDao.saveObject(user);
+	}
+
+    }
+    
     public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException {
 	ImageGallerySession session = new ImageGallerySession();
 	session.setSessionId(toolSessionId);
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java,v
diff -u -r1.5 -r1.6
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java	17 Jan 2014 21:45:04 -0000	1.5
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java	2 Feb 2014 17:19:14 -0000	1.6
@@ -899,7 +899,13 @@
 	}
 	commonCartridgeDao.delete(commonCartridge);
     }
-
+    
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (log.isDebugEnabled()) {
+	    log.debug("This tool does not support learner content removing yet.");
+	}
+    }
+    
     public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException {
 	CommonCartridgeSession session = new CommonCartridgeSession();
 	session.setSessionId(toolSessionId);
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java,v
diff -u -r1.5 -r1.6
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java	17 Jan 2014 22:04:39 -0000	1.5
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java	2 Feb 2014 17:18:49 -0000	1.6
@@ -202,7 +202,13 @@
     public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException,
 	    ToolException {
     }
-
+    
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (logger.isDebugEnabled()) {
+	    logger.debug("This tool does not support learner content removing yet.");
+	}
+    }
+    
     @Override
     public void exportToolContent(Long toolContentId, String rootPath) throws DataMissingException, ToolException {
 	Kaltura kaltura = kalturaDao.getByContentId(toolContentId);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java,v
diff -u -r1.122 -r1.123
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	29 Jan 2014 20:22:12 -0000	1.122
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	2 Feb 2014 17:19:32 -0000	1.123
@@ -98,6 +98,7 @@
 import org.lamsfoundation.lams.tool.mc.dao.IMcSessionDAO;
 import org.lamsfoundation.lams.tool.mc.dao.IMcUserDAO;
 import org.lamsfoundation.lams.tool.mc.dao.IMcUsrAttemptDAO;
+import org.lamsfoundation.lams.tool.mc.dao.hibernate.McUserDAO;
 import org.lamsfoundation.lams.tool.mc.pojos.McContent;
 import org.lamsfoundation.lams.tool.mc.pojos.McOptsContent;
 import org.lamsfoundation.lams.tool.mc.pojos.McQueContent;
@@ -1342,6 +1343,28 @@
 	}
     }
 
+    @SuppressWarnings("unchecked")
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (logger.isDebugEnabled()) {
+	    logger.debug("Removing Multiple Choice attempts for user ID " + userId + " and toolContentId "
+		    + toolContentId);
+	}
+
+	McContent content = mcContentDAO.findMcContentById(toolContentId);
+	if (content != null) {
+	    for (McSession session : (Set<McSession>) content.getMcSessions()) {
+		McQueUsr user = mcUserDAO.getMcUserBySession(userId.longValue(), session.getUid());
+		if (user != null) {
+		    mcUsrAttemptDAO.removeAllUserAttempts(user.getUid());
+		    user.setResponseFinalised(false);
+		    user.setLastAttemptTotalMark(null);
+		    user.setNumberOfAttempts(0);
+		    mcUserDAO.saveMcUser(user);
+		}
+	    }
+	}
+    }
+    
     /**
      * Export the XML fragment for the tool's content, along with any files needed for the content.
      * 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IResponseRatingDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/Attic/IResponseRatingDAO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IResponseRatingDAO.java	28 Feb 2011 12:21:57 -0000	1.2
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IResponseRatingDAO.java	2 Feb 2014 17:19:17 -0000	1.3
@@ -63,5 +63,8 @@
     public void saveObject(Object o);
     
     AverageRatingDTO getAverageRatingDTOByResponse(Long responseId);
-
+    
+    public void removeResponseRating(ResponseRating rating);
+    
+    public List<ResponseRating> getRatingsByUser(Long userUid);
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/ResponseRatingDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/Attic/ResponseRatingDAO.java,v
diff -u -r1.3 -r1.4
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/ResponseRatingDAO.java	4 Jul 2013 10:27:29 -0000	1.3
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/ResponseRatingDAO.java	2 Feb 2014 17:19:17 -0000	1.4
@@ -27,7 +27,9 @@
 import java.util.List;
 import java.util.Locale;
 
+import org.hibernate.FlushMode;
 import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.tool.qa.QaUsrResp;
 import org.lamsfoundation.lams.tool.qa.ResponseRating;
 import org.lamsfoundation.lams.tool.qa.dao.IResponseRatingDAO;
 import org.lamsfoundation.lams.tool.qa.dto.AverageRatingDTO;
@@ -48,6 +50,9 @@
     
     private static final String FIND_AVERAGE_RATING_BY_RESPONSE = "SELECT AVG(r.rating), COUNT(*) from "
 	    + ResponseRating.class.getName() + " as r where r.response.responseId=?";
+    
+    private static final String FIND_BY_USER_UID = "from " + ResponseRating.class.getName()
+	    + " as r where r.user.uid = ?";
 
     public ResponseRating getRatingByResponseAndUser(Long responseId, Long userId) {
 	List list = getHibernateTemplate().find(FIND_BY_RESPONSE_AND_USER, new Object[] { userId, responseId });
@@ -76,5 +81,14 @@
     public void saveObject(Object o) {
 	super.insertOrUpdate(o);
     }
+    
+    public void removeResponseRating(ResponseRating rating) {
+	this.getSession().setFlushMode(FlushMode.AUTO);
+	this.getHibernateTemplate().delete(rating);
+    }
 
-}
+    @SuppressWarnings("unchecked")
+    public List<ResponseRating> getRatingsByUser(Long userUid) {
+	return getHibernateTemplate().find(FIND_BY_USER_UID, userUid);
+    }
+}
\ No newline at end of file
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java,v
diff -u -r1.100 -r1.101
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	17 Jan 2014 22:04:44 -0000	1.100
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	2 Feb 2014 17:19:17 -0000	1.101
@@ -679,6 +679,35 @@
 	}
     }
     
+    @SuppressWarnings("unchecked")
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (logger.isDebugEnabled()) {
+	    logger.debug("Removing Q&A answers for user ID " + userId + " and toolContentId " + toolContentId);
+	}
+
+	QaContent content = qaDAO.getQaByContentId(toolContentId);
+	if (content != null) {
+	    for (QaSession session : (Set<QaSession>) content.getQaSessions()) {
+		QaQueUsr user = qaQueUsrDAO.getQaUserBySession(userId.longValue(), session.getQaSessionId());
+		if (user != null) {
+		    List<ResponseRating> ratings = qaResponseRatingDAO.getRatingsByUser(user.getUid());
+		    for (ResponseRating rating : ratings) {
+			qaResponseRatingDAO.removeResponseRating(rating);
+		    }
+
+		    for (QaUsrResp response : (Set<QaUsrResp>) user.getQaUsrResps()) {
+			qaUsrRespDAO.removeUserResponse(response);
+		    }
+		    user.getQaUsrResps().clear();
+
+		    user.setLearnerFinished(false);
+		    user.setResponseFinalized(false);
+		    qaQueUsrDAO.updateUsr(user);
+		}
+	    }
+	}
+    }
+
     public AverageRatingDTO rateResponse(Long responseId, Long userId, Long toolSessionID, float rating) {
 	QaQueUsr imageGalleryUser = this.getUserByIdAndSession(userId, toolSessionID);
 	ResponseRating responseRating = qaResponseRatingDAO.getRatingByResponseAndUser(responseId, userId);
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java,v
diff -u -r1.68 -r1.69
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	17 Jan 2014 22:06:33 -0000	1.68
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	2 Feb 2014 17:18:36 -0000	1.69
@@ -981,6 +981,46 @@
 	resourceDao.delete(resource);
     }
 
+    @SuppressWarnings("unchecked")
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (log.isDebugEnabled()) {
+	    log.debug("Removing Share Resources content for user ID " + userId + " and toolContentId " + toolContentId);
+	}
+
+	List<ResourceSession> sessions = resourceSessionDao.getByContentId(toolContentId);
+	for (ResourceSession session : sessions) {
+	    Iterator<ResourceItem> itemIterator = session.getResourceItems().iterator();
+	    while (itemIterator.hasNext()) {
+		ResourceItem item = itemIterator.next();
+
+		if (!item.isCreateByAuthor() && item.getCreateBy().getUserId().equals(userId.longValue())) {
+		    ResourceItemVisitLog visitLog = resourceItemVisitDao.getResourceItemLog(item.getUid(),
+			    userId.longValue());
+		    if (visitLog != null) {
+			resourceItemVisitDao.removeObject(ResourceItemVisitLog.class, visitLog.getUid());
+		    }
+
+		    if (item.getFileUuid() != null) {
+			try {
+			    resourceToolContentHandler.deleteFile(item.getFileUuid());
+			} catch (Exception e) {
+			    throw new ToolException("Error while removing Share Resources file UUID "
+				    + item.getFileUuid(), e);
+			}
+		    }
+		    resourceItemDao.removeObject(ResourceItem.class, item.getUid());
+		    itemIterator.remove();
+		}
+	    }
+	    
+	    ResourceUser user = resourceUserDao.getUserByUserIDAndSessionID(userId.longValue(), session.getSessionId());
+	    if (user != null) {
+		user.setSessionFinished(false);
+		resourceUserDao.saveObject(user);
+	    }
+	}
+    }
+    
     public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException {
 	ResourceSession session = new ResourceSession();
 	session.setSessionId(toolSessionId);
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java,v
diff -u -r1.2 -r1.3
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java	17 Jan 2014 22:06:30 -0000	1.2
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java	2 Feb 2014 17:18:40 -0000	1.3
@@ -26,6 +26,7 @@
 
 import java.util.Hashtable;
 import java.util.List;
+import java.util.Set;
 import java.util.SortedMap;
 
 import org.apache.log4j.Logger;
@@ -179,7 +180,34 @@
     public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException,
 	    ToolException {
     }
+    
+    @SuppressWarnings("unchecked")
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (logger.isDebugEnabled()) {
+	    logger.debug("Removing Leader Selection state for user ID " + userId + " and toolContentId "
+		    + toolContentId);
+	}
 
+	Leaderselection selection = leaderselectionDAO.getByContentId(toolContentId);
+	if (selection == null) {
+	    return;
+	}
+
+	for (LeaderselectionSession session : (Set<LeaderselectionSession>) selection.getLeaderselectionSessions()) {
+	    if (session.getGroupLeader() != null && session.getGroupLeader().getUserId().equals(userId.longValue())) {
+		session.setGroupLeader(null);
+		leaderselectionSessionDAO.update(session);
+	    }
+
+	    LeaderselectionUser user = leaderselectionUserDAO.getByUserIdAndSessionId(userId.longValue(),
+		    session.getSessionId());
+	    if (user != null) {
+		user.setFinishedActivity(false);
+		leaderselectionDAO.update(user);
+	    }
+	}
+    }
+
     @Override
     public void exportToolContent(Long toolContentId, String rootPath) throws DataMissingException, ToolException {
 	Leaderselection content = leaderselectionDAO.getByContentId(toolContentId);
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/IMindmapNodeDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/IMindmapNodeDAO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/IMindmapNodeDAO.java	12 May 2009 01:38:59 -0000	1.2
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/IMindmapNodeDAO.java	2 Feb 2014 17:19:30 -0000	1.3
@@ -28,6 +28,7 @@
 
 import org.lamsfoundation.lams.dao.IBaseDAO;
 import org.lamsfoundation.lams.tool.mindmap.model.MindmapNode;
+import org.lamsfoundation.lams.tool.mindmap.model.MindmapSession;
 
 /**
  * IMindmapNodeDao
@@ -62,4 +63,6 @@
     public Long getNodeLastUniqueIdByMindmapUidSessionId(Long mindmapUid, Long sessionId);
     
     public int getNumNodesByUserAndSession(Long userId, Long sessionId);
+    
+    public List<MindmapNode> getMindmapNodesBySessionIdAndUserId(Long sessionId, Long userId);
 }
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/IMindmapRequestDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/IMindmapRequestDAO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/IMindmapRequestDAO.java	12 May 2009 01:38:59 -0000	1.2
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/IMindmapRequestDAO.java	2 Feb 2014 17:19:30 -0000	1.3
@@ -42,4 +42,6 @@
     public MindmapRequest getRequestByUniqueId(Long uniqueId, Long userId, Long mindmapId, Long globalId);
     
     public Long getLastGlobalIdByMindmapId(Long mindmapId, Long sessionId);
+    
+    public List<MindmapRequest> getRequestsByUserId(Long userId);
 }
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapNodeDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapNodeDAO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapNodeDAO.java	12 May 2009 01:39:01 -0000	1.2
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapNodeDAO.java	2 Feb 2014 17:19:30 -0000	1.3
@@ -33,7 +33,6 @@
 import org.lamsfoundation.lams.tool.mindmap.model.MindmapNode;
 
 /**
- * MindmapNodeDao
  * 
  * @author Ruslan Kazakov
  */
@@ -76,6 +75,9 @@
     private static final String SQL_QUERY_FIND_NODES_NUMBER_BY_USERUID_SESSIONID = " select count(*) from "
 	    + MindmapNode.class.getName() + " mn where mn.user.uid = ? ";
     
+    private static final String SQL_QUERY_FIND_NODES_BY_SESSION_ID_AND_USER_ID = "from " + MindmapNode.class.getName()
+	    + " mn where mn.session.sessionId = ? and mn.user.userId = ?";
+    
     /* Functions Implementations */
     
     // deleting Mindmap nodes in singleuser mode
@@ -166,4 +168,10 @@
 	else
 	    return 0;
     }
+    
+    @SuppressWarnings("unchecked")
+    public List<MindmapNode> getMindmapNodesBySessionIdAndUserId(Long sessionId, Long userId) {
+	return this.getHibernateTemplate().find(SQL_QUERY_FIND_NODES_BY_SESSION_ID_AND_USER_ID,
+		new Object[] { sessionId, userId });
+    }
 }
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapRequestDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapRequestDAO.java,v
diff -u -r1.4 -r1.5
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapRequestDAO.java	17 Jan 2014 22:06:37 -0000	1.4
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapRequestDAO.java	2 Feb 2014 17:19:30 -0000	1.5
@@ -47,6 +47,9 @@
 	" select mr.globalId from " + MindmapRequest.class.getName() + " mr where mr.mindmap.uid = ? and " +
 	" mr.user.mindmapSession.sessionId = ? order by mr.globalId desc limit 1 ";
     
+    private static final String SQL_QUERY_FIND_REQUESTS_BY_USER_ID =
+		" from " + MindmapRequest.class.getName() + " mr where mr.user.userId = ? ";
+    
     public void saveOrUpdate(MindmapRequest mindmapRequest) {
 	this.getHibernateTemplate().saveOrUpdate(mindmapRequest);
     }
@@ -73,4 +76,9 @@
 	else
 	    return 0l;
     }
+    
+    @SuppressWarnings("unchecked")
+    public List<MindmapRequest> getRequestsByUserId(Long userId) {
+	return this.getHibernateTemplate().find(SQL_QUERY_FIND_REQUESTS_BY_USER_ID, userId);
+    }
 }
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapNode.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapNode.java,v
diff -u -r1.2 -r1.3
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapNode.java	12 May 2009 01:39:00 -0000	1.2
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapNode.java	2 Feb 2014 17:19:30 -0000	1.3
@@ -90,7 +90,7 @@
 	}
 	
 	/**
-	 * @hibernate.many-to-one column="parent_id" cascade="all" 
+	 * @hibernate.many-to-one column="parent_id"
 	 * @return
 	 */
 	public MindmapNode getParent() {
@@ -136,7 +136,7 @@
 
 	/**
 	 * @return Returns the sessionid of the session in Mindmap.
-	 * @hibernate.many-to-one column="session_id" cascade="all"
+	 * @hibernate.many-to-one column="session_id"
 	 */
 	public MindmapSession getSession() {
 	    return session;
@@ -151,7 +151,7 @@
 	
 	/**
 	 * @return Returns the userid of the user who created the Mindmap.
-	 * @hibernate.many-to-one column="user_id" cascade="all"
+	 * @hibernate.many-to-one column="user_id"
 	 */
 	public MindmapUser getUser() {
 	    return user;
@@ -166,7 +166,7 @@
 	
 	/**
 	 * @return Returns the userid of the user who created the Mindmap.
-	 * @hibernate.many-to-one column="mindmap_id" cascade="all"
+	 * @hibernate.many-to-one column="mindmap_id"
 	 */
 	public Mindmap getMindmap() {
 	    return mindmap;
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java,v
diff -u -r1.11 -r1.12
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java	17 Jan 2014 22:06:37 -0000	1.11
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java	2 Feb 2014 17:19:30 -0000	1.12
@@ -25,10 +25,13 @@
 package org.lamsfoundation.lams.tool.mindmap.service;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.Hashtable;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 import java.util.SortedMap;
 
 import org.apache.log4j.Logger;
@@ -376,6 +379,71 @@
 	// TODO Auto-generated method stub
     }
 
+    @SuppressWarnings("unchecked")
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (logger.isDebugEnabled()) {
+	    logger.debug("Removing Mindmap content for user ID " + userId + " and toolContentId " + toolContentId);
+	}
+
+	Mindmap mindmap = mindmapDAO.getByContentId(toolContentId);
+	if (mindmap == null) {
+	    logger.warn("Did not find activity with toolContentId: " + toolContentId + " to remove learner content");
+	    return;
+	}
+
+	List<MindmapNode> nodesToDelete = new LinkedList<MindmapNode>();
+	for (MindmapSession session : (Set<MindmapSession>) mindmap.getMindmapSessions()) {
+	    List<MindmapNode> nodes = mindmapNodeDAO.getMindmapNodesBySessionIdAndUserId(session.getSessionId(),
+		    userId.longValue());
+
+	    for (MindmapNode node : nodes) {
+		List<MindmapNode> descendants = new LinkedList<MindmapNode>();
+		if (node.getUser() != null && node.getUser().getUserId().equals(userId.longValue())
+			&& !nodesToDelete.contains(node)
+			&& userOwnsChildrenNodes(node, userId.longValue(), descendants)) {
+		    // reverse so leafs are first and nodes closer to root are last
+		    descendants.add(node);
+		    nodesToDelete.addAll(descendants);
+		}
+	    }
+	    MindmapUser user = mindmapUserDAO.getByUserIdAndSessionId(userId.longValue(), session.getSessionId());
+	    if (user != null) {
+		if (user.getEntryUID() != null) {
+		    NotebookEntry entry = coreNotebookService.getEntry(user.getEntryUID());
+		    mindmapDAO.delete(entry);
+		    user.setEntryUID(null);
+		    mindmapUserDAO.update(user);
+		}
+	    }
+
+	}
+
+	for (MindmapNode node : nodesToDelete) {
+	    mindmapNodeDAO.delete(node);
+	}
+
+	List<MindmapRequest> requests = mindmapRequestDAO.getRequestsByUserId(userId.longValue());
+	for (MindmapRequest request : requests) {
+	    mindmapRequestDAO.delete(request);
+	}
+    }
+    
+    @SuppressWarnings("unchecked")
+    private boolean userOwnsChildrenNodes(MindmapNode node, Long userId, List<MindmapNode> descendants) {
+	List<MindmapNode> children = mindmapNodeDAO.getMindmapNodeByParentIdMindmapIdSessionId(node.getNodeId(), node
+		.getMindmap().getUid(), node.getSession().getSessionId());
+	for (MindmapNode child : children) {
+	    boolean userOwnsChild = child.getUser() != null && child.getUser().getUserId().equals(userId)
+		    && userOwnsChildrenNodes(child, userId, descendants);
+	    if (!userOwnsChild) {
+		return false;
+	    }
+	    descendants.add(child);
+	}
+	return true;
+    }
+    
+    
     /**
      * Export the XML fragment for the tool's content, along with any files needed for the content.
      * 
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java,v
diff -u -r1.49 -r1.50
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java	17 Jan 2014 22:10:33 -0000	1.49
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java	2 Feb 2014 17:18:59 -0000	1.50
@@ -629,6 +629,28 @@
 	removeNoticeboard(toolContentId);
     }
 
+    @SuppressWarnings("unchecked")
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (log.isDebugEnabled()) {
+	    log.debug("Removing Noticeboard finished flat for user ID " + userId + " and toolContentId "
+		    + toolContentId);
+	}
+
+	NoticeboardContent nbContent = nbContentDAO.findNbContentById(toolContentId);
+	if (nbContent == null) {
+	    log.warn("Did not find activity with toolContentId: " + toolContentId + " to remove learner content");
+	    return;
+	}
+
+	for (NoticeboardSession session : (Set<NoticeboardSession>) nbContent.getNbSessions()) {
+	    NoticeboardUser user = nbUserDAO.getNbUser(userId.longValue(), session.getNbSessionId());
+	    if (user != null) {
+		user.setUserStatus(NoticeboardUser.INCOMPLETE);
+		nbUserDAO.updateNbUser(user);
+	    }
+	}
+    }
+    
     private NoticeboardContent getAndCheckIDandObject(Long toolContentId) throws ToolException, DataMissingException {
 	if (toolContentId == null) {
 	    throw new ToolException("Tool content ID is missing. Unable to continue");
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java,v
diff -u -r1.27 -r1.28
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	17 Jan 2014 22:10:27 -0000	1.27
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	2 Feb 2014 17:19:00 -0000	1.28
@@ -29,6 +29,7 @@
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Random;
+import java.util.Set;
 import java.util.SortedMap;
 
 import org.apache.log4j.Logger;
@@ -185,7 +186,34 @@
     public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException,
 	    ToolException {
     }
+    
+    @SuppressWarnings("unchecked")
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (logger.isDebugEnabled()) {
+	    logger.debug("Removing Notebook entries for user ID " + userId + " and toolContentId " + toolContentId);
+	}
 
+	Notebook notebook = notebookDAO.getByContentId(toolContentId);
+	if (notebook == null) {
+	    logger.warn("Did not find activity with toolContentId: " + toolContentId + " to remove learner content");
+	    return;
+	}
+	
+	for (NotebookSession session : (Set<NotebookSession>) notebook.getNotebookSessions()) {
+	    NotebookUser user = notebookUserDAO.getByUserIdAndSessionId(userId.longValue(), session.getSessionId());
+	    if (user != null) {
+		if (user.getEntryUID() != null) {
+		    NotebookEntry entry = coreNotebookService.getEntry(user.getEntryUID());
+		    notebookDAO.delete(entry);
+		    user.setEntryUID(null);
+		}
+
+		user.setFinishedActivity(false);
+		notebookUserDAO.update(user);
+	    }
+	}
+    }
+
     /**
      * Export the XML fragment for the tool's content, along with any files needed for the content.
      * 
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java,v
diff -u -r1.10 -r1.11
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java	17 Jan 2014 22:10:30 -0000	1.10
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java	2 Feb 2014 17:18:44 -0000	1.11
@@ -261,6 +261,31 @@
 	// TODO Auto-generated method stub
     }
 
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (logger.isDebugEnabled()) {
+	    logger.debug("Removing Pixlr image for user ID " + userId + " and toolContentId " + toolContentId);
+
+	    Pixlr pixlr = pixlrDAO.getByContentId(toolContentId);
+	    if (pixlr != null) {
+		for (PixlrSession session : pixlr.getPixlrSessions()) {
+		    PixlrUser user = pixlrUserDAO.getByUserIdAndSessionId(userId.longValue(), session.getSessionId());
+		    user.setFinishedActivity(false);
+		    user.setImageFileName(null);
+		    user.setImageHeight(null);
+		    user.setImageWidth(null);
+		    user.setImageHidden(false);
+		    user.setFinishedActivity(false);
+		    if (user.getEntryUID() != null) {
+			NotebookEntry entry = coreNotebookService.getEntry(user.getEntryUID());
+			pixlrDAO.delete(entry);
+		    }
+
+		    pixlrUserDAO.update(user);
+		}
+	    }
+	}
+    }
+    
     /**
      * Export the XML fragment for the tool's content, along with any files needed for the content.
      * 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java,v
diff -u -r1.88 -r1.89
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	17 Jan 2014 22:12:23 -0000	1.88
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	2 Feb 2014 17:19:25 -0000	1.89
@@ -223,7 +223,26 @@
 	    submitFilesContentDAO.delete(submitFilesContent);
 	}
     }
+    
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (log.isDebugEnabled()) {
+	    log.debug("Removing Submit Files content for user ID " + userId + " and toolContentId " + toolContentId);
+	}
 
+	List<SubmitFilesSession> sessions = submitFilesSessionDAO.getSubmitFilesSessionByContentID(toolContentId);
+	for (SubmitFilesSession session : sessions) {
+	    List<SubmissionDetails> submissions = submissionDetailsDAO.getBySessionAndLearner(session.getSessionID(),
+		    userId);
+	    submissionDetailsDAO.deleteAll(submissions);
+
+	    SubmitUser user = submitUserDAO.getLearner(session.getSessionID(), userId);
+	    if (user != null) {
+		user.setFinished(false);
+		submitUserDAO.update(user);
+	    }
+	}
+    }
+
     public List<SubmitFilesSession> getSessionsByContentID(Long toolContentID) {
 	return submitFilesSessionDAO.getSubmitFilesSessionByContentID(toolContentID);
     }
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java,v
diff -u -r1.41 -r1.42
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	17 Jan 2014 22:12:28 -0000	1.41
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	2 Feb 2014 17:19:18 -0000	1.42
@@ -1824,7 +1824,13 @@
 	}
 	scratchieDao.delete(scratchie);
     }
-
+    
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (log.isDebugEnabled()) {
+	    log.debug("This tool does not support learner content removing yet.");
+	}
+    }
+    
     @Override
     public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException {
 	if (ScratchieServiceImpl.log.isDebugEnabled()) {
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java,v
diff -u -r1.26 -r1.27
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java	17 Jan 2014 22:12:31 -0000	1.26
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java	2 Feb 2014 17:19:35 -0000	1.27
@@ -205,7 +205,36 @@
 	    ToolException {
 	// TODO Auto-generated method stub
     }
+    
+    @SuppressWarnings("unchecked")
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (logger.isDebugEnabled()) {
+	    logger.debug("Removing Scribe contents for user ID " + userId + " and toolContentId " + toolContentId);
+	}
 
+	Scribe scribe = scribeDAO.getByContentId(toolContentId);
+	if (scribe == null) {
+	    logger.warn("Did not find activity with toolContentId: " + toolContentId + " to remove learner content");
+	    return;
+	}
+
+	for (ScribeSession session : (Set<ScribeSession>) scribe.getScribeSessions()) {
+	    if (session.getAppointedScribe() != null
+		    && session.getAppointedScribe().getUserId().equals(userId.longValue())) {
+		session.setAppointedScribe(null);
+		scribeSessionDAO.update(session);
+	    }
+
+	    ScribeUser user = scribeUserDAO.getByUserIdAndSessionId(userId.longValue(), session.getSessionId());
+	    if (user != null) {
+		user.setFinishedActivity(false);
+		user.setStartedActivity(false);
+		user.setReportApproved(false);
+		scribeUserDAO.saveOrUpdate(user);
+	    }
+	}
+    }
+    
     /**
      * Export the XML fragment for the tool's content, along with any files needed for the content.
      * 
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java,v
diff -u -r1.10 -r1.11
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java	17 Jan 2014 22:12:25 -0000	1.10
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java	2 Feb 2014 17:19:22 -0000	1.11
@@ -594,6 +594,27 @@
 	spreadsheetDao.delete(spreadsheet);
     }
 
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (log.isDebugEnabled()) {
+	    log.debug("Removing Spreadsheet contents for user ID " + userId + " and toolContentId " + toolContentId);
+	}
+
+	List<SpreadsheetSession> sessions = spreadsheetSessionDao.getByContentId(toolContentId);
+	for (SpreadsheetSession session : sessions) {
+	    SpreadsheetUser user = spreadsheetUserDao.getUserByUserIDAndSessionID(userId.longValue(),
+		    session.getSessionId());
+	    if (user != null) {
+		user.setSessionFinished(false);
+		if (user.getUserModifiedSpreadsheet() != null) {
+		    userModifiedSpreadsheetDao.removeObject(UserModifiedSpreadsheet.class, user
+			    .getUserModifiedSpreadsheet().getUid());
+		    user.setUserModifiedSpreadsheet(null);
+		}
+		spreadsheetUserDao.saveObject(user);
+	    }
+	}
+    }
+    
     public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException {
 	SpreadsheetSession session = new SpreadsheetSession();
 	session.setSessionId(toolSessionId);
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyAnswerDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyAnswerDAO.java,v
diff -u -r1.4 -r1.5
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyAnswerDAO.java	27 Sep 2006 07:11:45 -0000	1.4
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyAnswerDAO.java	2 Feb 2014 17:18:41 -0000	1.5
@@ -37,5 +37,5 @@
 	 * @return
 	 */
 	List<SurveyAnswer> getSessionAnswer(Long sessionId,Long questionUid);
-
+	List<SurveyAnswer> getByToolContentIdAndUserId(Long toolContentId, Long userId);
 }
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java,v
diff -u -r1.5 -r1.6
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java	27 Sep 2006 07:11:45 -0000	1.5
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java	2 Feb 2014 17:18:41 -0000	1.6
@@ -31,6 +31,8 @@
 	private static final String GET_LEARNER_ANSWER = "from "+SurveyAnswer.class.getName()+" as a where a.surveyQuestion.uid=? and a.user.uid=?";
 	private static final String GET_SESSION_ANSWER = "from "+SurveyAnswer.class.getName()+" as a " +
 							" where a.user.session.sessionId=? and a.surveyQuestion.uid=?";
+	private static final String GET_BY_TOOL_CONTENT_ID_AND_USER_ID = "from "+SurveyAnswer.class.getName()+" as a " +
+		" where a.user.session.survey.contentId = ? and a.user.userId = ?";
 	
 	public SurveyAnswer getAnswer(Long questionUid, Long userUid) {
 		List list = getHibernateTemplate().find(GET_LEARNER_ANSWER,new Object[]{questionUid,userUid});
@@ -43,5 +45,9 @@
 	public List<SurveyAnswer> getSessionAnswer(Long sessionId, Long questionUid) {
 		return getHibernateTemplate().find(GET_SESSION_ANSWER,new Object[]{sessionId,questionUid});
 	}
-
+	
+    @SuppressWarnings("unchecked")
+    public List<SurveyAnswer> getByToolContentIdAndUserId(Long toolContentId, Long userId) {
+	return getHibernateTemplate().find(GET_BY_TOOL_CONTENT_ID_AND_USER_ID, new Object[] { toolContentId, userId });
+    }
 }
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java,v
diff -u -r1.32 -r1.33
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	17 Jan 2014 22:18:06 -0000	1.32
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	2 Feb 2014 17:18:41 -0000	1.33
@@ -702,6 +702,23 @@
 	surveyDao.delete(survey);
     }
 
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (log.isDebugEnabled()) {
+	    log.debug("Removing Survey answers for user ID " + userId + " and toolContentId " + toolContentId);
+	}
+
+	List<SurveyAnswer> answers = surveyAnswerDao.getByToolContentIdAndUserId(toolContentId, userId.longValue());
+	for (SurveyAnswer answer : answers) {
+	    surveyAnswerDao.removeObject(SurveyAnswer.class, answer.getUid());
+	}
+
+	SurveyUser user = surveyUserDao.getUserByUserIDAndContentID(userId.longValue(), toolContentId);
+	if (user != null) {
+	    user.setSessionFinished(false);
+	    surveyUserDao.saveObject(user);
+	}
+    }
+    
     public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException {
 	SurveySession session = new SurveySession();
 	session.setSessionId(toolSessionId);
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java,v
diff -u -r1.32 -r1.33
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java	17 Jan 2014 22:18:13 -0000	1.32
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java	2 Feb 2014 17:18:51 -0000	1.33
@@ -883,6 +883,64 @@
 	taskListDao.delete(taskList);
     }
 
+    @SuppressWarnings("unchecked")
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (log.isDebugEnabled()) {
+	    log.debug("Removing Task List contents for user ID " + userId + " and toolContentId " + toolContentId);
+	}
+	TaskList taskList = taskListDao.getByContentId(toolContentId);
+	if (taskList == null) {
+	    log.warn("Did not find activity with toolContentId: " + toolContentId + " to remove learner content");
+	    return;
+	}
+
+	List<TaskListSession> sessions = taskListSessionDao.getByContentId(toolContentId);
+	for (TaskListSession session : sessions) {
+	    Set<TaskListItem> items = session.getTaskListItems();
+	    for (TaskListItem item : items) {
+		if (log.isDebugEnabled()) {
+		    log.debug("Removing visit log, comments and attachments for user ID " + userId + " and item UID "
+			    + item.getUid());
+		}
+		TaskListItemVisitLog visitLog = taskListItemVisitDao.getTaskListItemLog(item.getUid(),
+			userId.longValue());
+		if (visitLog != null) {
+		    taskListDao.removeObject(TaskListItemVisitLog.class, visitLog.getUid());
+		}
+
+		Iterator<TaskListItemAttachment> attachmentIter = item.getAttachments().iterator();
+		while (attachmentIter.hasNext()) {
+		    TaskListItemAttachment attachment = attachmentIter.next();
+		    if (attachment.getCreateBy().getUserId().equals(userId.longValue())) {
+			try {
+			    taskListToolContentHandler.deleteFile(attachment.getFileUuid());
+			} catch (Exception e) {
+			    throw new ToolException("Error while removing Task List attachment", e);
+			}
+			taskListDao.removeObject(TaskListItemAttachment.class, attachment.getUid());
+			attachmentIter.remove();
+		    }
+		}
+
+		Iterator<TaskListItemComment> commentIter = item.getComments().iterator();
+		while (commentIter.hasNext()) {
+		    TaskListItemComment comment = commentIter.next();
+		    if (comment.getCreateBy().getUserId().equals(userId.longValue())) {
+			taskListDao.removeObject(TaskListItemComment.class, comment.getUid());
+			commentIter.remove();
+		    }
+		}
+	    }
+
+	    TaskListUser user = taskListUserDao.getUserByUserIDAndSessionID(userId.longValue(), session.getSessionId());
+	    if (user != null) {
+		user.setSessionFinished(false);
+		user.setVerifiedByMonitor(false);
+		taskListUserDao.saveObject(user);
+	    }
+	}
+    }
+
     /**
      * {@inheritDoc}
      */
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderCommentDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderCommentDAO.java,v
diff -u -r1.3 -r1.4
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderCommentDAO.java	2 Jul 2009 09:59:59 -0000	1.3
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderCommentDAO.java	2 Feb 2014 17:19:13 -0000	1.4
@@ -41,11 +41,11 @@
 	 */
 	VideoRecorderComment getCommentById(Long commentId);
 	
-	Set<VideoRecorderComment> getCommentsByUserId(Long userId);
+	List<VideoRecorderComment> getCommentsByUserId(Long userId);
 	
-	Set<VideoRecorderComment> getCommentsByToolSessionId(Long toolSessionId);
+	List<VideoRecorderComment> getCommentsByToolSessionId(Long toolSessionId);
 	
-	Set<VideoRecorderComment> getCommentsByRecordingId(Long recordingId);
+	List<VideoRecorderComment> getCommentsByRecordingId(Long recordingId);
 	
 	void saveOrUpdate(VideoRecorderComment videoRecorderComment);
 	
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderRatingDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderRatingDAO.java,v
diff -u -r1.3 -r1.4
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderRatingDAO.java	2 Jul 2009 09:59:59 -0000	1.3
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderRatingDAO.java	2 Feb 2014 17:19:13 -0000	1.4
@@ -41,9 +41,9 @@
 	 */
 	VideoRecorderRating getRatingById(Long ratingId);
 	
-	Set<VideoRecorderRating> getRatingsByUserId(Long userId);
+	List<VideoRecorderRating> getRatingsByUserId(Long userId);
 	
-	Set<VideoRecorderRating> getRatingsByToolSessionId(Long toolSessionId);
+	List<VideoRecorderRating> getRatingsByToolSessionId(Long toolSessionId);
 	
 	void saveOrUpdate(VideoRecorderRating videoRecorderRating);
 	
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderRecordingDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderRecordingDAO.java,v
diff -u -r1.4 -r1.5
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderRecordingDAO.java	2 Jul 2009 08:18:23 -0000	1.4
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/IVideoRecorderRecordingDAO.java	2 Feb 2014 17:19:13 -0000	1.5
@@ -44,8 +44,10 @@
 	
 	List<VideoRecorderRecording> getByToolContentId(Long toolContentId);
 	
-	List<VideoRecorderRecording> getBySessionAndUserIds(Long toolSessionId, Long userId);
+	List<VideoRecorderRecording> getBySessionAndUserUid(Long toolSessionId, Long userId);
 	
+	List<VideoRecorderRecording> getBySessionAndUserId(Long toolSessionId, Long userId);
+	
 	void saveOrUpdate(VideoRecorderRecording videoRecorderRecording);
 	
 	Long getNbRecordings(Long userID, Long sessionId);
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderCommentDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderCommentDAO.java,v
diff -u -r1.3 -r1.4
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderCommentDAO.java	2 Jul 2009 09:59:59 -0000	1.3
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderCommentDAO.java	2 Feb 2014 17:19:12 -0000	1.4
@@ -63,16 +63,16 @@
 		return (VideoRecorderComment) list.get(0);
 	}
 	
-	public Set<VideoRecorderComment> getCommentsByUserId(Long userId){
-		return (Set<VideoRecorderComment>)(this.getHibernateTemplate().find(SQL_QUERY_BY_USER_ID, userId));
+	public List<VideoRecorderComment> getCommentsByUserId(Long userId){
+		return (List<VideoRecorderComment>)(this.getHibernateTemplate().find(SQL_QUERY_BY_USER_ID, userId));
 	}
 
-	public Set<VideoRecorderComment> getCommentsByToolSessionId(Long toolSessionId){
-		return (Set<VideoRecorderComment>)(this.getHibernateTemplate().find(SQL_QUERY_BY_TOOL_SESSION_ID, toolSessionId));
+	public List<VideoRecorderComment> getCommentsByToolSessionId(Long toolSessionId){
+		return (List<VideoRecorderComment>)(this.getHibernateTemplate().find(SQL_QUERY_BY_TOOL_SESSION_ID, toolSessionId));
 	}
 	
-	public Set<VideoRecorderComment> getCommentsByRecordingId(Long recordingId) {
-		return (Set<VideoRecorderComment>)(this.getHibernateTemplate().find(SQL_QUERY_BY_TOOL_RECORDING_ID, recordingId));
+	public List<VideoRecorderComment> getCommentsByRecordingId(Long recordingId) {
+		return (List<VideoRecorderComment>)(this.getHibernateTemplate().find(SQL_QUERY_BY_TOOL_RECORDING_ID, recordingId));
 	}
 	
     public void saveOrUpdate(VideoRecorderComment videoRecorderComment) {
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRatingDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRatingDAO.java,v
diff -u -r1.3 -r1.4
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRatingDAO.java	2 Jul 2009 09:59:59 -0000	1.3
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRatingDAO.java	2 Feb 2014 17:19:13 -0000	1.4
@@ -65,12 +65,12 @@
 		return (VideoRecorderRating) list.get(0);
 	}
 	
-	public Set<VideoRecorderRating> getRatingsByUserId(Long userId){
-		return (Set<VideoRecorderRating>)(this.getHibernateTemplate().find(SQL_QUERY_BY_USER_ID, userId));
+	public List<VideoRecorderRating> getRatingsByUserId(Long userId){
+		return (List<VideoRecorderRating>)(this.getHibernateTemplate().find(SQL_QUERY_BY_USER_ID, userId));
 	}
 	
-	public Set<VideoRecorderRating> getRatingsByToolSessionId(Long toolSessionId){
-		return (Set<VideoRecorderRating>)(this.getHibernateTemplate().find(SQL_QUERY_BY_TOOL_SESSION_ID, toolSessionId));
+	public List<VideoRecorderRating> getRatingsByToolSessionId(Long toolSessionId){
+		return (List<VideoRecorderRating>)(this.getHibernateTemplate().find(SQL_QUERY_BY_TOOL_SESSION_ID, toolSessionId));
 	}
 
     public void saveOrUpdate(VideoRecorderRating videoRecorderRating) {
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRecordingDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRecordingDAO.java,v
diff -u -r1.4 -r1.5
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRecordingDAO.java	2 Jul 2009 08:18:30 -0000	1.4
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRecordingDAO.java	2 Feb 2014 17:19:13 -0000	1.5
@@ -46,8 +46,11 @@
 	private static final String SQL_QUERY_BY_TOOL_CONTENT_ID = "from " + VideoRecorderRecording.class.getName() + " as vrr "
 	+ "where vrr.toolContentId=?";
 	
+	private static final String SQL_QUERY_BY_SESSION_ID_AND_USER_UID = "from " + VideoRecorderRecording.class.getName() + " as vrr "
+	+ "where vrr.videoRecorderSession.sessionId=? and vrr.createBy.uid=?";
+	
 	private static final String SQL_QUERY_BY_SESSION_ID_AND_USER_ID = "from " + VideoRecorderRecording.class.getName() + " as vrr "
-	+ "where vrr.videoRecorderSession.sessionId=? and vrr.createBy=?";
+	+ "where vrr.videoRecorderSession.sessionId=? and vrr.createBy.userId=?";
 	
 	private static final String SQL_QUERY_NB_RECORDINGS_BY_USER = "select count(*) from " + VideoRecorderRecording.class.getName() + " vrr "
 	+ " where vrr.createBy.userId=? and vrr.videoRecorderSession.sessionId=?";
@@ -67,10 +70,14 @@
 		return (List<VideoRecorderRecording>)(this.getHibernateTemplate().find(SQL_QUERY_BY_SESSION_ID, toolSessionId));
 	}
 	
-	public List<VideoRecorderRecording> getBySessionAndUserIds(Long toolSessionId, Long userId){
+	public List<VideoRecorderRecording> getBySessionAndUserUid(Long toolSessionId, Long userUid){
+		return (List<VideoRecorderRecording>)(this.getHibernateTemplate().find(SQL_QUERY_BY_SESSION_ID_AND_USER_UID, new Object[] {toolSessionId, userUid}));
+	}
+	
+	public List<VideoRecorderRecording> getBySessionAndUserId(Long toolSessionId, Long userId){
 		return (List<VideoRecorderRecording>)(this.getHibernateTemplate().find(SQL_QUERY_BY_SESSION_ID_AND_USER_ID, new Object[] {toolSessionId, userId}));
 	}
-
+	
 	public List<VideoRecorderRecording> getByToolContentId(Long toolContentId){
 		return (List<VideoRecorderRecording>)(this.getHibernateTemplate().find(SQL_QUERY_BY_TOOL_CONTENT_ID, toolContentId));
 	}
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderCommentDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderCommentDTO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderCommentDTO.java	2 Jul 2009 09:59:58 -0000	1.2
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderCommentDTO.java	2 Feb 2014 17:19:12 -0000	1.3
@@ -26,6 +26,7 @@
 package org.lamsfoundation.lams.tool.videoRecorder.dto;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -67,7 +68,7 @@
 		this.videoRecorderSession = videoRecorderComment.getVideoRecorderSession();
 	}
 
-	public static Set<VideoRecorderCommentDTO> getVideoRecorderCommentDTOs(Set list){
+	public static Set<VideoRecorderCommentDTO> getVideoRecorderCommentDTOs(Collection list){
 		Set<VideoRecorderCommentDTO> retSet = new TreeSet<VideoRecorderCommentDTO>();
 		if(list == null || list.isEmpty())
 			return retSet;
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderRatingDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderRatingDTO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderRatingDTO.java	2 Jul 2009 09:59:58 -0000	1.2
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dto/VideoRecorderRatingDTO.java	2 Feb 2014 17:19:12 -0000	1.3
@@ -26,6 +26,7 @@
 package org.lamsfoundation.lams.tool.videoRecorder.dto;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
@@ -67,7 +68,7 @@
 		this.videoRecorderSession = videoRecorderRating.getVideoRecorderSession();
 	}
 
-	public static Set<VideoRecorderRatingDTO> getVideoRecorderRatingDTOs(Set list){
+	public static Set<VideoRecorderRatingDTO> getVideoRecorderRatingDTOs(Collection list){
 		Set<VideoRecorderRatingDTO> retSet = new TreeSet<VideoRecorderRatingDTO>();
 		if(list == null || list.isEmpty())
 			return retSet;
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/IVideoRecorderService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/IVideoRecorderService.java,v
diff -u -r1.6 -r1.7
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/IVideoRecorderService.java	17 Jan 2014 22:18:16 -0000	1.6
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/IVideoRecorderService.java	2 Feb 2014 17:19:12 -0000	1.7
@@ -122,7 +122,7 @@
      * @param userId
      * @return
      */
-    public Set<VideoRecorderComment> getCommentsByUserId(Long userId);
+    public List<VideoRecorderComment> getCommentsByUserId(Long userId);
     
     /**
      * 
@@ -146,13 +146,6 @@
     
     /**
      * 
-     * @param userId
-     * @return
-     */
-    public Set<VideoRecorderRating> getRatingsByUserId(Long userId);
-    
-    /**
-     * 
      * @param toolSessionId
      * @return
      */
@@ -194,7 +187,7 @@
      * @param toolContentId
      * @return
      */
-    public List<VideoRecorderRecordingDTO> getRecordingsByToolSessionIdAndUserId(Long toolSessionId, Long userId, Long toolContentId);
+    public List<VideoRecorderRecordingDTO> getRecordingsByToolSessionIdAndUserUid(Long toolSessionId, Long userId, Long toolContentId);
 
     /**
      * 
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java,v
diff -u -r1.12 -r1.13
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java	17 Jan 2014 22:18:16 -0000	1.12
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java	2 Feb 2014 17:19:12 -0000	1.13
@@ -235,7 +235,46 @@
 	    ToolException {
 	// TODO Auto-generated method stub
     }
+    
+    @SuppressWarnings("unchecked")
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (logger.isDebugEnabled()) {
+	    logger.debug("Removing Video Recorder contents for user ID " + userId + " and toolContentId "
+		    + toolContentId);
+	}
 
+	VideoRecorder videoRecorder = videoRecorderDAO.getByContentId(toolContentId);
+	if (videoRecorder == null) {
+	    logger.warn("Did not find activity with toolContentId: " + toolContentId + " to remove learner content");
+	    return;
+	}
+
+	for (VideoRecorderSession session : (Set<VideoRecorderSession>) videoRecorder.getVideoRecorderSessions()) {
+	    List<VideoRecorderComment> comments = videoRecorderCommentDAO.getCommentsByUserId(userId.longValue());
+	    videoRecorderCommentDAO.deleteAll(comments);
+
+	    List<VideoRecorderRating> ratings = videoRecorderRatingDAO.getRatingsByUserId(userId.longValue());
+	    videoRecorderRatingDAO.deleteAll(ratings);
+
+	    List<VideoRecorderRecording> recordings = videoRecorderRecordingDAO.getBySessionAndUserId(
+		    session.getSessionId(), userId.longValue());
+	    videoRecorderRecordingDAO.deleteAll(recordings);
+
+	    VideoRecorderUser user = videoRecorderUserDAO.getByUserIdAndSessionId(userId.longValue(),
+		    session.getSessionId());
+
+	    if (user != null) {
+		if (user.getEntryUID() != null) {
+		    NotebookEntry entry = coreNotebookService.getEntry(user.getEntryUID());
+		    videoRecorderDAO.delete(entry);
+		    user.setEntryUID(null);
+		}
+		user.setFinishedActivity(false);
+		videoRecorderUserDAO.update(user);
+	    }
+	}
+    }
+    
     /**
      * Export the XML fragment for the tool's content, along with any files needed for the content.
      * 
@@ -440,21 +479,17 @@
 	return videoRecorderCommentDAO.getCommentById(commentId);
     }
 
-    public Set<VideoRecorderRating> getRatingsByUserId(Long userId) {
-	return videoRecorderRatingDAO.getRatingsByUserId(userId);
-    }
-
     public Set<VideoRecorderRatingDTO> getRatingsByToolSessionId(Long toolSessionId) {
-	Set<VideoRecorderRating> list = videoRecorderRatingDAO.getRatingsByToolSessionId(toolSessionId);
+	List<VideoRecorderRating> list = videoRecorderRatingDAO.getRatingsByToolSessionId(toolSessionId);
 	return VideoRecorderRatingDTO.getVideoRecorderRatingDTOs(list);
     }
 
-    public Set<VideoRecorderComment> getCommentsByUserId(Long userId) {
+    public List<VideoRecorderComment> getCommentsByUserId(Long userId) {
 	return videoRecorderCommentDAO.getCommentsByUserId(userId);
     }
 
     public Set<VideoRecorderCommentDTO> getCommentsByToolSessionId(Long toolSessionId) {
-	Set<VideoRecorderComment> list = videoRecorderCommentDAO.getCommentsByToolSessionId(toolSessionId);
+	List<VideoRecorderComment> list = videoRecorderCommentDAO.getCommentsByToolSessionId(toolSessionId);
 	return VideoRecorderCommentDTO.getVideoRecorderCommentDTOs(list);
     }
 
@@ -465,9 +500,9 @@
 	return VideoRecorderRecordingDTO.getVideoRecorderRecordingDTOs(list);
     }
 
-    public List<VideoRecorderRecordingDTO> getRecordingsByToolSessionIdAndUserId(Long toolSessionId, Long userId,
+    public List<VideoRecorderRecordingDTO> getRecordingsByToolSessionIdAndUserUid(Long toolSessionId, Long userId,
 	    Long toolContentId) {
-	List<VideoRecorderRecording> list = videoRecorderRecordingDAO.getBySessionAndUserIds(toolSessionId, userId);
+	List<VideoRecorderRecording> list = videoRecorderRecordingDAO.getBySessionAndUserUid(toolSessionId, userId);
 	list.addAll(videoRecorderRecordingDAO.getByToolContentId(toolContentId));
 
 	return VideoRecorderRecordingDTO.getVideoRecorderRecordingDTOs(list);
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/VideoRecorderAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/VideoRecorderAction.java,v
diff -u -r1.1 -r1.2
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/VideoRecorderAction.java	7 May 2009 06:15:46 -0000	1.1
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/VideoRecorderAction.java	2 Feb 2014 17:19:13 -0000	1.2
@@ -138,7 +138,7 @@
 		// otherwise
 		} else{
 			// get all recordings from user specified
-			videoRecorderRecordingDTOs = videoRecorderService.getRecordingsByToolSessionIdAndUserId(toolSessionId, userId, toolContentId);
+			videoRecorderRecordingDTOs = videoRecorderService.getRecordingsByToolSessionIdAndUserUid(toolSessionId, userId, toolContentId);
 		}
 		
 		// sort the list of recording DTOs in order to create the xml correctly
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/servlets/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/servlets/ExportServlet.java,v
diff -u -r1.9 -r1.10
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/servlets/ExportServlet.java	17 Jan 2014 22:18:18 -0000	1.9
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/servlets/ExportServlet.java	2 Feb 2014 17:19:13 -0000	1.10
@@ -169,7 +169,7 @@
 		{
 			videoRecorderRecordingDTOs = videoRecorderService.getRecordingsByToolSessionId(toolSessionID, toolContentID);
 		}else{
-			videoRecorderRecordingDTOs = videoRecorderService.getRecordingsByToolSessionIdAndUserId(toolSessionID, videoRecorderUser.getUid(), toolContentID);
+			videoRecorderRecordingDTOs = videoRecorderService.getRecordingsByToolSessionIdAndUserUid(toolSessionID, videoRecorderUser.getUid(), toolContentID);
 		}
 		
 		// sort the list of recording dtos in order to create the xml correctly
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java,v
diff -u -r1.10 -r1.11
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java	23 Jan 2014 23:53:16 -0000	1.10
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java	2 Feb 2014 17:19:34 -0000	1.11
@@ -86,7 +86,6 @@
 	    Iterator listIterator = list.iterator();
 	    while (listIterator.hasNext()) {
 		VoteQueUsr user = (VoteQueUsr) listIterator.next();
-		logger.debug("user: " + user);
 		if (user.getVoteSession().getSessionStatus().equals("COMPLETED")) {
 		    ++completedSessionUserCount;
 		}
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java,v
diff -u -r1.77 -r1.78
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	29 Jan 2014 20:20:41 -0000	1.77
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	2 Feb 2014 17:19:34 -0000	1.78
@@ -1517,6 +1517,31 @@
 	}
     }
 
+    @SuppressWarnings("unchecked")
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (logger.isDebugEnabled()) {
+	    logger.debug("Removing Vote attempts for user ID " + userId + " and toolContentId " + toolContentId);
+	}
+
+	VoteContent voteContent = voteContentDAO.findVoteContentById(toolContentId);
+	if (voteContent == null) {
+	    logger.warn("Did not find activity with toolContentId: " + toolContentId + " to remove learner content");
+	    return;
+	}
+
+	for (VoteSession session : (Set<VoteSession>) voteContent.getVoteSessions()) {
+	    VoteQueUsr user = voteUserDAO.getVoteUserBySession(userId.longValue(), session.getUid());
+	    if (user != null) {
+		voteUsrAttemptDAO.removeAttemptsForUserandSession(user.getUid(), session.getUid());
+		user.getVoteUsrAttempts().clear();
+		
+		user.setFinalScreenRequested(false);
+		user.setResponseFinalised(false);
+		voteUserDAO.updateVoteUser(user);
+	    }
+	}
+    }
+
     /**
      * Export the XML fragment for the tool's content, along with any files needed for the content.
      * 
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java,v
diff -u -r1.21 -r1.22
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	17 Jan 2014 22:18:20 -0000	1.21
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	2 Feb 2014 17:18:50 -0000	1.22
@@ -28,6 +28,7 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Hashtable;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
@@ -275,7 +276,40 @@
 	    ToolException {
 	// TODO Auto-generated method stub
     }
+    
+    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+	if (logger.isDebugEnabled()) {
+	    logger.debug("Removing Wiki contents for user ID " + userId + " and toolContentId " + toolContentId);
+	}
 
+	Wiki wiki = wikiDAO.getByContentId(toolContentId);
+	if (wiki == null) {
+	    logger.warn("Did not find activity with toolContentId: " + toolContentId + " to remove learner content");
+	    return;
+	}
+
+	for (WikiSession session : wiki.getWikiSessions()) {
+	    for (WikiPage page : session.getWikiPages()) {
+		if (page.getAddedBy() != null && page.getAddedBy().getUserId().equals(userId.longValue())) {
+		    page.setDeleted(true);
+		    wikiPageDAO.update(page);
+		}
+	    }
+
+	    WikiUser user = wikiUserDAO.getByUserIdAndSessionId(userId.longValue(), session.getSessionId());
+	    if (user != null) {
+		if (user.getEntryUID() != null) {
+		    NotebookEntry entry = coreNotebookService.getEntry(user.getEntryUID());
+		    wikiDAO.delete(entry);
+		    user.setEntryUID(null);
+		}
+		user.setFinishedActivity(false);
+		user.setWikiEdits(0);
+		wikiUserDAO.update(user);
+	    }
+	}
+    }
+    
     /**
      * Export the XML fragment for the tool's content, along with any files needed for the content.
      * 
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java,v
diff -u -r1.10 -r1.11
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java	17 Jan 2014 22:18:09 -0000	1.10
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java	2 Feb 2014 17:19:23 -0000	1.11
@@ -342,7 +342,13 @@
 			throws SessionDataExistsException, ToolException {
 		// TODO Auto-generated method stub
 	}
-
+	    
+	    public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
+		if (logger.isDebugEnabled()) {
+		    logger.debug("This tool does not support learner content removing yet.");
+		}
+	    }
+	    
 	/**
 	 * Export the XML fragment for the tool's content, along with any files
 	 * needed for the content.