Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java,v diff -u -r1.60.2.23 -r1.60.2.24 --- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 11 May 2016 07:07:58 -0000 1.60.2.23 +++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 6 Jun 2016 08:44:20 -0000 1.60.2.24 @@ -76,18 +76,8 @@ import org.springframework.web.context.support.WebApplicationContextUtils; /** - * this is an action where all lams client environments launch. initial configuration of the individual environment + * This is an action where all lams client environments launch. initial configuration of the individual environment * setting is done here. - * - * - * - * - * - * - * - * - * - * */ public class HomeAction extends DispatchAction { Fisheye: Tag 1.7.2.4 refers to a dead (removed) revision in file `lams_central/web/css/defaultHTML_learner_mobile.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5.2.1 refers to a dead (removed) revision in file `lams_central/web/css/jquery.mobile.css'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java,v diff -u -r1.52.2.9 -r1.52.2.10 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java 11 May 2016 07:07:36 -0000 1.52.2.9 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java 6 Jun 2016 08:44:29 -0000 1.52.2.10 @@ -73,13 +73,6 @@ * @author Jacky Fang * @since 3/03/2005 * @version 1.1 - * - * - * - * - * - * - * */ public class LearnerAction extends LamsDispatchAction { // --------------------------------------------------------------------- @@ -227,37 +220,6 @@ return null; } - /** - * Gets the same url as getLearnerActivityURL() but forwards directly to the url. - * - * @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 displayProgress(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) throws IOException, ServletException { - Integer learnerId = LearningWebUtil.getUserId(); - Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID); - - ICoreLearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext()); - Object[] ret = learnerService.getStructuredActivityURLs(learnerId, lessonId); - ; - request.setAttribute("progressList", ret[0]); - request.setAttribute("currentActivityID", ret[1]); - - return mapping.findForward("displayProgress"); - } - public ActionForward getPresenceChatActiveUserCount(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException { Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID); Fisheye: Tag 1.1.2.3 refers to a dead (removed) revision in file `lams_learning/web/index.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_learning/web/WEB-INF/struts-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/Attic/struts-config.xml,v diff -u -r1.1.2.2 -r1.1.2.3 --- lams_learning/web/WEB-INF/struts-config.xml 29 Apr 2016 08:20:42 -0000 1.1.2.2 +++ lams_learning/web/WEB-INF/struts-config.xml 6 Jun 2016 08:44:29 -0000 1.1.2.3 @@ -188,11 +188,6 @@ redirect="false" /> - - - - - - - @@ -83,9 +77,8 @@ - + - Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `lams_learning/web/WEB-INF/urlrewrite.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_learning/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/Attic/web.xml,v diff -u -r1.39.2.6 -r1.39.2.7 --- lams_learning/web/WEB-INF/web.xml 24 Feb 2016 12:35:27 -0000 1.39.2.6 +++ lams_learning/web/WEB-INF/web.xml 6 Jun 2016 08:44:29 -0000 1.39.2.7 @@ -33,11 +33,6 @@ - UrlRewriteFilter - org.tuckey.web.filters.urlrewrite.UrlRewriteFilter - - - HibernateFilter org.springframework.orm.hibernate4.support.OpenSessionInViewFilter @@ -65,18 +60,6 @@ - UrlRewriteFilter - /layout/supportMobileVersionLayout.jsp - FORWARD - - - - UrlRewriteFilter - /main.jsp - FORWARD - - - HibernateFilter /* Fisheye: Tag 1.2.2.4 refers to a dead (removed) revision in file `lams_learning/web/layout/mobileLayout.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_learning/web/layout/supportMobileVersionLayout.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.2.2 refers to a dead (removed) revision in file `lams_learning/web/mobile/lessonComplete.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.6 refers to a dead (removed) revision in file `lams_learning/web/mobile/main.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.4 refers to a dead (removed) revision in file `lams_learning/web/mobile/progress.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.3 refers to a dead (removed) revision in file `lams_learning/web/mobile/common/progressOutput.jsp'. Fisheye: No comparison available. Pass `N' to diff?