Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java,v diff -u -r1.16 -r1.17 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java 16 Dec 2005 21:05:36 -0000 1.16 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java 18 Dec 2005 23:19:58 -0000 1.17 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java,v diff -u -r1.32 -r1.33 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java 18 Dec 2005 19:57:51 -0000 1.32 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java 18 Dec 2005 23:20:08 -0000 1.33 @@ -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) *