Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java =================================================================== diff -u -redc0e86bb2f19c6344f88b7b0194564480592f9a -rb346aae6594fa9506dc251c38dc968cfa977b8da --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java (.../McLearningStarterAction.java) (revision edc0e86bb2f19c6344f88b7b0194564480592f9a) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java (.../McLearningStarterAction.java) (revision b346aae6594fa9506dc251c38dc968cfa977b8da) @@ -100,7 +100,6 @@ request.getSession().setAttribute(TOOL_SERVICE, mcService); } - setupPaths(request); McLearningForm mcLearningForm = (McLearningForm) form; /* @@ -437,28 +436,6 @@ /** - * sets up ROOT_PATH and PATH_TO_LAMS attributes for presentation purposes - * setupPaths(HttpServletRequest request) - * @param request - */ - protected void setupPaths(HttpServletRequest request) - { - String protocol = request.getProtocol(); - if(protocol.startsWith("HTTPS")){ - protocol = "https://"; - }else{ - protocol = "http://"; - } - String root = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/"; - String pathToLams = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/../.."; - request.getSession().setAttribute(ROOT, root); - request.getSession().setAttribute(ROOT_PATH, root); - request.getSession().setAttribute(PATH_TO_LAMS, pathToLams); - - logger.debug("setting root to: " + request.getSession().getAttribute(ROOT)); - } - - /** * persists error messages to request scope * @param request * @param message Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java =================================================================== diff -u -r88d5dbe3e6552bb320ad648f984662ccbd670157 -rb346aae6594fa9506dc251c38dc968cfa977b8da --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java (.../McStarterAction.java) (revision 88d5dbe3e6552bb320ad648f984662ccbd670157) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java (.../McStarterAction.java) (revision b346aae6594fa9506dc251c38dc968cfa977b8da) @@ -80,7 +80,6 @@ request.getSession().setAttribute(TOOL_SERVICE, mcService); } - setupPaths(request); initialiseAttributes(request); McAuthoringForm mcAuthoringForm = (McAuthoringForm) form; @@ -286,29 +285,6 @@ /** - * sets up ROOT_PATH and PATH_TO_LAMS attributes for presentation purposes - * setupPaths(HttpServletRequest request) - * @param request - */ - protected void setupPaths(HttpServletRequest request) - { - String protocol = request.getProtocol(); - if(protocol.startsWith("HTTPS")){ - protocol = "https://"; - }else{ - protocol = "http://"; - } - String root = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/"; - String pathToLams = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/../.."; - request.getSession().setAttribute(ROOT, root); - request.getSession().setAttribute(ROOT_PATH, root); - request.getSession().setAttribute(PATH_TO_LAMS, pathToLams); - - logger.debug("setting root to: " + request.getSession().getAttribute(ROOT)); - } - - - /** * retrieves the contents of an existing content from the db and prepares it for presentation * retrieveExistingContent(HttpServletRequest request, McAuthoringForm mcAuthoringForm, long toolContentId) *