Index: lams_central/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_central/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_central/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -3,7 +3,6 @@ - Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java =================================================================== diff -u -re3ce54ff7b473269e6148ad285f0148c61ae20af -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java (.../DisplayGroupAction.java) (revision e3ce54ff7b473269e6148ad285f0148c61ae20af) +++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java (.../DisplayGroupAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -43,8 +43,7 @@ import org.lamsfoundation.lams.index.IndexLessonBean; import org.lamsfoundation.lams.index.IndexLinkBean; import org.lamsfoundation.lams.index.IndexOrgBean; -import org.lamsfoundation.lams.learning.kumalive.model.Kumalive; -import org.lamsfoundation.lams.learning.kumalive.service.IKumaliveService; +import org.lamsfoundation.lams.learning.service.ICoreLearnerService; import org.lamsfoundation.lams.learningdesign.service.ILearningDesignService; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.lesson.service.LessonService; @@ -71,7 +70,7 @@ private static LessonService lessonService; private static ILearningDesignService learningDesignService; private static ISecurityService securityService; - private static IKumaliveService kumaliveService; + private static ICoreLearnerService learnerService; @Override @SuppressWarnings({ "unchecked" }) @@ -218,9 +217,9 @@ if (Configuration.getAsBoolean(ConfigurationKeys.ALLOW_KUMALIVE) && org.getEnableKumalive() && (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_MONITOR) || roles.contains(Role.ROLE_LEARNER))) { - Kumalive kumalive = getKumaliveService().getKumaliveByOrganisation(organisationId); + boolean isKumaliveDisabledForOrganisation = getLearnerService().isKumaliveDisabledForOrganisation(organisationId); boolean isMonitor = roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_MONITOR); - boolean disabled = !isMonitor && (kumalive == null || kumalive.getFinished()); + boolean disabled = !isMonitor && isKumaliveDisabledForOrganisation; links.add(new IndexLinkBean(isMonitor ? "index.kumalive.teacher" : "index.kumalive", "javascript:openKumalive(" + organisationId + ")", "fa fa-fw fa-bolt" + (disabled ? " disabled" : ""), "index.kumalive.tooltip")); @@ -285,7 +284,7 @@ while (lessonIter.hasNext()) { Entry entry = lessonIter.next(); if (entry.getValue().isDependent() - && !DisplayGroupAction.lessonService.checkLessonReleaseConditions(entry.getKey(), userId)) { + && !lessonService.checkLessonReleaseConditions(entry.getKey(), userId)) { lessonIter.remove(); } } @@ -360,47 +359,47 @@ } private IUserManagementService getUserManagementService() { - if (DisplayGroupAction.service == null) { + if (service == null) { WebApplicationContext ctx = WebApplicationContextUtils .getRequiredWebApplicationContext(getServlet().getServletContext()); - DisplayGroupAction.service = (IUserManagementService) ctx.getBean("userManagementService"); + service = (IUserManagementService) ctx.getBean("userManagementService"); } - return DisplayGroupAction.service; + return service; } private LessonService getLessonService() { - if (DisplayGroupAction.lessonService == null) { + if (lessonService == null) { WebApplicationContext ctx = WebApplicationContextUtils .getRequiredWebApplicationContext(getServlet().getServletContext()); - DisplayGroupAction.lessonService = (LessonService) ctx.getBean("lessonService"); + lessonService = (LessonService) ctx.getBean("lessonService"); } - return DisplayGroupAction.lessonService; + return lessonService; } private ILearningDesignService getLearningDesignService() { - if (DisplayGroupAction.learningDesignService == null) { + if (learningDesignService == null) { WebApplicationContext ctx = WebApplicationContextUtils .getRequiredWebApplicationContext(getServlet().getServletContext()); - DisplayGroupAction.learningDesignService = (ILearningDesignService) ctx.getBean("learningDesignService"); + learningDesignService = (ILearningDesignService) ctx.getBean("learningDesignService"); } - return DisplayGroupAction.learningDesignService; + return learningDesignService; } private ISecurityService getSecurityService() { - if (DisplayGroupAction.securityService == null) { + if (securityService == null) { WebApplicationContext ctx = WebApplicationContextUtils .getRequiredWebApplicationContext(getServlet().getServletContext()); - DisplayGroupAction.securityService = (ISecurityService) ctx.getBean("securityService"); + securityService = (ISecurityService) ctx.getBean("securityService"); } - return DisplayGroupAction.securityService; + return securityService; } - private IKumaliveService getKumaliveService() { - if (DisplayGroupAction.kumaliveService == null) { + private ICoreLearnerService getLearnerService() { + if (learnerService == null) { WebApplicationContext ctx = WebApplicationContextUtils .getRequiredWebApplicationContext(getServlet().getServletContext()); - DisplayGroupAction.kumaliveService = (IKumaliveService) ctx.getBean("kumaliveService"); + learnerService = (ICoreLearnerService) ctx.getBean("learnerService"); } - return DisplayGroupAction.kumaliveService; + return learnerService; } } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/ActivityPositionDTO.java =================================================================== diff -u -r24e3879be322523d08055711ab6fa8968047782b -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/ActivityPositionDTO.java (.../ActivityPositionDTO.java) (revision 24e3879be322523d08055711ab6fa8968047782b) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/ActivityPositionDTO.java (.../ActivityPositionDTO.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -21,7 +21,7 @@ */ -package org.lamsfoundation.lams.learning.web.bean; +package org.lamsfoundation.lams.learningdesign.dto; /** * Marks activity position within Learning Design. It can be extended to find out exact position (for example, 4th Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/ActivityURL.java =================================================================== diff -u -r24e3879be322523d08055711ab6fa8968047782b -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/ActivityURL.java (.../ActivityURL.java) (revision 24e3879be322523d08055711ab6fa8968047782b) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/ActivityURL.java (.../ActivityURL.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -22,7 +22,7 @@ */ -package org.lamsfoundation.lams.learning.web.bean; +package org.lamsfoundation.lams.learningdesign.dto; import java.util.List; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GateActivityDTO.java =================================================================== diff -u -r24e3879be322523d08055711ab6fa8968047782b -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GateActivityDTO.java (.../GateActivityDTO.java) (revision 24e3879be322523d08055711ab6fa8968047782b) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GateActivityDTO.java (.../GateActivityDTO.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -21,7 +21,7 @@ */ -package org.lamsfoundation.lams.learning.web.bean; +package org.lamsfoundation.lams.learningdesign.dto; import org.lamsfoundation.lams.learningdesign.GateActivity; Index: lams_gradebook/.classpath =================================================================== diff -u -r8af300291a3d55af7727f6f69e879bf2afff7627 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_gradebook/.classpath (.../.classpath) (revision 8af300291a3d55af7727f6f69e879bf2afff7627) +++ lams_gradebook/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -16,6 +16,5 @@ - Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java =================================================================== diff -u -r87806866f673458de317c4d1c6656b3bf5a81039 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (.../GradebookService.java) (revision 87806866f673458de317c4d1c6656b3bf5a81039) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (.../GradebookService.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -54,7 +54,6 @@ import org.lamsfoundation.lams.gradebook.util.LessonComparator; import org.lamsfoundation.lams.gradebook.util.UserComparator; import org.lamsfoundation.lams.learning.service.ICoreLearnerService; -import org.lamsfoundation.lams.learning.web.bean.ActivityURL; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.ActivityEvaluation; import org.lamsfoundation.lams.learningdesign.ComplexActivity; @@ -67,6 +66,7 @@ import org.lamsfoundation.lams.learningdesign.SequenceActivity; import org.lamsfoundation.lams.learningdesign.ToolActivity; import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO; +import org.lamsfoundation.lams.learningdesign.dto.ActivityURL; import org.lamsfoundation.lams.lesson.CompletedActivityProgress; import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.lesson.Lesson; Index: lams_learning/src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java =================================================================== diff -u -r127b2221ab5039e03f8d702b6a5f1e82279b5dbb -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_learning/src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java (.../CommandWebsocketServer.java) (revision 127b2221ab5039e03f8d702b6a5f1e82279b5dbb) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java (.../CommandWebsocketServer.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -17,7 +17,7 @@ import org.apache.log4j.Logger; import org.lamsfoundation.lams.learning.command.model.Command; -import org.lamsfoundation.lams.learning.service.ILearnerService; +import org.lamsfoundation.lams.learning.service.LearnerService; import org.lamsfoundation.lams.util.hibernate.HibernateSessionManager; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; @@ -32,7 +32,7 @@ @ServerEndpoint("/commandWebsocket") public class CommandWebsocketServer { - private static ILearnerService learnerService; + private static LearnerService learnerService; /** * A singleton which updates Learners with messages and commands. @@ -157,11 +157,11 @@ lessonWebsockets.remove(login); } - private static ILearnerService getLearnerService() { + private static LearnerService getLearnerService() { if (learnerService == null) { WebApplicationContext ctx = WebApplicationContextUtils .getWebApplicationContext(SessionManager.getServletContext()); - learnerService = (ILearnerService) ctx.getBean("learnerService"); + learnerService = (LearnerService) ctx.getBean("learnerService"); } return learnerService; } Index: lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressBuilder.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressBuilder.java (.../ProgressBuilder.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressBuilder.java (.../ProgressBuilder.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -29,14 +29,14 @@ import org.apache.commons.collections.ArrayStack; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.learning.web.bean.ActivityURL; import org.lamsfoundation.lams.learning.web.util.ActivityMapping; import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.ComplexActivity; import org.lamsfoundation.lams.learningdesign.LearningDesignProcessor; import org.lamsfoundation.lams.learningdesign.SimpleActivity; import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO; +import org.lamsfoundation.lams.learningdesign.dto.ActivityURL; import org.lamsfoundation.lams.learningdesign.exception.LearningDesignProcessorException; import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.lesson.Lesson; Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java =================================================================== diff -u -rfd1c6c450376476c752e6be5cb6048a2e370bd42 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java (.../BranchingActivityAction.java) (revision fd1c6c450376476c752e6be5cb6048a2e370bd42) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java (.../BranchingActivityAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -37,12 +37,12 @@ import org.apache.struts.action.DynaActionForm; import org.lamsfoundation.lams.learning.service.ICoreLearnerService; import org.lamsfoundation.lams.learning.service.LearnerServiceProxy; -import org.lamsfoundation.lams.learning.web.bean.ActivityURL; import org.lamsfoundation.lams.learning.web.util.ActivityMapping; import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.BranchingActivity; import org.lamsfoundation.lams.learningdesign.SequenceActivity; +import org.lamsfoundation.lams.learningdesign.dto.ActivityURL; import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.action.LamsDispatchAction; Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java =================================================================== diff -u -re27d5ecdab649eab65bec7460d22928bb972a722 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java (.../DisplayOptionsActivityAction.java) (revision e27d5ecdab649eab65bec7460d22928bb972a722) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java (.../DisplayOptionsActivityAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -36,12 +36,12 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.lamsfoundation.lams.learning.service.ICoreLearnerService; -import org.lamsfoundation.lams.learning.web.bean.ActivityURL; import org.lamsfoundation.lams.learning.web.form.OptionsActivityForm; import org.lamsfoundation.lams.learning.web.util.ActivityMapping; import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.OptionsActivity; +import org.lamsfoundation.lams.learningdesign.dto.ActivityURL; import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.web.action.LamsAction; import org.lamsfoundation.lams.web.util.AttributeNames; Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java (.../DisplayParallelActivityAction.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java (.../DisplayParallelActivityAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -36,13 +36,13 @@ import org.apache.struts.action.ActionMapping; import org.lamsfoundation.lams.learning.service.ICoreLearnerService; import org.lamsfoundation.lams.learning.service.LearnerServiceProxy; -import org.lamsfoundation.lams.learning.web.bean.ActivityURL; import org.lamsfoundation.lams.learning.web.form.ActivityForm; import org.lamsfoundation.lams.learning.web.util.ActivityMapping; import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; import org.lamsfoundation.lams.learning.web.util.ParallelActivityMappingStrategy; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.ParallelActivity; +import org.lamsfoundation.lams.learningdesign.dto.ActivityURL; import org.lamsfoundation.lams.web.action.LamsAction; /** Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java =================================================================== diff -u -r225d293907a5e2976e367ee3aa790239bad38699 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java (.../GateAction.java) (revision 225d293907a5e2976e367ee3aa790239bad38699) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java (.../GateAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -40,12 +40,12 @@ import org.lamsfoundation.lams.learning.service.ICoreLearnerService; import org.lamsfoundation.lams.learning.service.LearnerServiceException; import org.lamsfoundation.lams.learning.service.LearnerServiceProxy; -import org.lamsfoundation.lams.learning.web.bean.GateActivityDTO; import org.lamsfoundation.lams.learning.web.util.ActivityMapping; import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.GateActivity; import org.lamsfoundation.lams.learningdesign.ScheduleGateActivity; +import org.lamsfoundation.lams.learningdesign.dto.GateActivityDTO; import org.lamsfoundation.lams.learningdesign.strategy.ScheduleGateActivityStrategy; import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.lesson.Lesson; Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java =================================================================== diff -u -r75496fa1baab1302fe097cce2183029e19285ebf -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java (.../GroupingAction.java) (revision 75496fa1baab1302fe097cce2183029e19285ebf) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java (.../GroupingAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -69,17 +69,6 @@ *

* * @author Jacky Fang - * @since 2005-3-29 - * @version 1.1 - * - * - * - * - * - * - * - * - * */ public class GroupingAction extends LamsDispatchAction { Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java =================================================================== diff -u -r36f567f41d6be3f1894cbd1648baffff0438e622 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (.../LearnerAction.java) (revision 36f567f41d6be3f1894cbd1648baffff0438e622) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (.../LearnerAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -45,10 +45,10 @@ import org.lamsfoundation.lams.learning.presence.PresenceWebsocketServer; import org.lamsfoundation.lams.learning.service.ICoreLearnerService; import org.lamsfoundation.lams.learning.service.LearnerServiceProxy; -import org.lamsfoundation.lams.learning.web.bean.ActivityURL; import org.lamsfoundation.lams.learning.web.util.ActivityMapping; import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; import org.lamsfoundation.lams.learningdesign.Activity; +import org.lamsfoundation.lams.learningdesign.dto.ActivityURL; import org.lamsfoundation.lams.lesson.CompletedActivityProgress; import org.lamsfoundation.lams.lesson.CompletedActivityProgressArchive; import org.lamsfoundation.lams.lesson.LearnerProgress; Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java =================================================================== diff -u -r654c98e30631f9b0cb5bd4ebab7d82b2cfb8e384 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java (.../LoadToolActivityAction.java) (revision 654c98e30631f9b0cb5bd4ebab7d82b2cfb8e384) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java (.../LoadToolActivityAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -34,11 +34,11 @@ import org.apache.struts.action.ActionMapping; import org.lamsfoundation.lams.learning.service.ICoreLearnerService; import org.lamsfoundation.lams.learning.service.LearnerServiceProxy; -import org.lamsfoundation.lams.learning.web.bean.ActivityURL; import org.lamsfoundation.lams.learning.web.form.ActivityForm; import org.lamsfoundation.lams.learning.web.util.ActivityMapping; import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; import org.lamsfoundation.lams.learningdesign.Activity; +import org.lamsfoundation.lams.learningdesign.dto.ActivityURL; import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.tool.exception.RequiredGroupMissingException; import org.lamsfoundation.lams.web.action.LamsAction; Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java (.../ActivityForm.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java (.../ActivityForm.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -31,7 +31,7 @@ import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; -import org.lamsfoundation.lams.learning.web.bean.ActivityURL; +import org.lamsfoundation.lams.learningdesign.dto.ActivityURL; /** * @author daveg Index: lams_monitoring/.classpath =================================================================== diff -u -r0ec58b4b3e8fa566d02a0215fe9d8138da6de8a4 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_monitoring/.classpath (.../.classpath) (revision 0ec58b4b3e8fa566d02a0215fe9d8138da6de8a4) +++ lams_monitoring/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -5,7 +5,6 @@ - Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== diff -u -rfe122f9f7ac40f3a3696a7c69043fc34df7994d4 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision fe122f9f7ac40f3a3696a7c69043fc34df7994d4) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -54,7 +54,6 @@ import org.lamsfoundation.lams.events.EmailNotificationArchive; import org.lamsfoundation.lams.events.dao.EventDAO; import org.lamsfoundation.lams.learning.service.ICoreLearnerService; -import org.lamsfoundation.lams.learning.web.bean.GateActivityDTO; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.BranchActivityEntry; import org.lamsfoundation.lams.learningdesign.BranchCondition; @@ -75,6 +74,7 @@ import org.lamsfoundation.lams.learningdesign.dao.IGroupUserDAO; import org.lamsfoundation.lams.learningdesign.dao.IGroupingDAO; import org.lamsfoundation.lams.learningdesign.dao.ILearningDesignDAO; +import org.lamsfoundation.lams.learningdesign.dto.GateActivityDTO; import org.lamsfoundation.lams.lesson.CompletedActivityProgress; import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.lesson.Lesson; Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java =================================================================== diff -u -r092ede3b8b3828ffa688c4db18c5d535e3364b98 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java (.../GroupingAJAXAction.java) (revision 092ede3b8b3828ffa688c4db18c5d535e3364b98) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java (.../GroupingAJAXAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -45,7 +45,6 @@ import org.apache.struts.action.ActionMapping; import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; -import org.lamsfoundation.lams.learning.web.action.GroupingAction; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.Group; import org.lamsfoundation.lams.learningdesign.GroupComparator; @@ -92,6 +91,7 @@ public static final String PARAM_MAY_DELETE = "mayDelete"; public static final String PARAM_USED_FOR_BRANCHING = "usedForBranching"; public static final String PARAM_VIEW_MODE = "viewMode"; + public static final String GROUPS = "groups"; private static ISecurityService securityService; @@ -164,7 +164,7 @@ group.setUsers(sortedUsers); } - request.setAttribute(GroupingAction.GROUPS, groups); + request.setAttribute(GroupingAJAXAction.GROUPS, groups); // go to a view only screen for random grouping return mapping.findForward(GroupingAJAXAction.VIEW_GROUPS_SCREEN); } @@ -204,7 +204,7 @@ } } - request.setAttribute(GroupingAction.GROUPS, groups); + request.setAttribute(GroupingAJAXAction.GROUPS, groups); request.setAttribute("isCourseGrouping", true); // flag to page it is a course grouping so use the field names for OrganisationGroup return mapping.findForward(GroupingAJAXAction.VIEW_GROUPS_SCREEN); } Index: lams_tool_assessment/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_assessment/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_assessment/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -5,7 +5,6 @@ - Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java =================================================================== diff -u -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java (.../LearningAction.java) (revision feb6062a5128a445b1fa0095b8c9d6cf232af90f) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java (.../LearningAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -56,8 +56,7 @@ import org.apache.struts.action.ActionRedirect; import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; -import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; +import org.lamsfoundation.lams.learningdesign.dto.ActivityPositionDTO; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.assessment.AssessmentConstants; @@ -300,8 +299,8 @@ boolean isTimeLimitNotLaunched = (lastResult == null) || (lastResult.getTimeLimitLaunchedDate() == null); sessionMap.put(AssessmentConstants.ATTR_IS_TIME_LIMIT_NOT_LAUNCHED, isTimeLimitNotLaunched); - ActivityPositionDTO activityPosition = LearningWebUtil - .putActivityPositionInRequestByToolSessionId(toolSessionId, request, getServlet().getServletContext()); + ActivityPositionDTO activityPosition = WebUtil.putActivityPositionInRequestByToolSessionId(toolSessionId, + request, getServlet().getServletContext()); sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition); // add define later support Index: lams_tool_bbb/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_bbb/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_bbb/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -6,7 +6,6 @@ - Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/LearningAction.java =================================================================== diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/LearningAction.java (.../LearningAction.java) (revision 3399163940c61c9132223c758d274486e57ff9b7) +++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/LearningAction.java (.../LearningAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -37,7 +37,6 @@ import org.apache.struts.actions.DispatchAction; import org.apache.struts.util.MessageResources; import org.lamsfoundation.lams.integration.security.RandomPasswordGenerator; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -184,7 +183,7 @@ lrnForm.setEntryText(notebookEntry.getEntry()); } - LearningWebUtil.putActivityPositionInRequestByToolSessionId(lrnForm.getToolSessionID(), request, + WebUtil.putActivityPositionInRequestByToolSessionId(lrnForm.getToolSessionID(), request, getServlet().getServletContext()); return mapping.findForward("notebook"); @@ -306,8 +305,7 @@ bbbService.saveOrUpdateBbb(bbb); } - LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, - getServlet().getServletContext()); + WebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet().getServletContext()); BbbUser user; if (mode.equals(ToolAccessMode.TEACHER)) { Index: lams_tool_chat/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_chat/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_chat/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -16,7 +16,6 @@ - Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java =================================================================== diff -u -r60b91676b8d187fbdb4116866a9ebc717ccf9fdb -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java (.../LearningAction.java) (revision 60b91676b8d187fbdb4116866a9ebc717ccf9fdb) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java (.../LearningAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -36,7 +36,6 @@ import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -126,8 +125,7 @@ LearningAction.chatService.saveOrUpdateChat(chat); } - LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, - getServlet().getServletContext()); + WebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet().getServletContext()); /* Check if submission deadline is null */ @@ -208,7 +206,7 @@ } request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, chatUser.getChatSession().getSessionId()); - LearningWebUtil.putActivityPositionInRequestByToolSessionId(chatUser.getChatSession().getSessionId(), request, + WebUtil.putActivityPositionInRequestByToolSessionId(chatUser.getChatSession().getSessionId(), request, getServlet().getServletContext()); return mapping.findForward("notebook"); Index: lams_tool_daco/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_daco/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_daco/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -15,7 +15,6 @@ - Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java =================================================================== diff -u -ra17bbcd88fe8f59c2dc80daaa0d661789728c3c5 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java (.../LearningAction.java) (revision a17bbcd88fe8f59c2dc80daaa0d661789728c3c5) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java (.../LearningAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -53,8 +53,7 @@ import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.upload.FormFile; -import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; +import org.lamsfoundation.lams.learningdesign.dto.ActivityPositionDTO; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -220,8 +219,8 @@ Integer totalRecordCount = service.getGroupRecordCount(dacoUser.getSession().getSessionId()); sessionMap.put(DacoConstants.ATTR_TOTAL_RECORD_COUNT, totalRecordCount); - ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId, - request, getServlet().getServletContext()); + ActivityPositionDTO activityPosition = WebUtil.putActivityPositionInRequestByToolSessionId(sessionId, request, + getServlet().getServletContext()); sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition); // add define later support Index: lams_tool_dimdim/.classpath =================================================================== diff -u -rbc33822b9936d6c96d146ff14b775f11c46ab4b4 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_dimdim/.classpath (.../.classpath) (revision bc33822b9936d6c96d146ff14b775f11c46ab4b4) +++ lams_tool_dimdim/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -10,6 +10,5 @@ - Index: lams_tool_doku/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_doku/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_doku/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -16,7 +16,6 @@ - Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java =================================================================== diff -u -r7a4b493a0008b281e8c3ec7aafbd325165085ed9 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java (.../LearningAction.java) (revision 7a4b493a0008b281e8c3ec7aafbd325165085ed9) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java (.../LearningAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -42,8 +42,7 @@ import org.apache.struts.action.ActionMapping; import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; -import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; +import org.lamsfoundation.lams.learningdesign.dto.ActivityPositionDTO; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -211,8 +210,8 @@ dokumaran.setDefineLater(false); service.saveOrUpdateDokumaran(dokumaran); - ActivityPositionDTO activityPosition = LearningWebUtil - .putActivityPositionInRequestByToolSessionId(toolSessionId, request, getServlet().getServletContext()); + ActivityPositionDTO activityPosition = WebUtil.putActivityPositionInRequestByToolSessionId(toolSessionId, + request, getServlet().getServletContext()); sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition); sessionMap.put(DokumaranConstants.ATTR_DOKUMARAN, dokumaran); Index: lams_tool_eadventure/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_eadventure/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_eadventure/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -5,7 +5,6 @@ - Index: lams_tool_forum/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_forum/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_forum/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -10,7 +10,6 @@ - Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java =================================================================== diff -u -r0e9302b16c5c660442417c396fa5cf25f8a81a4f -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java (.../LearningAction.java) (revision 0e9302b16c5c660442417c396fa5cf25f8a81a4f) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java (.../LearningAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -48,8 +48,7 @@ import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; import org.lamsfoundation.lams.events.IEventNotificationService; -import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; +import org.lamsfoundation.lams.learningdesign.dto.ActivityPositionDTO; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -256,7 +255,7 @@ sessionMap.put(ForumConstants.ATTR_MINIMUM_REPLY, forum.getMinimumReply()); sessionMap.put(ForumConstants.ATTR_MAXIMUM_REPLY, forum.getMaximumReply()); - ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId, + ActivityPositionDTO activityPosition = WebUtil.putActivityPositionInRequestByToolSessionId(sessionId, request, getServlet().getServletContext()); sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition); Index: lams_tool_gmap/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_gmap/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_gmap/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -17,7 +17,6 @@ - Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java =================================================================== diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java (.../LearningAction.java) (revision 3399163940c61c9132223c758d274486e57ff9b7) +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java (.../LearningAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -34,7 +34,6 @@ import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -124,8 +123,7 @@ gmapService.saveOrUpdateGmap(gmap); } - LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, - getServlet().getServletContext()); + WebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet().getServletContext()); GmapUser gmapUser; if (mode.equals(ToolAccessMode.TEACHER)) { @@ -294,7 +292,7 @@ lrnForm.setEntryText(notebookEntry.getEntry()); } - LearningWebUtil.putActivityPositionInRequestByToolSessionId(lrnForm.getToolSessionID(), request, + WebUtil.putActivityPositionInRequestByToolSessionId(lrnForm.getToolSessionID(), request, getServlet().getServletContext()); return mapping.findForward("notebook"); Index: lams_tool_images/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_images/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_images/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -5,7 +5,6 @@ - Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java =================================================================== diff -u -r5831c6c974ca7fef986ffd207d708a2a56bf39f1 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java (.../LearningAction.java) (revision 5831c6c974ca7fef986ffd207d708a2a56bf39f1) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java (.../LearningAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -49,8 +49,7 @@ import org.apache.struts.action.ActionRedirect; import org.apache.struts.config.ForwardConfig; import org.apache.struts.upload.FormFile; -import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; +import org.lamsfoundation.lams.learningdesign.dto.ActivityPositionDTO; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.rating.dto.ItemRatingDTO; @@ -217,8 +216,8 @@ sessionMap.put(AttributeNames.ATTR_COUNT_RATED_ITEMS, countRatedImages); } - ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId, - request, getServlet().getServletContext()); + ActivityPositionDTO activityPosition = WebUtil.putActivityPositionInRequestByToolSessionId(sessionId, request, + getServlet().getServletContext()); sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition); // Create set of images, along with this filtering out items added by users from other groups Index: lams_tool_imscc/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_imscc/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_imscc/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -6,7 +6,6 @@ - Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java =================================================================== diff -u -r19a48bf35052a72202cc4867e68d5666f0d05898 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java (.../LearningAction.java) (revision 19a48bf35052a72202cc4867e68d5666f0d05898) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java (.../LearningAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -45,8 +45,7 @@ import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.action.ActionRedirect; -import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; +import org.lamsfoundation.lams.learningdesign.dto.ActivityPositionDTO; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -198,8 +197,8 @@ commonCartridge.setDefineLater(false); service.saveOrUpdateCommonCartridge(commonCartridge); - ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId, - request, getServlet().getServletContext()); + ActivityPositionDTO activityPosition = WebUtil.putActivityPositionInRequestByToolSessionId(sessionId, request, + getServlet().getServletContext()); sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition); // init commonCartridge item list Index: lams_tool_kaltura/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_kaltura/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_kaltura/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -16,7 +16,6 @@ - Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java (.../LearningAction.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java (.../LearningAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -47,8 +47,7 @@ import org.apache.struts.action.ActionRedirect; import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; -import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; +import org.lamsfoundation.lams.learningdesign.dto.ActivityPositionDTO; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -145,8 +144,8 @@ service.saveOrUpdateKaltura(kaltura); } - ActivityPositionDTO activityPosition = LearningWebUtil - .putActivityPositionInRequestByToolSessionId(toolSessionId, request, getServlet().getServletContext()); + ActivityPositionDTO activityPosition = WebUtil.putActivityPositionInRequestByToolSessionId(toolSessionId, + request, getServlet().getServletContext()); sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition); // reflection information Index: lams_tool_lamc/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_lamc/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_lamc/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -16,7 +16,6 @@ - Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java =================================================================== diff -u -r3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java (.../McLearningAction.java) (revision 3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java (.../McLearningAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -41,7 +41,6 @@ import org.apache.struts.action.ActionMapping; import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.exception.DataMissingException; @@ -354,7 +353,7 @@ mcGeneralLearnerFlowDTO.setQuestionIndex(questionIndex); request.setAttribute(McAppConstants.MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO); - LearningWebUtil.putActivityPositionInRequestByToolSessionId(new Long(toolSessionID), request, + WebUtil.putActivityPositionInRequestByToolSessionId(new Long(toolSessionID), request, getServlet().getServletContext()); request.setAttribute("sessionMapID", sessionMap.getSessionID()); @@ -508,7 +507,7 @@ request.setAttribute(McAppConstants.MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO); - LearningWebUtil.putActivityPositionInRequestByToolSessionId(new Long(toolSessionID), request, + WebUtil.putActivityPositionInRequestByToolSessionId(new Long(toolSessionID), request, getServlet().getServletContext()); return mapping.findForward(McAppConstants.VIEW_ANSWERS); Index: lams_tool_laqa/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_laqa/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_laqa/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -16,7 +16,6 @@ - Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningStarterAction.java =================================================================== diff -u -r32eb376c59d7c17cfa9d51cac14c00aae8cf44ff -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningStarterAction.java (.../QaLearningStarterAction.java) (revision 32eb376c59d7c17cfa9d51cac14c00aae8cf44ff) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningStarterAction.java (.../QaLearningStarterAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -46,8 +46,7 @@ import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; -import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; +import org.lamsfoundation.lams.learningdesign.dto.ActivityPositionDTO; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -213,7 +212,7 @@ return (mapping.findForward(DEFINE_LATER)); } - ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId( + ActivityPositionDTO activityPosition = WebUtil.putActivityPositionInRequestByToolSessionId( new Long(toolSessionID), request, getServlet().getServletContext()); sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition); Index: lams_tool_larsrc/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_larsrc/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_larsrc/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -16,7 +16,6 @@ - Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java =================================================================== diff -u -rd383fad17aadef12e0382c9067713b4180b6a0d4 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java (.../LearningAction.java) (revision d383fad17aadef12e0382c9067713b4180b6a0d4) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java (.../LearningAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -50,8 +50,7 @@ import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.action.ActionRedirect; -import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; +import org.lamsfoundation.lams.learningdesign.dto.ActivityPositionDTO; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.rating.dto.ItemRatingDTO; @@ -230,8 +229,8 @@ resource.setDefineLater(false); service.saveOrUpdateResource(resource); - ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId, - request, getServlet().getServletContext()); + ActivityPositionDTO activityPosition = WebUtil.putActivityPositionInRequestByToolSessionId(sessionId, request, + getServlet().getServletContext()); sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition); // init resource item list Index: lams_tool_leader/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_leader/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_leader/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -16,7 +16,6 @@ - Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/LearningAction.java =================================================================== diff -u -rac8b64b03ce6d8c718e55823f23fd995159b7ca0 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/LearningAction.java (.../LearningAction.java) (revision ac8b64b03ce6d8c718e55823f23fd995159b7ca0) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/LearningAction.java (.../LearningAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -35,7 +35,6 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.tomcat.util.json.JSONException; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.ToolSessionManager; import org.lamsfoundation.lams.tool.exception.DataMissingException; @@ -98,8 +97,7 @@ service.saveOrUpdateLeaderselection(content); } - LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionId, request, - getServlet().getServletContext()); + WebUtil.putActivityPositionInRequestByToolSessionId(toolSessionId, request, getServlet().getServletContext()); LeaderselectionUser user; if (mode.equals(ToolAccessMode.TEACHER)) { Index: lams_tool_mindmap/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_mindmap/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_mindmap/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -5,7 +5,6 @@ - Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java =================================================================== diff -u -rc460c4454266a5b356af92096468e48613939da9 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java (.../LearningAction.java) (revision c460c4454266a5b356af92096468e48613939da9) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java (.../LearningAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -38,7 +38,6 @@ import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -146,8 +145,7 @@ mindmapService.saveOrUpdateMindmap(mindmap); } - LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, - getServlet().getServletContext()); + WebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet().getServletContext()); // check if there is submission deadline Date submissionDeadline = mindmap.getSubmissionDeadline(); @@ -780,7 +778,7 @@ request.setAttribute("reflectEntry", entry.getEntry()); } - LearningWebUtil.putActivityPositionInRequestByToolSessionId(mindmapSession.getSessionId(), request, + WebUtil.putActivityPositionInRequestByToolSessionId(mindmapSession.getSessionId(), request, getServlet().getServletContext()); return mapping.findForward("reflect"); Index: lams_tool_nb/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_nb/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_nb/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -16,7 +16,6 @@ - Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerAction.java =================================================================== diff -u -r983160690fed1d94b51c2ea9206c58093a29040d -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerAction.java (.../NbLearnerAction.java) (revision 983160690fed1d94b51c2ea9206c58093a29040d) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerAction.java (.../NbLearnerAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -37,7 +37,6 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.util.MessageResources; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -204,8 +203,7 @@ request.setAttribute("reflectEntry", entry.getEntry()); } - LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, - getServlet().getServletContext()); + WebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet().getServletContext()); return mapping.findForward(NoticeboardConstants.REFLECT_ON_ACTIVITY); } Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerStarterAction.java =================================================================== diff -u -r983160690fed1d94b51c2ea9206c58093a29040d -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerStarterAction.java (.../NbLearnerStarterAction.java) (revision 983160690fed1d94b51c2ea9206c58093a29040d) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerStarterAction.java (.../NbLearnerStarterAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -35,7 +35,6 @@ import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.util.MessageResources; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -187,8 +186,7 @@ Boolean userFinished = (nbUser != null && NoticeboardUser.COMPLETED.equals(nbUser.getUserStatus())); request.setAttribute("userFinished", userFinished); - LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, - getServlet().getServletContext()); + WebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet().getServletContext()); /* * Checks to see if the runOffline flag is set. Index: lams_tool_notebook/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_notebook/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_notebook/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -16,8 +16,6 @@ - - Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java =================================================================== diff -u -rc6ad8493ef2064430e8783b28258cc9f223a3844 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java (.../LearningAction.java) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java (.../LearningAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -36,7 +36,6 @@ import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -127,8 +126,7 @@ notebookService.saveOrUpdateNotebook(notebook); } - LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, - getServlet().getServletContext()); + WebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet().getServletContext()); NotebookUser notebookUser; if (mode.equals(ToolAccessMode.TEACHER)) { Index: lams_tool_pixlr/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_pixlr/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_pixlr/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -16,7 +16,6 @@ - Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java (.../LearningAction.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java (.../LearningAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -47,7 +47,6 @@ import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -145,8 +144,7 @@ pixlrService.saveOrUpdatePixlr(pixlr); } - LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, - getServlet().getServletContext()); + WebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet().getServletContext()); // get the user PixlrUser pixlrUser; @@ -368,7 +366,7 @@ lrnForm.setEntryText(notebookEntry.getEntry()); } - LearningWebUtil.putActivityPositionInRequestByToolSessionId(pixlrUser.getPixlrSession().getSessionId(), request, + WebUtil.putActivityPositionInRequestByToolSessionId(pixlrUser.getPixlrSession().getSessionId(), request, getServlet().getServletContext()); return mapping.findForward("notebook"); @@ -456,8 +454,7 @@ request.setAttribute("mode", mode); request.setAttribute("pixlrImageFolderURL", PixlrConstants.LAMS_WWW_PIXLR_FOLDER_URL); - LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, - getServlet().getServletContext()); + WebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet().getServletContext()); return mapping.findForward("viewAll"); } Index: lams_tool_preview/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_preview/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_preview/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -6,7 +6,6 @@ - Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java =================================================================== diff -u -r942b2a5bf6dac160bf9e00bac22e6232ae65ef98 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java (.../LearningAction.java) (revision 942b2a5bf6dac160bf9e00bac22e6232ae65ef98) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java (.../LearningAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -26,10 +26,8 @@ import java.io.IOException; import java.util.ArrayList; -import java.util.Collections; import java.util.Date; import java.util.HashMap; -import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -38,24 +36,17 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionRedirect; -import org.apache.tomcat.util.json.JSONArray; import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; -import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; +import org.lamsfoundation.lams.learningdesign.dto.ActivityPositionDTO; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.rating.dto.ItemRatingCriteriaDTO; -import org.lamsfoundation.lams.rating.dto.ItemRatingDTO; -import org.lamsfoundation.lams.rating.dto.RatingCommentDTO; import org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO; import org.lamsfoundation.lams.rating.model.RatingCriteria; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -302,8 +293,8 @@ peerreview.setDefineLater(false); service.saveOrUpdatePeerreview(peerreview); - ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId, - request, getServlet().getServletContext()); + ActivityPositionDTO activityPosition = WebUtil.putActivityPositionInRequestByToolSessionId(sessionId, request, + getServlet().getServletContext()); sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition); //markUser as not Finished if it's redo Index: lams_tool_sbmt/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_sbmt/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_sbmt/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -15,7 +15,6 @@ - Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java =================================================================== diff -u -r2fc43e946ceac81d8635ac056d0896cbc4750bb7 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java (.../LearnerAction.java) (revision 2fc43e946ceac81d8635ac056d0896cbc4750bb7) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java (.../LearnerAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -48,7 +48,6 @@ import org.apache.struts.actions.DispatchAction; import org.apache.struts.upload.FormFile; import org.lamsfoundation.lams.events.IEventNotificationService; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -173,8 +172,7 @@ content.setDefineLater(false); submitFilesService.saveOrUpdateContent(content); - LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionID, request, - getServlet().getServletContext()); + WebUtil.putActivityPositionInRequestByToolSessionId(sessionID, request, getServlet().getServletContext()); // check if there is submission deadline Date submissionDeadline = content.getSubmissionDeadline(); @@ -282,8 +280,7 @@ // set the mode into http session Long sessionID = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); - LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionID, request, - getServlet().getServletContext()); + WebUtil.putActivityPositionInRequestByToolSessionId(sessionID, request, getServlet().getServletContext()); if (validateUploadForm(learnerForm, request)) { // get session from shared session. Index: lams_tool_scratchie/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_scratchie/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_scratchie/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -19,7 +19,6 @@ - Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java =================================================================== diff -u -r357137c5d97f2317d166b2c8803d057c619bd3e1 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java (.../LearningAction.java) (revision 357137c5d97f2317d166b2c8803d057c619bd3e1) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java (.../LearningAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -51,8 +51,7 @@ import org.apache.struts.action.ActionRedirect; import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; -import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; +import org.lamsfoundation.lams.learningdesign.dto.ActivityPositionDTO; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -226,8 +225,8 @@ return mapping.findForward("defineLater"); } - ActivityPositionDTO activityPosition = LearningWebUtil - .putActivityPositionInRequestByToolSessionId(toolSessionId, request, getServlet().getServletContext()); + ActivityPositionDTO activityPosition = WebUtil.putActivityPositionInRequestByToolSessionId(toolSessionId, + request, getServlet().getServletContext()); sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition); // check if there is submission deadline Index: lams_tool_scribe/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_scribe/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_scribe/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -16,7 +16,6 @@ - Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java =================================================================== diff -u -rf06669784fcf047185a7f9c48587b3096474aa2a -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java (.../LearningAction.java) (revision f06669784fcf047185a7f9c48587b3096474aa2a) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java (.../LearningAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -35,7 +35,6 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.tomcat.util.json.JSONException; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -101,8 +100,7 @@ scribeService.saveOrUpdateScribe(scribe); } - LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, - getServlet().getServletContext()); + WebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet().getServletContext()); // Retrieve the current user ScribeUser scribeUser = getCurrentUser(toolSessionID); @@ -245,8 +243,8 @@ request.setAttribute("scribeDTO", scribeDTO); - LearningWebUtil.putActivityPositionInRequestByToolSessionId(scribeUser.getScribeSession().getSessionId(), - request, getServlet().getServletContext()); + WebUtil.putActivityPositionInRequestByToolSessionId(scribeUser.getScribeSession().getSessionId(), request, + getServlet().getServletContext()); return mapping.findForward("notebook"); } @@ -289,7 +287,7 @@ setupOtherGroupReportDTO(request, session, scribeUser); } - LearningWebUtil.putActivityPositionInRequestByToolSessionId(session.getSessionId(), request, + WebUtil.putActivityPositionInRequestByToolSessionId(session.getSessionId(), request, getServlet().getServletContext()); return mapping.findForward("report"); Index: lams_tool_spreadsheet/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_spreadsheet/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_spreadsheet/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -16,7 +16,6 @@ - Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java =================================================================== diff -u -rca10d5f847158b365d5dec170b298f29a9b2ace7 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java (.../LearningAction.java) (revision ca10d5f847158b365d5dec170b298f29a9b2ace7) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java (.../LearningAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -33,16 +33,14 @@ import javax.servlet.http.HttpSession; import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionRedirect; import org.apache.struts.config.ForwardConfig; -import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; +import org.lamsfoundation.lams.learningdesign.dto.ActivityPositionDTO; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -54,7 +52,6 @@ import org.lamsfoundation.lams.tool.spreadsheet.service.ISpreadsheetService; import org.lamsfoundation.lams.tool.spreadsheet.service.SpreadsheetApplicationException; import org.lamsfoundation.lams.tool.spreadsheet.web.form.ReflectionForm; -import org.lamsfoundation.lams.tool.spreadsheet.web.form.SpreadsheetForm; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.session.SessionManager; @@ -194,9 +191,9 @@ } else { request.setAttribute(SpreadsheetConstants.ATTR_USER_IS_MARKED, false); } - - ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId, - request, getServlet().getServletContext()); + + ActivityPositionDTO activityPosition = WebUtil.putActivityPositionInRequestByToolSessionId(sessionId, request, + getServlet().getServletContext()); sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition); return mapping.findForward(SpreadsheetConstants.SUCCESS); Index: lams_tool_survey/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_survey/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_survey/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -16,7 +16,6 @@ - Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java =================================================================== diff -u -r719897cf9ffdfd84d61516ae21f0c83e060d8beb -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java (.../LearningAction.java) (revision 719897cf9ffdfd84d61516ae21f0c83e060d8beb) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java (.../LearningAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -53,8 +53,7 @@ import org.apache.tomcat.util.json.JSONArray; import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; -import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; +import org.lamsfoundation.lams.learningdesign.dto.ActivityPositionDTO; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -217,8 +216,8 @@ survey.setDefineLater(false); service.saveOrUpdateSurvey(survey); - ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId, - request, getServlet().getServletContext()); + ActivityPositionDTO activityPosition = WebUtil.putActivityPositionInRequestByToolSessionId(sessionId, request, + getServlet().getServletContext()); sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition); // check if there is submission deadline Index: lams_tool_task/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_task/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_task/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -16,7 +16,6 @@ - Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java =================================================================== diff -u -r3d7ad32687edeec93585fe3ef54b554d891dbe98 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java (.../LearningAction.java) (revision 3d7ad32687edeec93585fe3ef54b554d891dbe98) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java (.../LearningAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -49,8 +49,7 @@ import org.apache.struts.action.ActionMessages; import org.apache.struts.action.ActionRedirect; import org.apache.struts.upload.FormFile; -import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; +import org.lamsfoundation.lams.learningdesign.dto.ActivityPositionDTO; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -337,8 +336,8 @@ taskList.setDefineLater(false); service.saveOrUpdateTaskList(taskList); - ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId, - request, getServlet().getServletContext()); + ActivityPositionDTO activityPosition = WebUtil.putActivityPositionInRequestByToolSessionId(sessionId, request, + getServlet().getServletContext()); sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition); // check if there is submission deadline Index: lams_tool_videorecorder/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_videorecorder/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_videorecorder/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -16,7 +16,6 @@ - Index: lams_tool_vote/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_vote/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_vote/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -16,7 +16,6 @@ > - Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java =================================================================== diff -u -r571d64337ed3fb6a9733a5214180fd4a5c6d6292 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java (.../LearningAction.java) (revision 571d64337ed3fb6a9733a5214180fd4a5c6d6292) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java (.../LearningAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -47,7 +47,6 @@ import org.apache.struts.action.ActionMessages; import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -155,7 +154,7 @@ request.setAttribute(VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO); - LearningWebUtil.putActivityPositionInRequestByToolSessionId(new Long(toolSessionID), request, + WebUtil.putActivityPositionInRequestByToolSessionId(new Long(toolSessionID), request, getServlet().getServletContext()); return (mapping.findForward(ALL_NOMINATIONS)); @@ -226,7 +225,7 @@ voteLearningForm.resetCommands(); request.setAttribute(VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO); - LearningWebUtil.putActivityPositionInRequestByToolSessionId(new Long(toolSessionID), request, + WebUtil.putActivityPositionInRequestByToolSessionId(new Long(toolSessionID), request, getServlet().getServletContext()); return (mapping.findForward(VIEW_ANSWERS)); } @@ -612,7 +611,7 @@ voteLearningForm.resetCommands(); - LearningWebUtil.putActivityPositionInRequestByToolSessionId(new Long(toolSessionID), request, + WebUtil.putActivityPositionInRequestByToolSessionId(new Long(toolSessionID), request, getServlet().getServletContext()); return (mapping.findForward(NOTEBOOK)); @@ -786,7 +785,7 @@ } } - LearningWebUtil.putActivityPositionInRequestByToolSessionId(new Long(toolSessionID), request, + WebUtil.putActivityPositionInRequestByToolSessionId(new Long(toolSessionID), request, getServlet().getServletContext()); /* find out if the content is being modified at the moment. */ Index: lams_tool_wiki/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_wiki/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_wiki/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -10,7 +10,6 @@ - Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java =================================================================== diff -u -r61408a87d647c32ac6a6a42d3ac009828eb5ce6d -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java (.../LearningAction.java) (revision 61408a87d647c32ac6a6a42d3ac009828eb5ce6d) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java (.../LearningAction.java) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -26,8 +26,8 @@ import java.io.IOException; import java.util.Date; -import java.util.TimeZone; import java.util.SortedSet; +import java.util.TimeZone; import java.util.TreeSet; import javax.servlet.http.HttpServletRequest; @@ -38,12 +38,10 @@ import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.ToolSessionManager; - import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.wiki.dto.WikiDTO; @@ -61,8 +59,8 @@ import org.lamsfoundation.lams.tool.wiki.util.WikiException; import org.lamsfoundation.lams.tool.wiki.web.forms.LearningForm; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; -import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.util.DateUtil; +import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; @@ -142,8 +140,7 @@ wikiService.saveOrUpdateWiki(wiki); } - LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, - getServlet().getServletContext()); + WebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet().getServletContext()); // get the user WikiUser wikiUser; @@ -359,7 +356,7 @@ lrnForm.setEntryText(notebookEntry.getEntry()); } - LearningWebUtil.putActivityPositionInRequestByToolSessionId(lrnForm.getToolSessionID(), request, + WebUtil.putActivityPositionInRequestByToolSessionId(lrnForm.getToolSessionID(), request, getServlet().getServletContext()); return mapping.findForward("notebook"); Index: lams_tool_wookie/.classpath =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -rf4502360cd44d86d57b095aea5aef7ce663c8b61 --- lams_tool_wookie/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_wookie/.classpath (.../.classpath) (revision f4502360cd44d86d57b095aea5aef7ce663c8b61) @@ -16,7 +16,6 @@ -