Index: lams_build/lib/lams/lams-monitoring.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams-monitoring.jar,v diff -u -r1.48.6.2 -r1.48.6.2.4.1 Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java,v diff -u -r1.84.4.1 -r1.84.4.1.2.1 --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java 4 Jun 2009 01:52:00 -0000 1.84.4.1 +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java 17 Feb 2010 03:23:22 -0000 1.84.4.1.2.1 @@ -43,8 +43,8 @@ import org.apache.log4j.Logger; import org.lamsfoundation.lams.authoring.IObjectExtractor; import org.lamsfoundation.lams.dao.hibernate.BaseDAO; -import org.lamsfoundation.lams.learningdesign.ActivityEvaluation; import org.lamsfoundation.lams.learningdesign.Activity; +import org.lamsfoundation.lams.learningdesign.ActivityEvaluation; import org.lamsfoundation.lams.learningdesign.BranchActivityEntry; import org.lamsfoundation.lams.learningdesign.BranchingActivity; import org.lamsfoundation.lams.learningdesign.Competence; @@ -872,6 +872,8 @@ Long newContentId = lamsCoreToolService.notifyToolToCopyContent(toolActivity, true, null); toolActivity.setToolContentId(newContentId); + // LDEV-2510 init tool sessions for support activities added during live edit + monitoringService.initToolSessionIfSuitable(toolActivity, lesson); } else { Integer newMaxId = monitoringService.startSystemActivity(activity, design.getMaxID(), now, lesson .getLessonName()); 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.85.4.1.4.1 -r1.85.4.1.4.2 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java 15 Dec 2009 00:53:52 -0000 1.85.4.1.4.1 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java 17 Feb 2010 03:23:22 -0000 1.85.4.1.4.2 @@ -34,6 +34,7 @@ import org.lamsfoundation.lams.learningdesign.Group; import org.lamsfoundation.lams.learningdesign.GroupingActivity; import org.lamsfoundation.lams.learningdesign.ScheduleGateActivity; +import org.lamsfoundation.lams.learningdesign.ToolActivity; import org.lamsfoundation.lams.learningdesign.exception.LearningDesignProcessorException; import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.lesson.Lesson; @@ -881,4 +882,6 @@ /** Get Organisation Name */ public String getOrganisationName(Integer organisationId); + public void initToolSessionIfSuitable(ToolActivity activity, Lesson lesson); + } 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.149.2.7.2.1 -r1.149.2.7.2.2 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 15 Dec 2009 00:53:52 -0000 1.149.2.7.2.1 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 17 Feb 2010 03:23:22 -0000 1.149.2.7.2.2 @@ -2040,7 +2040,7 @@ * @throws LamsToolServiceException * the exception when lams is talking to tool. */ - private void initToolSessionIfSuitable(ToolActivity activity, Lesson lesson) { + public void initToolSessionIfSuitable(ToolActivity activity, Lesson lesson) { if (activity.getApplyGrouping().equals(Boolean.FALSE) && activity.getParentBranch() == null) { activity.setToolSessions(new HashSet()); try {