Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r04324aeb5a29d6d1748ef57d871f24003fd32502 -r14340cffb8e7ee719460a70a3d0ddf0cebe7930b Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/web/action/EditLessonIntroAction.java =================================================================== diff -u -r73edd9fc54859f86475dc52245f699d338d12549 -r14340cffb8e7ee719460a70a3d0ddf0cebe7930b --- lams_central/src/java/org/lamsfoundation/lams/web/action/EditLessonIntroAction.java (.../EditLessonIntroAction.java) (revision 73edd9fc54859f86475dc52245f699d338d12549) +++ lams_central/src/java/org/lamsfoundation/lams/web/action/EditLessonIntroAction.java (.../EditLessonIntroAction.java) (revision 14340cffb8e7ee719460a70a3d0ddf0cebe7930b) @@ -20,7 +20,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.web.action; import java.io.IOException; @@ -34,7 +33,6 @@ import org.apache.struts.action.ActionMapping; import org.apache.struts.actions.DispatchAction; import org.lamsfoundation.lams.lesson.Lesson; -import org.lamsfoundation.lams.lesson.dao.ILessonDAO; import org.lamsfoundation.lams.lesson.service.ILessonService; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.util.AttributeNames; @@ -43,17 +41,11 @@ /** * Edit lesson intro page. - * - * - * - * */ public class EditLessonIntroAction extends DispatchAction { private static ILessonService lessonService; - private static ILessonDAO lessonDAO; - /** * Edit lesson intro page. */ @@ -85,7 +77,7 @@ lesson.setLessonName(lessonName); lesson.setLessonDescription(lessonDescription); lesson.setDisplayDesignImage(displayDesignImage); - getLessonDAO().saveLesson(lesson); + getLessonService().saveLesson(lesson); return null; } @@ -98,13 +90,4 @@ } return lessonService; } - - private ILessonDAO getLessonDAO() { - if (lessonDAO == null) { - WebApplicationContext ctx = WebApplicationContextUtils - .getRequiredWebApplicationContext(getServlet().getServletContext()); - lessonDAO = (ILessonDAO) ctx.getBean("lessonDAO"); - } - return lessonDAO; - } -} +} \ No newline at end of file Index: lams_central/web/lessonIntro.jsp =================================================================== diff -u -r73edd9fc54859f86475dc52245f699d338d12549 -r14340cffb8e7ee719460a70a3d0ddf0cebe7930b --- lams_central/web/lessonIntro.jsp (.../lessonIntro.jsp) (revision 73edd9fc54859f86475dc52245f699d338d12549) +++ lams_central/web/lessonIntro.jsp (.../lessonIntro.jsp) (revision 14340cffb8e7ee719460a70a3d0ddf0cebe7930b) @@ -7,8 +7,6 @@ <%@ taglib uri="tags-html" prefix="html" %> <%@ taglib uri="tags-function" prefix="fn"%> - - @@ -19,16 +17,8 @@ - @@ -43,12 +33,7 @@
- Sequence Preview -
- - Sequence Preview - -
+ Sequence Preview
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml =================================================================== diff -u -rc2ecaab901abf11324009ac815d914cd95fbb7c6 -r14340cffb8e7ee719460a70a3d0ddf0cebe7930b --- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision c2ecaab901abf11324009ac815d914cd95fbb7c6) +++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 14340cffb8e7ee719460a70a3d0ddf0cebe7930b) @@ -136,6 +136,7 @@ PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED + PROPAGATION_REQUIRED Index: lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r14340cffb8e7ee719460a70a3d0ddf0cebe7930b --- lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java (.../LessonService.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java (.../LessonService.java) (revision 14340cffb8e7ee719460a70a3d0ddf0cebe7930b) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.lesson.service; import java.util.ArrayList; @@ -687,4 +686,8 @@ } return releasedSucceedingLessons; } -} + + public void saveLesson(Lesson lesson) { + lessonDAO.saveLesson(lesson); + } +} \ No newline at end of file