Index: lams_build/3rdParty.userlibraries =================================================================== diff -u -r9218936edd87260de73e773054cb605a336133b1 -r969b1185a18d028b10bb0bd4aa2af6ea93e0f8b5 --- lams_build/3rdParty.userlibraries (.../3rdParty.userlibraries) (revision 9218936edd87260de73e773054cb605a336133b1) +++ lams_build/3rdParty.userlibraries (.../3rdParty.userlibraries) (revision 969b1185a18d028b10bb0bd4aa2af6ea93e0f8b5) @@ -13,14 +13,6 @@ - - - - - - - - @@ -31,5 +23,16 @@ + + + + + + + + + + + Index: lams_build/lib/spring/spring-aop-4.3.10.RELEASE.jar =================================================================== diff -u -rda475f0a1c30c7103bf893012ccf935d1bd09421 -r969b1185a18d028b10bb0bd4aa2af6ea93e0f8b5 Binary files differ Index: lams_build/lib/spring/spring-aop-4.3.12.RELEASE.jar =================================================================== diff -u Binary files differ Index: lams_build/lib/spring/spring-beans-4.3.10.RELEASE.jar =================================================================== diff -u -rda475f0a1c30c7103bf893012ccf935d1bd09421 -r969b1185a18d028b10bb0bd4aa2af6ea93e0f8b5 Binary files differ Index: lams_build/lib/spring/spring-beans-4.3.12.RELEASE.jar =================================================================== diff -u Binary files differ Index: lams_build/lib/spring/spring-context-4.3.10.RELEASE.jar =================================================================== diff -u -rda475f0a1c30c7103bf893012ccf935d1bd09421 -r969b1185a18d028b10bb0bd4aa2af6ea93e0f8b5 Binary files differ Index: lams_build/lib/spring/spring-context-4.3.12.RELEASE.jar =================================================================== diff -u Binary files differ Index: lams_build/lib/spring/spring-context-support-4.3.10.RELEASE.jar =================================================================== diff -u -rda475f0a1c30c7103bf893012ccf935d1bd09421 -r969b1185a18d028b10bb0bd4aa2af6ea93e0f8b5 Binary files differ Index: lams_build/lib/spring/spring-context-support-4.3.12.RELEASE.jar =================================================================== diff -u Binary files differ Index: lams_build/lib/spring/spring-core-4.3.10.RELEASE.jar =================================================================== diff -u -rda475f0a1c30c7103bf893012ccf935d1bd09421 -r969b1185a18d028b10bb0bd4aa2af6ea93e0f8b5 Binary files differ Index: lams_build/lib/spring/spring-core-4.3.12.RELEASE.jar =================================================================== diff -u Binary files differ Index: lams_build/lib/spring/spring-expression-4.3.10.RELEASE.jar =================================================================== diff -u -rda475f0a1c30c7103bf893012ccf935d1bd09421 -r969b1185a18d028b10bb0bd4aa2af6ea93e0f8b5 Binary files differ Index: lams_build/lib/spring/spring-expression-4.3.12.RELEASE.jar =================================================================== diff -u Binary files differ Index: lams_build/lib/spring/spring-jdbc-4.3.10.RELEASE.jar =================================================================== diff -u -rda475f0a1c30c7103bf893012ccf935d1bd09421 -r969b1185a18d028b10bb0bd4aa2af6ea93e0f8b5 Binary files differ Index: lams_build/lib/spring/spring-jdbc-4.3.12.RELEASE.jar =================================================================== diff -u Binary files differ Index: lams_build/lib/spring/spring-orm-4.3.10.RELEASE.jar =================================================================== diff -u -rda475f0a1c30c7103bf893012ccf935d1bd09421 -r969b1185a18d028b10bb0bd4aa2af6ea93e0f8b5 Binary files differ Index: lams_build/lib/spring/spring-orm-4.3.12.RELEASE.jar =================================================================== diff -u Binary files differ Index: lams_build/lib/spring/spring-tx-4.3.10.RELEASE.jar =================================================================== diff -u -rda475f0a1c30c7103bf893012ccf935d1bd09421 -r969b1185a18d028b10bb0bd4aa2af6ea93e0f8b5 Binary files differ Index: lams_build/lib/spring/spring-tx-4.3.12.RELEASE.jar =================================================================== diff -u Binary files differ Index: lams_build/lib/spring/spring-web-4.3.10.RELEASE.jar =================================================================== diff -u -rda475f0a1c30c7103bf893012ccf935d1bd09421 -r969b1185a18d028b10bb0bd4aa2af6ea93e0f8b5 Binary files differ Index: lams_build/lib/spring/spring-web-4.3.12.RELEASE.jar =================================================================== diff -u Binary files differ Index: lams_build/lib/spring/spring-webmvc-4.3.12.RELEASE.jar =================================================================== diff -u Binary files differ Index: lams_build/lib/spring/spring.module.xml =================================================================== diff -u -rda475f0a1c30c7103bf893012ccf935d1bd09421 -r969b1185a18d028b10bb0bd4aa2af6ea93e0f8b5 --- lams_build/lib/spring/spring.module.xml (.../spring.module.xml) (revision da475f0a1c30c7103bf893012ccf935d1bd09421) +++ lams_build/lib/spring/spring.module.xml (.../spring.module.xml) (revision 969b1185a18d028b10bb0bd4aa2af6ea93e0f8b5) @@ -24,16 +24,17 @@ - - - - - - - - - - + + + + + + + + + + + Index: lams_build/liblist.txt =================================================================== diff -u -r2c03060b238558d183472f0066ba003c76d00fd0 -r969b1185a18d028b10bb0bd4aa2af6ea93e0f8b5 --- lams_build/liblist.txt (.../liblist.txt) (revision 2c03060b238558d183472f0066ba003c76d00fd0) +++ lams_build/liblist.txt (.../liblist.txt) (revision 969b1185a18d028b10bb0bd4aa2af6ea93e0f8b5) @@ -37,15 +37,16 @@ quartz quartz-2.2.3.jar 2.2.3 Apache License 2.0 Terracotta For running scheduled jobs -spring spring-core-4.3.10.RELEASE.jar 4.3.10 Apache License 2.0 Pivotal programming and configuration model for modern Java-based enterprise applications - spring-beans-4.3.10.RELEASE.jar - spring-context-4.3.10.RELEASE.jar - spring-context-support-4.3.10.RELEASE.jar - spring-expression-4.3.10.RELEASE.jar - spring-jdbc-4.3.10.RELEASE.jar - spring-orm-4.3.10.RELEASE.jar - spring-tx-4.3.10.RELEASE.jar - spring-web-4.3.10.RELEASE.jar +spring spring-core-4.3.12.RELEASE.jar 4.3.12 Apache License 2.0 Pivotal programming and configuration model for modern Java-based enterprise applications + spring-beans-4.3.12.RELEASE.jar + spring-context-4.3.12.RELEASE.jar + spring-context-support-4.3.12.RELEASE.jar + spring-expression-4.3.12.RELEASE.jar + spring-jdbc-4.3.12.RELEASE.jar + spring-orm-4.3.12.RELEASE.jar + spring-tx-4.3.12.RELEASE.jar + spring-web-4.3.12.RELEASE.jar + spring-webmvc-4.3.12.RELEASE.jar struts jakarta-oro.jar 2.0.7 Apache License 2.0 Apache regular expressions struts.jar 1.2.7 Apache License 2.0 Apache Struts Framework Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java =================================================================== diff -u -r34815c1edfbbd510266420e5cfaf4baf290e9a1e -r969b1185a18d028b10bb0bd4aa2af6ea93e0f8b5 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java (.../RepopulateProgressMarksServlet.java) (revision 34815c1edfbbd510266420e5cfaf4baf290e9a1e) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java (.../RepopulateProgressMarksServlet.java) (revision 969b1185a18d028b10bb0bd4aa2af6ea93e0f8b5) @@ -26,8 +26,6 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; -import java.util.Date; -import java.util.Map; import java.util.Set; import javax.servlet.ServletException; @@ -37,34 +35,22 @@ import javax.servlet.http.HttpSession; import org.apache.log4j.Logger; -import org.hibernate.SessionFactory; -import org.lamsfoundation.lams.gradebook.service.IGradebookService; import org.lamsfoundation.lams.learning.service.ICoreLearnerService; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.ComplexActivity; import org.lamsfoundation.lams.learningdesign.LearningDesign; import org.lamsfoundation.lams.learningdesign.LearningDesignProcessor; import org.lamsfoundation.lams.learningdesign.SimpleActivity; -import org.lamsfoundation.lams.learningdesign.ToolActivity; import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO; import org.lamsfoundation.lams.learningdesign.exception.LearningDesignProcessorException; -import org.lamsfoundation.lams.lesson.CompletedActivityProgress; import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.lesson.Lesson; -import org.lamsfoundation.lams.lesson.dao.ILearnerProgressDAO; import org.lamsfoundation.lams.lesson.service.ILessonService; -import org.lamsfoundation.lams.tool.Tool; -import org.lamsfoundation.lams.tool.ToolCompletionStatus; -import org.lamsfoundation.lams.tool.ToolSession; -import org.lamsfoundation.lams.tool.service.ILamsCoreToolService; -import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.util.audit.IAuditService; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; -import org.springframework.orm.hibernate4.SessionHolder; -import org.springframework.transaction.support.TransactionSynchronizationManager; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; @@ -87,9 +73,10 @@ @Override @SuppressWarnings("unchecked") - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { - String header=""; + String header = ""; StringBuilder errorBuilder = new StringBuilder(""); StringBuilder auditLogBuilder = new StringBuilder(""); UserDTO userDTO = null; @@ -110,10 +97,10 @@ return; } - header = new StringBuilder( - "Learner progress and gradebook marks to be repopulated for lesson ").append(lessonId).append(" ") - .append(lesson.getLessonName()) - .append(".\n----------------------------------------------------------------------------------\n\n").toString(); + header = new StringBuilder("Learner progress and gradebook marks to be repopulated for lesson ") + .append(lessonId).append(" ").append(lesson.getLessonName()) + .append(".\n----------------------------------------------------------------------------------\n\n") + .toString(); ActivitiesToCheckProcessor processor = new ActivitiesToCheckProcessor(lesson.getLearningDesign(), learnerService.getActivityDAO()); @@ -127,7 +114,7 @@ auditLogBuilder.append("\n\n"); if (restrictToLearnerId == null) { - Set progresses = (Set) lesson.getLearnerProgresses(); + Set progresses = lesson.getLearnerProgresses(); for (LearnerProgress learnerProgress : progresses) { processLearner(errorBuilder, auditLogBuilder, lesson, activityList, learnerProgress, gradebookAll); } @@ -151,35 +138,39 @@ String errors = errorBuilder.append("\n").toString(); String msg; if (errors.length() > 1) { - msg = new StringBuilder(header).append("Errors occured. Some data may be been updated.\n").append(errors).append(auditLogBuilder.toString()).toString(); + msg = new StringBuilder(header).append("Errors occured. Some data may be been updated.\n").append(errors) + .append(auditLogBuilder.toString()).toString(); } else { - msg = new StringBuilder(header).append("Successful run, no errors\n").append(auditLogBuilder.toString()).toString(); + msg = new StringBuilder(header).append("Successful run, no errors\n").append(auditLogBuilder.toString()) + .toString(); } - auditService.log(userDTO, "RepopulateProgressMarksServlet",msg); + auditService.log(userDTO, "RepopulateProgressMarksServlet", msg); out.println(msg); return; } private void processLearner(StringBuilder errorBuilder, StringBuilder auditLogBuilder, Lesson lesson, ArrayList activityList, LearnerProgress learnerProgress, boolean updateGradebookForAll) { try { - String messages[] = learnerService.recalcProgressForLearner(lesson, activityList, learnerProgress, updateGradebookForAll); + String messages[] = learnerService.recalcProgressForLearner(lesson, activityList, learnerProgress, + updateGradebookForAll); auditLogBuilder.append(messages[0]); errorBuilder.append(messages[1]); - } catch ( Throwable e ) { - log.error("Error thrown while processing "+learnerProgress.getUser().getLogin(), e); + } catch (Throwable e) { + log.error("Error thrown while processing " + learnerProgress.getUser().getLogin(), e); String msg = new StringBuilder("Error occured while processing user ") - .append(learnerProgress.getUser().getLogin()).append(" ").append(learnerProgress.getUser().getFullName()).append(". Proceeding entries in log for this user may or may not have worked. Error was ") - .append(e.getMessage()).append("\n") - .toString(); + .append(learnerProgress.getUser().getLogin()).append(" ") + .append(learnerProgress.getUser().getFullName()) + .append(". Proceeding entries in log for this user may or may not have worked. Error was ") + .append(e.getMessage()).append("\n").toString(); auditLogBuilder.append(msg); errorBuilder.append(msg); } } @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, - IOException { + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { doGet(request, response); }