Index: lams_monitoring/build.xml =================================================================== diff -u -r6e5832d17263bc6c6f7683733e91e22f97eab569 -r4ffb4f1a2bfc99e753289a089a51c92129409397 --- lams_monitoring/build.xml (.../build.xml) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569) +++ lams_monitoring/build.xml (.../build.xml) (revision 4ffb4f1a2bfc99e753289a089a51c92129409397) @@ -6,6 +6,7 @@ + @@ -125,6 +126,7 @@ webxml="${conf.webinf.dir}/web.xml"> + @@ -248,4 +250,11 @@ + + + + + Index: lams_monitoring/conf/xdoclet/filter-mappings.xml =================================================================== diff -u -rb395aaed7e903bdc2d4fbcc45a3191615e16f8d6 -r4ffb4f1a2bfc99e753289a089a51c92129409397 --- lams_monitoring/conf/xdoclet/filter-mappings.xml (.../filter-mappings.xml) (revision b395aaed7e903bdc2d4fbcc45a3191615e16f8d6) +++ lams_monitoring/conf/xdoclet/filter-mappings.xml (.../filter-mappings.xml) (revision 4ffb4f1a2bfc99e753289a089a51c92129409397) @@ -19,6 +19,10 @@ http://www.gnu.org/licenses/gpl.txt --> + SystemSessionFilter + /* + + HibernateFilter *.do Index: lams_monitoring/conf/xdoclet/filters.xml =================================================================== diff -u -r265c421629c4903f13dba67fae549d5e4f567e25 -r4ffb4f1a2bfc99e753289a089a51c92129409397 --- lams_monitoring/conf/xdoclet/filters.xml (.../filters.xml) (revision 265c421629c4903f13dba67fae549d5e4f567e25) +++ lams_monitoring/conf/xdoclet/filters.xml (.../filters.xml) (revision 4ffb4f1a2bfc99e753289a089a51c92129409397) @@ -18,8 +18,13 @@ http://www.gnu.org/licenses/gpl.txt --> - + SystemSessionFilter + + org.lamsfoundation.lams.web.session.SystemSessionFilter + + + HibernateFilter org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter Index: lams_monitoring/conf/xdoclet/taglibs.xml =================================================================== diff -u -rb395aaed7e903bdc2d4fbcc45a3191615e16f8d6 -r4ffb4f1a2bfc99e753289a089a51c92129409397 --- lams_monitoring/conf/xdoclet/taglibs.xml (.../taglibs.xml) (revision b395aaed7e903bdc2d4fbcc45a3191615e16f8d6) +++ lams_monitoring/conf/xdoclet/taglibs.xml (.../taglibs.xml) (revision 4ffb4f1a2bfc99e753289a089a51c92129409397) @@ -78,3 +78,9 @@ http://java.sun.com/jstl/xml_rt /WEB-INF/jstl/x-rt.tld + + + + tags-lams + /WEB-INF/lams.tld + Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java =================================================================== diff -u -r6e5832d17263bc6c6f7683733e91e22f97eab569 -r4ffb4f1a2bfc99e753289a089a51c92129409397 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java (.../IMonitoringService.java) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java (.../IMonitoringService.java) (revision 4ffb4f1a2bfc99e753289a089a51c92129409397) @@ -103,24 +103,46 @@ public GateActivity closeGate(Long gateId); /** + * This method returns a A list of all available Lessons. + * If the data is to be sent to Flash, then use getAllLessonsWDDX() + * + * @return List The requested list of Lessons + * @throws IOException + */ + public List getAllLessons() throws IOException; + + /** * This method returns a string representing a list of all * available Lessons in the WDDX format * * @return String The requested list of Lessons in wddx format * @throws IOException */ - public String getAllLessons() throws IOException; + public String getAllLessonsWDDX() throws IOException; /** * This method returns a string representing a list of all + * available Lessons for a given user. If the data is to be + * sent to Flash, then use getAllLessonsWDDX(Integer userID) + * + * @param userID The user_id of the user for whom the lessons + * are being fetched. + * @return List The requested list of Lessons + * @throws IOException + */ + public List getAllLessons(Integer userID)throws IOException; + + + /** + * This method returns a string representing a list of all * available Lessons for a given user in the WDDX format * * @param userID The user_id of the user for whom the lessons * are being fetched. * @return String The requested list of Lessons in wddx format * @throws IOException */ - public String getAllLessons(Integer userID)throws IOException; + public String getAllLessonsWDDX(Integer userID)throws IOException; /** * This method returns the details for the given Lesson in Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== diff -u -r79c858a92c17ab3ca404cab4a0cf6094254e68d5 -r4ffb4f1a2bfc99e753289a089a51c92129409397 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 4ffb4f1a2bfc99e753289a089a51c92129409397) @@ -375,21 +375,35 @@ * (non-Javadoc) * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#getAllLessons() */ - public String getAllLessons() throws IOException{ - List lessons = lessonDAO.getAllLessons(); - return requestLessonList(lessons); + public List getAllLessons() throws IOException{ + return lessonDAO.getAllLessons(); } /** * (non-Javadoc) + * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#getAllLessonsWDDX() + */ + public String getAllLessonsWDDX() throws IOException{ + return requestLessonList(getAllLessons()); + } + + /** + * (non-Javadoc) * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#getAllLessons(java.lang.Integer) */ - public String getAllLessons(Integer userID)throws IOException{ - List lessons = lessonDAO.getLessonsForUser(userID); - return requestLessonList(lessons); + public List getAllLessons(Integer userID)throws IOException{ + return lessonDAO.getLessonsForUser(userID); } + /** * (non-Javadoc) + * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#getAllLessonsWDDX(java.lang.Integer) + */ + public String getAllLessonsWDDX(Integer userID)throws IOException{ + return requestLessonList(getAllLessons(userID)); + } + /** + * (non-Javadoc) * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#getLessonDetails(java.lang.Long) */ public String getLessonDetails(Long lessonID)throws IOException{ Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyForm.java =================================================================== diff -u --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyForm.java (revision 0) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyForm.java (revision 4ffb4f1a2bfc99e753289a089a51c92129409397) @@ -0,0 +1,85 @@ +/* + Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA + + http://www.gnu.org/licenses/gpl.txt +*/ + +package org.lamsfoundation.lams.monitoring.web; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.log4j.Logger; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; + +/** + * See DummyMonitoringAction + * @struts:form name="DummyForm" + */ +public class DummyForm extends ActionForm { + + private Logger log = Logger.getLogger(DummyForm.class); + private String title; + private String desc; + private Long learningDesignId; + + + public void reset(ActionMapping mapping, HttpServletRequest request) { + + } + + + /** + * @return Returns the desc. + */ + public String getDesc() { + return desc; + } + /** + * @param desc The desc to set. + */ + public void setDesc(String desc) { + this.desc = desc; + } + /** + * @return Returns the learningDesignId. + */ + public Long getLearningDesignId() { + return learningDesignId; + } + /** + * @param learningDesignId The learningDesignId to set. + */ + public void setLearningDesignId(Long learningDesignId) { + this.learningDesignId = learningDesignId; + } + /** + * @return Returns the title. + */ + public String getTitle() { + return title; + } + /** + * @param title The title to set. + */ + public void setTitle(String title) { + this.title = title; + } + + +} \ No newline at end of file Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java =================================================================== diff -u --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java (revision 0) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java (revision 4ffb4f1a2bfc99e753289a089a51c92129409397) @@ -0,0 +1,294 @@ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ + +package org.lamsfoundation.lams.monitoring.web; + +import java.io.IOException; +import java.util.LinkedList; +import java.util.List; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import org.apache.log4j.Logger; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.lamsfoundation.lams.lesson.Lesson; +import org.lamsfoundation.lams.monitoring.service.IMonitoringService; +import org.lamsfoundation.lams.monitoring.service.MonitoringServiceProxy; +import org.lamsfoundation.lams.usermanagement.Organisation; +import org.lamsfoundation.lams.usermanagement.User; +import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; +import org.lamsfoundation.lams.web.action.LamsDispatchAction; +import org.lamsfoundation.lams.web.session.SessionManager; +import org.lamsfoundation.lams.web.util.AttributeNames; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.context.support.WebApplicationContextUtils; + + +/** + *

An action servlet to support the dummy monitoring page dummy.jsp.

+ * + * ----------------XDoclet Tags-------------------- + * + * @struts:action path="/dummy" + * name="DummyForm" + * parameter="method" + * validate="false" + * @struts.action-exception key="error.system.monitor" scope="request" + * type="org.lamsfoundation.lams.monitoring.service.MonitoringServiceException" + * path=".systemError" + * handler="org.lamsfoundation.lams.web.util.CustomStrutsExceptionHandler" + * @struts:action-forward name="dummy" path="/dummy.jsp" + * + * ----------------XDoclet Tags-------------------- + */ +public class DummyMonitoringAction extends LamsDispatchAction +{ + //--------------------------------------------------------------------- + // Instance variables + //--------------------------------------------------------------------- + private static Logger log = Logger.getLogger(DummyMonitoringAction.class); + + private IMonitoringService monitoringService; + private IUserManagementService usermanageService; + + //--------------------------------------------------------------------- + // Class level constants - session attributes + //--------------------------------------------------------------------- + // input parameters + // output parameters + private static final String DUMMY_FORWARD = "dummy"; + private static final String LESSONS_PARAMETER = "lessons"; + + private static final Integer ORGANIZATION_ID = new Integer(1); + + + //--------------------------------------------------------------------- + // Struts Dispatch Method + //--------------------------------------------------------------------- + /** + * The Struts dispatch method that initialised and start a lesson. + * It will start a lesson with the current user as the staff and learner. + * + * @param mapping An ActionMapping class that will be used by the Action class to tell + * the ActionServlet where to send the end-user. + * + * @param form The ActionForm class that will contain any data submitted + * by the end-user via a form. + * @param request A standard Servlet HttpServletRequest class. + * @param response A standard Servlet HttpServletResponse class. + * @return An ActionForward class that will be returned to the ActionServlet indicating where + * the user is to go next. + * @throws IOException + * @throws ServletException + */ + + public ActionForward startLesson(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response)throws IOException{ + + setupServices(); + + // set up all the data needed + DummyForm dummyForm = (DummyForm) form; + Long ldId = dummyForm.getLearningDesignId(); + if ( ldId == null ) + throw new IOException("Learning design id must be set"); + + String title = dummyForm.getTitle(); + if ( title == null ) title = "lesson"; + String desc = dummyForm.getDesc(); + if ( desc == null ) desc = "description"; + + User user = getUser(); + Organisation organisation = usermanageService.getOrganisationById(ORGANIZATION_ID); + + // initialize the lesson + Lesson testLesson = monitoringService.initializeLesson(title,desc,ldId.longValue(),user); + + // create the lesson class + LinkedList learners = new LinkedList(); + learners.add(user); + LinkedList staffs = new LinkedList(); + staffs.add(user); + testLesson = monitoringService.createLessonClassForLesson(testLesson.getLessonId().longValue(), + organisation, + learners, + staffs); + + // start the lesson. + this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); + monitoringService.startlesson(testLesson.getLessonId().longValue()); + + // now got back to the dummy screen with an updated list of lessons to the user + return unspecified(mapping, form, request, response); + + } + + /** Default method for this action. Gets a list of all the current lessons for this user and forwards to dummy.jsp */ + public ActionForward unspecified(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response)throws IOException{ + setupServices(); + + User user = getUser(); + List lessons = monitoringService.getAllLessons(user.getUserId()); + request.getSession().setAttribute(LESSONS_PARAMETER,lessons); + return mapping.findForward(DUMMY_FORWARD); + } + + private void setupServices() { + + this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); + + WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext()); + this.usermanageService= (IUserManagementService) wac.getBean("userManagementService"); + + } + private User getUser() throws IOException { + HttpSession ss = SessionManager.getSession(); + UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); + if ( user != null ) { + return usermanageService.getUserById(user.getUserID()); + } + throw new IOException("Unable to get user. User in session manager is "+user); + } +/* public ActionForward getLessonDetails(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response)throws IOException{ + this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); + Long lessonID = new Long(WebUtil.readLongParam(request,"lessonID")); + String wddxPacket = monitoringService.getLessonDetails(lessonID); + return outputPacket(mapping, request, response, wddxPacket, "details"); + } + public ActionForward getLessonLearners(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response)throws IOException{ + this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); + Long lessonID = new Long(WebUtil.readLongParam(request,"lessonID")); + String wddxPacket = monitoringService.getLessonLearners(lessonID); + return outputPacket(mapping, request, response, wddxPacket, "details"); + } + public ActionForward getLearningDesignDetails(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response)throws IOException{ + this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); + Long lessonID = new Long(WebUtil.readLongParam(request,"lessonID")); + String wddxPacket = monitoringService.getLearningDesignDetails(lessonID); + return outputPacket(mapping, request, response, wddxPacket, "details"); + } + public ActionForward getAllLearnersProgress(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response)throws IOException{ + this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); + Long lessonID = new Long(WebUtil.readLongParam(request,"lessonID")); + String wddxPacket = monitoringService.getAllLearnersProgress(lessonID); + return outputPacket(mapping, request, response, wddxPacket, "details"); + } + public ActionForward getAllContributeActivities(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response)throws IOException{ + this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); + Long lessonID = new Long(WebUtil.readLongParam(request,"lessonID")); + String wddxPacket = monitoringService.getAllContributeActivities(lessonID); + return outputPacket(mapping, request, response, wddxPacket, "details"); + } + public ActionForward getLearnerActivityURL(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response)throws IOException,LamsToolServiceException{ + this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); + Integer userID = new Integer(WebUtil.readIntParam(request,"userID")); + Long activityID = new Long(WebUtil.readLongParam(request,"activityID")); + String wddxPacket = monitoringService.getLearnerActivityURL(activityID,userID); + return outputPacket(mapping, request, response, wddxPacket, "details"); + } + public ActionForward getActivityContributionURL(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response)throws IOException{ + this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); + Long activityID = new Long(WebUtil.readLongParam(request,"activityID")); + String wddxPacket = monitoringService.getActivityContributionURL(activityID); + return outputPacket(mapping, request, response, wddxPacket, "details"); + } + public ActionForward moveLesson(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response)throws IOException{ + this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); + Long lessonID = new Long(WebUtil.readLongParam(request,"lessonID")); + Integer userID = new Integer(WebUtil.readIntParam(request,"userID")); + Integer targetWorkspaceFolderID = new Integer(WebUtil.readIntParam(request,"folderID")); + String wddxPacket = monitoringService.moveLesson(lessonID,targetWorkspaceFolderID,userID); + return outputPacket(mapping, request, response, wddxPacket, "details"); + } + public ActionForward renameLesson(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response)throws IOException{ + this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); + Long lessonID = new Long(WebUtil.readLongParam(request,"lessonID")); + Integer userID = new Integer(WebUtil.readIntParam(request,"userID")); + String name = WebUtil.readStrParam(request,"name"); + String wddxPacket = monitoringService.renameLesson(lessonID,name,userID); + return outputPacket(mapping, request, response, wddxPacket, "details"); + } + + public ActionForward checkGateStatus(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws IOException { + + this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); + Long activityID = new Long(WebUtil.readLongParam(request, "activityID")); + Long lessonID = new Long(WebUtil.readLongParam(request, "lessonID")); + String wddxPacket = monitoringService.checkGateStatus(activityID, lessonID); + // request.setAttribute(USE_JSP_OUTPUT, "1"); + return outputPacket(mapping, request, response, wddxPacket, "details"); + + } + + public ActionForward releaseGate(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws IOException { + this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); + Long activityID = new Long(WebUtil.readLongParam(request, "activityID")); + String wddxPacket = monitoringService.releaseGate(activityID); + // request.setAttribute(USE_JSP_OUTPUT, "1"); + return outputPacket(mapping, request, response, wddxPacket, "details"); + } +*/ +} Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java =================================================================== diff -u -r6e5832d17263bc6c6f7683733e91e22f97eab569 -r4ffb4f1a2bfc99e753289a089a51c92129409397 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision 6e5832d17263bc6c6f7683733e91e22f97eab569) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision 4ffb4f1a2bfc99e753289a089a51c92129409397) @@ -158,7 +158,7 @@ HttpServletRequest request, HttpServletResponse response)throws IOException{ this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); - String wddxPacket = monitoringService.getAllLessons(); + String wddxPacket = monitoringService.getAllLessonsWDDX(); return outputPacket(mapping, request, response, wddxPacket, "details"); } public ActionForward getLessonDetails(ActionMapping mapping, Index: lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java =================================================================== diff -u -r6faa51252d8f8117db65e0a58ff295def4cf7af9 -r4ffb4f1a2bfc99e753289a089a51c92129409397 --- lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java (.../TestMonitoringService.java) (revision 6faa51252d8f8117db65e0a58ff295def4cf7af9) +++ lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java (.../TestMonitoringService.java) (revision 4ffb4f1a2bfc99e753289a089a51c92129409397) @@ -62,11 +62,11 @@ private final Integer TEST_LEARNER_ID = new Integer(2); private final Integer TEST_STAFF_ID = new Integer(3); // values when demo'ing the progress engine - //private final long TEST_LEARNING_DESIGN_ID = 2; - //private final long TEST_COPIED_LEARNING_DESIGN_ID = 3; + private final long TEST_LEARNING_DESIGN_ID = 2; + private final long TEST_COPIED_LEARNING_DESIGN_ID = 3; // values when testing the progress engine - private final long TEST_LEARNING_DESIGN_ID = 1; - private final long TEST_COPIED_LEARNING_DESIGN_ID = 2; + //private final long TEST_LEARNING_DESIGN_ID = 1; + //private final long TEST_COPIED_LEARNING_DESIGN_ID = 2; private final Integer TEST_ORGANIZATION_ID = new Integer(1); private final Long TEST_SCHEDULE_GATE_ID = new Long(27); private final Long TEST_LESSION_ID = new Long(1); // "Test_Lesson" from insert_test_data script @@ -224,7 +224,7 @@ } public void testGetAllLessons()throws IOException{ - String packet = monitoringService.getAllLessons(); + String packet = monitoringService.getAllLessonsWDDX(); System.out.print(packet); } public void testGetLessonDetails() throws IOException{ Index: lams_monitoring/web/WEB-INF/lams.tld =================================================================== diff -u --- lams_monitoring/web/WEB-INF/lams.tld (revision 0) +++ lams_monitoring/web/WEB-INF/lams.tld (revision 4ffb4f1a2bfc99e753289a089a51c92129409397) @@ -0,0 +1,27 @@ + + + + + + 1.0 + 1.1 + lams + + + + + + user + org.lamsfoundation.lams.web.tag.UserTag + + + + property + true + true + + + + + + Index: lams_monitoring/web/WEB-INF/web.xml =================================================================== diff -u -r2fb270efd025291a9a2d45b04ad1b13aad40f170 -r4ffb4f1a2bfc99e753289a089a51c92129409397 --- lams_monitoring/web/WEB-INF/web.xml (.../web.xml) (revision 2fb270efd025291a9a2d45b04ad1b13aad40f170) +++ lams_monitoring/web/WEB-INF/web.xml (.../web.xml) (revision 4ffb4f1a2bfc99e753289a089a51c92129409397) @@ -61,8 +61,13 @@ http://www.gnu.org/licenses/gpl.txt --> - + SystemSessionFilter + + org.lamsfoundation.lams.web.session.SystemSessionFilter + + + HibernateFilter org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter @@ -96,6 +101,10 @@ http://www.gnu.org/licenses/gpl.txt --> + SystemSessionFilter + /* + + HibernateFilter *.do @@ -276,6 +285,12 @@ /WEB-INF/jstl/x-rt.tld + + + tags-lams + /WEB-INF/lams.tld + +