Index: lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java =================================================================== diff -u -r48ad0d8484c393361953c6a45b5135f3a63173ba -ra47e0259ee44890918d7cf47ab4608fdef80144b --- lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java (.../WebUtil.java) (revision 48ad0d8484c393361953c6a45b5135f3a63173ba) +++ lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java (.../WebUtil.java) (revision a47e0259ee44890918d7cf47ab4608fdef80144b) @@ -19,24 +19,6 @@ //--------------------------------------------------------------------- // Class level constants - Session attributs //--------------------------------------------------------------------- - public static final String PARAM_MODE = "mode"; - public static final String PARAM_SESSION_STATUS = "sessionStatus"; - public static final String PARAM_TOOL_SESSION_ID = "toolSessionID"; //works with survey but doesnt work with qa and nb which expects toolSessionId - //public static final String PARAM_TOOL_SESSION_ID = "toolSessionId"; - public static final String PARAM_USER_ID_NEW = "userId"; - - public static final String PARAM_CONTENT_ID = "content_id"; - public static final String PARAM_USER_ID = "user_id"; - public static final String PARAM_LESSON_ID = "lesson_id"; - public static final String PARAM_TOOL_CONTENT_ID = "contentId"; - public static final String PARAM_DIRECTORY_NAME = "directoryName"; - public static final String PARAM_FILENAME = "filename"; - - public static final String ATTR_MODE = "mode"; - public static final String ATTR_USERNAME = "username"; - public static final String ATTR_UPDATE_PROGRESS_BAR = "updateProgressBar"; - public static final String ATTR_SESSION_STATUS = "sessionStatus"; - public static final String ATTR_LESSON_ID = "lesson_id"; private static Logger log = Logger.getLogger(WebUtil.class); Index: lams_common/src/java/org/lamsfoundation/lams/web/filter/ResponseCaptureFilter.java =================================================================== diff -u -rbda8157a824fd430b5fbc860a56eb28fc75f8b9a -ra47e0259ee44890918d7cf47ab4608fdef80144b --- lams_common/src/java/org/lamsfoundation/lams/web/filter/ResponseCaptureFilter.java (.../ResponseCaptureFilter.java) (revision bda8157a824fd430b5fbc860a56eb28fc75f8b9a) +++ lams_common/src/java/org/lamsfoundation/lams/web/filter/ResponseCaptureFilter.java (.../ResponseCaptureFilter.java) (revision a47e0259ee44890918d7cf47ab4608fdef80144b) @@ -1,11 +1,19 @@ package org.lamsfoundation.lams.web.filter; -import java.io.*; -import javax.servlet.*; -import javax.servlet.http.*; -import org.lamsfoundation.lams.util.WebUtil; -import org.lamsfoundation.lams.web.filter.ResponseWrapper; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletResponse; + import org.apache.log4j.Logger; +import org.lamsfoundation.lams.web.util.AttributeNames; /** * @author mtruong @@ -41,7 +49,7 @@ chain.doFilter(request, responseWrapper); String responseBody = responseWrapper.toString(); //output of the original response that was stored in the response wrapper - String filename = (String)request.getAttribute(WebUtil.PARAM_FILENAME); + String filename = (String)request.getAttribute(AttributeNames.PARAM_FILENAME); if (filename != null && !filename.equals("")) { Index: lams_common/src/java/org/lamsfoundation/lams/web/servlet/AbstractExportPortfolioServlet.java =================================================================== diff -u -r2d65eb43e112276586ba05c2b8f6e34b46f5703e -ra47e0259ee44890918d7cf47ab4608fdef80144b --- lams_common/src/java/org/lamsfoundation/lams/web/servlet/AbstractExportPortfolioServlet.java (.../AbstractExportPortfolioServlet.java) (revision 2d65eb43e112276586ba05c2b8f6e34b46f5703e) +++ lams_common/src/java/org/lamsfoundation/lams/web/servlet/AbstractExportPortfolioServlet.java (.../AbstractExportPortfolioServlet.java) (revision a47e0259ee44890918d7cf47ab4608fdef80144b) @@ -6,17 +6,11 @@ */ package org.lamsfoundation.lams.web.servlet; -import java.io.FileOutputStream; -import java.io.FileNotFoundException; import java.io.File; +import java.io.FileNotFoundException; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; import java.io.PrintWriter; - -import java.net.HttpURLConnection; import java.net.MalformedURLException; -import java.net.URL; import javax.servlet.ServletException; import javax.servlet.http.Cookie; @@ -25,10 +19,10 @@ import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.util.FileUtil; import org.lamsfoundation.lams.util.HttpUrlConnectionUtil; -import org.lamsfoundation.lams.web.servlet.ExportPortfolioServletException; +import org.lamsfoundation.lams.util.WebUtil; +import org.lamsfoundation.lams.web.util.AttributeNames; /** @@ -59,11 +53,6 @@ private static Logger log = Logger.getLogger(AbstractExportPortfolioServlet.class); - protected final String TOOL_SESSION_ID = "toolSessionId"; - protected final String TOOL_CONTENT_ID = "toolContentId"; - protected final String USER_ID = "userId"; - - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { @@ -73,7 +62,7 @@ Cookie[] cookies = request.getCookies(); - directoryName = WebUtil.readStrParam(request, WebUtil.PARAM_DIRECTORY_NAME); + directoryName = WebUtil.readStrParam(request, AttributeNames.PARAM_DIRECTORY_NAME); //put the path together again, since the given directory was a relative one. String absoluteDirectoryPath = FileUtil.TEMP_DIR + File.separator + directoryName; @@ -90,7 +79,7 @@ if (!FileUtil.directoryExist(absoluteDirectoryPath)) throw new IOException("The directory supplied " + absoluteDirectoryPath + " does not exist."); - mode = WebUtil.readStrParam(request, WebUtil.PARAM_MODE); + mode = WebUtil.readStrParam(request, AttributeNames.PARAM_MODE); if (log.isDebugEnabled()) { log.debug("Export is conducted in mode: " + mode); @@ -184,9 +173,9 @@ protected String appendParametersToLearnerExportURL(HttpServletRequest request, String url) { String finalURL; - finalURL = WebUtil.appendParameterToURL(url, WebUtil.PARAM_MODE, WebUtil.readStrParam(request, WebUtil.PARAM_MODE)); - finalURL = WebUtil.appendParameterToURL(finalURL, TOOL_SESSION_ID, WebUtil.readStrParam(request, TOOL_SESSION_ID)); - finalURL = WebUtil.appendParameterToURL(finalURL, USER_ID, WebUtil.readStrParam(request, USER_ID)); + finalURL = WebUtil.appendParameterToURL(url, AttributeNames.PARAM_MODE, WebUtil.readStrParam(request, AttributeNames.PARAM_MODE)); + finalURL = WebUtil.appendParameterToURL(finalURL, AttributeNames.PARAM_TOOL_SESSION_ID, WebUtil.readStrParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); + finalURL = WebUtil.appendParameterToURL(finalURL, AttributeNames.PARAM_USER_ID, WebUtil.readStrParam(request, AttributeNames.PARAM_USER_ID)); return finalURL; } @@ -203,8 +192,8 @@ protected String appendParametersToTeacherExportURL(HttpServletRequest request, String url) { String finalURL; - finalURL = WebUtil.appendParameterToURL(url, WebUtil.PARAM_MODE, WebUtil.readStrParam(request, WebUtil.PARAM_MODE)); - finalURL = WebUtil.appendParameterToURL(finalURL, TOOL_CONTENT_ID, WebUtil.readStrParam(request, TOOL_CONTENT_ID)); + finalURL = WebUtil.appendParameterToURL(url, AttributeNames.PARAM_MODE, WebUtil.readStrParam(request, AttributeNames.PARAM_MODE)); + finalURL = WebUtil.appendParameterToURL(finalURL, AttributeNames.PARAM_TOOL_CONTENT_ID, WebUtil.readStrParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); return finalURL; } Index: lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java =================================================================== diff -u -rbd500cd4e95fae5e968c3f2b6d3880df46f30495 -ra47e0259ee44890918d7cf47ab4608fdef80144b --- lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java (.../AttributeNames.java) (revision bd500cd4e95fae5e968c3f2b6d3880df46f30495) +++ lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java (.../AttributeNames.java) (revision a47e0259ee44890918d7cf47ab4608fdef80144b) @@ -37,13 +37,22 @@ public static final String ADMIN_ERR_MSG = "errormsg"; public static final String USER= "user"; - - public static final String TOOL_CONTENT_ID = "toolContentID"; - public static final String TOOL_SESSION_ID = "toolSessionID"; - public static final String MODE = "mode"; - public static final String USER_ID = "userID"; - public static final String ACTIVITY_ID = "activityID"; + public static final String PARAM_MODE = "mode"; + public static final String PARAM_SESSION_STATUS = "sessionStatus"; + public static final String PARAM_USER_ID = "userID"; + public static final String PARAM_TOOL_CONTENT_ID = "toolContentID"; + public static final String PARAM_TOOL_SESSION_ID = "toolSessionID"; + public static final String PARAM_ACTIVITY_ID = "activityID"; + + public static final String PARAM_LESSON_ID = "lessonID"; + public static final String PARAM_DIRECTORY_NAME = "directoryName"; + public static final String PARAM_FILENAME = "filename"; + + public static final String ATTR_MODE = "mode"; + public static final String ATTR_USERNAME = "username"; + public static final String ATTR_UPDATE_PROGRESS_BAR = "updateProgressBar"; + public static final String ATTR_SESSION_STATUS = "sessionStatus"; + - } Index: lams_common/test/java/org/lamsfoundation/lams/tool/service/TestLamsCoreToolService.java =================================================================== diff -u -r461dd968ec69c3849d9a7ca03ab626b1e91d9cf1 -ra47e0259ee44890918d7cf47ab4608fdef80144b --- lams_common/test/java/org/lamsfoundation/lams/tool/service/TestLamsCoreToolService.java (.../TestLamsCoreToolService.java) (revision 461dd968ec69c3849d9a7ca03ab626b1e91d9cf1) +++ lams_common/test/java/org/lamsfoundation/lams/tool/service/TestLamsCoreToolService.java (.../TestLamsCoreToolService.java) (revision a47e0259ee44890918d7cf47ab4608fdef80144b) @@ -27,8 +27,8 @@ import org.lamsfoundation.lams.tool.ToolDataAccessTestCase; import org.lamsfoundation.lams.tool.ToolSession; import org.lamsfoundation.lams.tool.dao.hibernate.ToolSessionDAO; -import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.tool.exception.LamsToolServiceException; +import org.lamsfoundation.lams.web.util.AttributeNames; /** @@ -98,7 +98,7 @@ assertNotNull(learnerUrl); assertTrue(learnerUrl.indexOf("?")>0); assertTrue(learnerUrl.indexOf(ToolAccessMode.LEARNER.toString())>0); - assertTrue(learnerUrl.indexOf(WebUtil.PARAM_MODE)>0); + assertTrue(learnerUrl.indexOf(AttributeNames.PARAM_MODE)>0); log.info("learner url:"+learnerUrl); } @@ -110,7 +110,7 @@ log.info("monitor url:"+monitorUrl); assertTrue(monitorUrl.indexOf("?")>0); assertTrue(monitorUrl.indexOf(ToolAccessMode.TEACHER.toString())>0); - assertTrue(monitorUrl.indexOf(WebUtil.PARAM_MODE)>0); + assertTrue(monitorUrl.indexOf(AttributeNames.PARAM_MODE)>0); } @@ -122,7 +122,7 @@ log.info("author url:"+authorUrl); assertTrue(authorUrl.indexOf("?")>0); assertTrue(authorUrl.indexOf(ToolAccessMode.AUTHOR.toString())>0); - assertTrue(authorUrl.indexOf(WebUtil.PARAM_MODE)>0); + assertTrue(authorUrl.indexOf(AttributeNames.PARAM_MODE)>0); } @@ -134,7 +134,7 @@ log.info("Non grouped activity learner url:"+learnerUrl); assertTrue(learnerUrl.indexOf("?")>0); assertTrue(learnerUrl.indexOf(ToolAccessMode.LEARNER.toString())!=-1); - assertTrue(learnerUrl.indexOf(WebUtil.PARAM_MODE)>0); + assertTrue(learnerUrl.indexOf(AttributeNames.PARAM_MODE)>0); } @@ -143,7 +143,7 @@ String testUrl = "http://localhost:8080/lams/test.do?method=test"; String testUrlWithContent = toolService.setupToolURLWithToolContent(testNonGroupedActivity,testUrl); log.info("test url with content id:"+testUrlWithContent); - assertTrue(testUrlWithContent.indexOf(WebUtil.PARAM_CONTENT_ID)>0); + assertTrue(testUrlWithContent.indexOf(AttributeNames.PARAM_TOOL_CONTENT_ID)>0); } }