Index: lams_tool_laqa/.classpath
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re0dcf97659b72435ef0f29c69a4999847ae11d5b
--- lams_tool_laqa/.classpath	(.../.classpath)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/.classpath	(.../.classpath)	(revision e0dcf97659b72435ef0f29c69a4999847ae11d5b)
@@ -3,7 +3,6 @@
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/hibernate/main/hibernate-core-5.0.10.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/hibernate-core">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.jboss.org/hibernate/orm/4.3/javadocs/"/>
@@ -27,5 +26,6 @@
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main/jackson-core-2.7.4.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jackson"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main/jackson-databind-2.7.4.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jackson"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/mail/api/main/javax.mail-1.5.5.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/noStruts"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAdminController.java
===================================================================
diff -u -r46e01bf046d755f571ba59957ac869c086bad58c -re0dcf97659b72435ef0f29c69a4999847ae11d5b
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAdminController.java	(.../QaAdminController.java)	(revision 46e01bf046d755f571ba59957ac869c086bad58c)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAdminController.java	(.../QaAdminController.java)	(revision e0dcf97659b72435ef0f29c69a4999847ae11d5b)
@@ -348,7 +348,7 @@
 
 	// Now perform the import
 	try {
-	    String xml = new String(adminForm.getImportFile().getFileData());
+	    String xml = new String(adminForm.getImportFile().getBytes());
 	    XStream conversionXml = new XStream(new SunUnsafeReflectionProvider());
 	    conversionXml.addPermission(AnyTypePermission.ANY);
 	    SortedSet<QaWizardCategory> exportCategories = (SortedSet<QaWizardCategory>) conversionXml.fromXML(xml);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringConditionController.java
===================================================================
diff -u -r95793dfa0f05d3568c66c2718a88c73cf9141ae3 -re0dcf97659b72435ef0f29c69a4999847ae11d5b
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringConditionController.java	(.../QaAuthoringConditionController.java)	(revision 95793dfa0f05d3568c66c2718a88c73cf9141ae3)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringConditionController.java	(.../QaAuthoringConditionController.java)	(revision e0dcf97659b72435ef0f29c69a4999847ae11d5b)
@@ -35,7 +35,6 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
-import org.apache.struts.action.ActionForm;
 import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator;
 import org.lamsfoundation.lams.tool.qa.QaAppConstants;
 import org.lamsfoundation.lams.tool.qa.QaCondition;
@@ -52,7 +51,6 @@
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 
 /**
  * Auxiliary action in author mode. It contains operations with QaCondition. The
@@ -80,7 +78,8 @@
      * @return
      */
     @RequestMapping("/newConditionInit")
-    private String newConditionInit(@ModelAttribute("QaConditionForm") QaConditionForm QaConditionForm, HttpServletRequest request) {
+    private String newConditionInit(@ModelAttribute("QaConditionForm") QaConditionForm QaConditionForm,
+	    HttpServletRequest request) {
 
 	populateFormWithPossibleItems(QaConditionForm, request);
 	QaConditionForm.setOrderId(-1);
@@ -95,7 +94,8 @@
      * @return
      */
     @RequestMapping("/editCondition")
-    private String editCondition(@ModelAttribute("QaConditionForm")QaConditionForm QaConditionForm, HttpServletRequest request) {
+    private String editCondition(@ModelAttribute("QaConditionForm") QaConditionForm QaConditionForm,
+	    HttpServletRequest request) {
 
 	String sessionMapID = QaConditionForm.getSessionMapID();
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
@@ -128,7 +128,8 @@
      * @throws ServletException
      */
     @RequestMapping(value = "/saveOrUpdateCondition")
-    private String saveOrUpdateCondition(@ModelAttribute("QaConditionForm") QaConditionForm QaConditionForm, HttpServletRequest request) {
+    private String saveOrUpdateCondition(@ModelAttribute("QaConditionForm") QaConditionForm QaConditionForm,
+	    HttpServletRequest request) {
 
 	MultiValueMap<String, String> errorMap = validateQaCondition(QaConditionForm, request);
 
@@ -328,7 +329,8 @@
      * @param form
      * @param request
      */
-    private void populateFormWithPossibleItems(@ModelAttribute("QaConditionForm")QaConditionForm QaConditionForm, HttpServletRequest request) {
+    private void populateFormWithPossibleItems(@ModelAttribute("QaConditionForm") QaConditionForm QaConditionForm,
+	    HttpServletRequest request) {
 	// get back sessionMAP
 	String sessionMapID = QaConditionForm.getSessionMapID();
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaController.java
===================================================================
diff -u -r8be1632bead5d286d578fc73a79fcd662af012d5 -re0dcf97659b72435ef0f29c69a4999847ae11d5b
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaController.java	(.../QaController.java)	(revision 8be1632bead5d286d578fc73a79fcd662af012d5)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaController.java	(.../QaController.java)	(revision e0dcf97659b72435ef0f29c69a4999847ae11d5b)
@@ -39,7 +39,6 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
-import org.apache.struts.Globals;
 import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator;
 import org.lamsfoundation.lams.rating.model.RatingCriteria;
@@ -168,8 +167,9 @@
      * @param toolContentID
      * @return ActionForward
      */
-    protected QaContent prepareDTOandForm(HttpServletRequest request,@ModelAttribute("authoringForm") QaAuthoringForm authoringForm,
-	    QaContent qaContent, IQaService qaService, SessionMap<String, Object> sessionMap) {
+    protected QaContent prepareDTOandForm(HttpServletRequest request,
+	    @ModelAttribute("authoringForm") QaAuthoringForm authoringForm, QaContent qaContent, IQaService qaService,
+	    SessionMap<String, Object> sessionMap) {
 
 	authoringForm.setUsernameVisible(qaContent.isUsernameVisible() ? "1" : "0");
 	authoringForm.setAllowRateAnswers(qaContent.isAllowRateAnswers() ? "1" : "0");
@@ -237,7 +237,8 @@
      * @param mapping
      * @return ActionForward
      */
-    public boolean validateDefaultContent(HttpServletRequest request,@ModelAttribute("authoringForm") QaAuthoringForm authoringForm) {
+    public boolean validateDefaultContent(HttpServletRequest request,
+	    @ModelAttribute("authoringForm") QaAuthoringForm authoringForm) {
 
 	/*
 	 * retrieve the default content id based on tool signature
@@ -284,7 +285,7 @@
      */
     public void persistError(HttpServletRequest request, String message) {
 	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
-	errorMap.add(Globals.ERROR_KEY, messageService.getMessage(message));
+	errorMap.add("GLOBAL", messageService.getMessage(message));
 	request.setAttribute("errorMap", errorMap);
     }
 
@@ -301,8 +302,8 @@
      * submits content into the tool database
      */
     @RequestMapping("/submitAllContent")
-    public String submitAllContent(@ModelAttribute("authoringForm") QaAuthoringForm authoringForm, HttpServletRequest request)
-	    throws IOException, ServletException {
+    public String submitAllContent(@ModelAttribute("authoringForm") QaAuthoringForm authoringForm,
+	    HttpServletRequest request) throws IOException, ServletException {
 
 	String httpSessionID = authoringForm.getHttpSessionID();
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
@@ -594,8 +595,8 @@
      * saveSingleQuestion
      */
     @RequestMapping("/saveSingleQuestion")
-    public String saveSingleQuestion(@ModelAttribute("newQuestionForm") QaAuthoringForm newQuestionForm, HttpServletRequest request)
-	    throws IOException, ServletException {
+    public String saveSingleQuestion(@ModelAttribute("newQuestionForm") QaAuthoringForm newQuestionForm,
+	    HttpServletRequest request) throws IOException, ServletException {
 
 	String httpSessionID = newQuestionForm.getHttpSessionID();
 
@@ -708,7 +709,7 @@
 	request.getSession().setAttribute(httpSessionID, sessionMap);
 	request.setAttribute(QaAppConstants.TOTAL_QUESTION_COUNT, new Integer(questionDTOs.size()));
 	request.setAttribute("authoringForm", newQuestionForm);
-	
+
 	return "authoring/AuthoringTabsHolder";
     }
 
@@ -786,8 +787,8 @@
      * opens up an new screen within the current page for adding a new question
      */
     @RequestMapping("/newQuestionBox")
-    public String newQuestionBox(@ModelAttribute("newQuestionForm") QaAuthoringForm newQuestionForm, HttpServletRequest request)
-	    throws IOException, ServletException {
+    public String newQuestionBox(@ModelAttribute("newQuestionForm") QaAuthoringForm newQuestionForm,
+	    HttpServletRequest request) throws IOException, ServletException {
 
 	String httpSessionID = newQuestionForm.getHttpSessionID();
 
@@ -829,8 +830,8 @@
      * opens up an new screen within the current page for editing a question
      */
     @RequestMapping("/newEditableQuestionBox")
-    public String newEditableQuestionBox(@ModelAttribute("newQuestionForm") QaAuthoringForm newQuestionForm, HttpServletRequest request)
-	    throws IOException, ServletException {
+    public String newEditableQuestionBox(@ModelAttribute("newQuestionForm") QaAuthoringForm newQuestionForm,
+	    HttpServletRequest request) throws IOException, ServletException {
 
 	String httpSessionID = newQuestionForm.getHttpSessionID();
 
@@ -892,8 +893,8 @@
      * removes a question from the questions map
      */
     @RequestMapping("/removeQuestion")
-    public String removeQuestion(@ModelAttribute("newQuestionForm") QaAuthoringForm newQuestionForm, HttpServletRequest request)
-	    throws IOException, ServletException {
+    public String removeQuestion(@ModelAttribute("newQuestionForm") QaAuthoringForm newQuestionForm,
+	    HttpServletRequest request) throws IOException, ServletException {
 
 	String httpSessionID = newQuestionForm.getHttpSessionID();
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
@@ -967,8 +968,8 @@
      * moves a question down in the list
      */
     @RequestMapping("/moveQuestionDown")
-    public String moveQuestionDown(@ModelAttribute("newQuestionForm") QaAuthoringForm newQuestionForm, HttpServletRequest request)
-	    throws IOException, ServletException {
+    public String moveQuestionDown(@ModelAttribute("newQuestionForm") QaAuthoringForm newQuestionForm,
+	    HttpServletRequest request) throws IOException, ServletException {
 
 	String httpSessionID = newQuestionForm.getHttpSessionID();
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
@@ -1020,8 +1021,8 @@
      * moves a question up in the list
      */
     @RequestMapping("/moveQuestionUp")
-    public String moveQuestionUp(@ModelAttribute("newQuestionForm") QaAuthoringForm newQuestionForm, HttpServletRequest request)
-	    throws IOException, ServletException {
+    public String moveQuestionUp(@ModelAttribute("newQuestionForm") QaAuthoringForm newQuestionForm,
+	    HttpServletRequest request) throws IOException, ServletException {
 
 	String httpSessionID = newQuestionForm.getHttpSessionID();
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
===================================================================
diff -u -r14949f3bb9736ad6386b56eca018dc1257cb36a1 -re0dcf97659b72435ef0f29c69a4999847ae11d5b
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java	(.../QaLearningController.java)	(revision 14949f3bb9736ad6386b56eca018dc1257cb36a1)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java	(.../QaLearningController.java)	(revision e0dcf97659b72435ef0f29c69a4999847ae11d5b)
@@ -40,7 +40,6 @@
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.struts.Globals;
 import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
@@ -416,7 +415,7 @@
 	long toolSessionId = 0;
 	if ((strToolSessionId == null) || (strToolSessionId.length() == 0)) {
 	    MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
-	    errorMap.add(Globals.ERROR_KEY, messageService.getMessage("error.toolSessionId.required"));
+	    errorMap.add("GLOBAL", messageService.getMessage("error.toolSessionId.required"));
 	    logger.error("error.toolSessionId.required");
 	    request.setAttribute("errorMap", errorMap);
 	    return;
@@ -880,7 +879,7 @@
 	storeSequentialAnswer(qaLearningForm, request, generalLearnerFlowDTO, true);
 
 	qaLearningForm.resetAll();
-	request.setAttribute("learningForm",qaLearningForm);
+	request.setAttribute("learningForm", qaLearningForm);
 	return "learning/AnswersContent";
     }
 
@@ -894,8 +893,8 @@
      * @param getNextQuestion
      * @return
      */
-    private Object[] storeSequentialAnswer(QaLearningForm qaLearningForm,
-	    HttpServletRequest request, GeneralLearnerFlowDTO generalLearnerFlowDTO, boolean getNextQuestion) {
+    private Object[] storeSequentialAnswer(QaLearningForm qaLearningForm, HttpServletRequest request,
+	    GeneralLearnerFlowDTO generalLearnerFlowDTO, boolean getNextQuestion) {
 	String httpSessionID = qaLearningForm.getHttpSessionID();
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(httpSessionID);
@@ -979,14 +978,13 @@
 	// if so, check if the answer is blank and generate an error if it is blank.
 	boolean isRequiredQuestionMissed = dto.isRequired() && isEmpty(newAnswer);
 	if (isRequiredQuestionMissed) {
-	    errorMap.add(Globals.ERROR_KEY,
-		    messageService.getMessage("error.required", new Object[] { questionIndex }));
+	    errorMap.add("GLOBAL", messageService.getMessage("error.required", new Object[] { questionIndex }));
 	}
 
 	boolean isMinWordsLimitReached = ValidationUtil.isMinWordsLimitReached(newAnswer, dto.getMinWordsLimit(),
 		Boolean.parseBoolean(generalLearnerFlowDTO.getAllowRichEditor()));
 	if (!isMinWordsLimitReached) {
-	    errorMap.add(Globals.ERROR_KEY, messageService.getMessage("label.minimum.number.words",
+	    errorMap.add("GLOBAL", messageService.getMessage("label.minimum.number.words",
 		    ": " + new Object[] { dto.getMinWordsLimit() }));
 	}
 
@@ -1109,8 +1107,9 @@
      * @throws ToolException
      */
     @RequestMapping("/submitReflection")
-    public String submitReflection(@ModelAttribute("qaLearningForm")QaLearningForm qaLearningForm, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException, ToolException {
+    public String submitReflection(@ModelAttribute("qaLearningForm") QaLearningForm qaLearningForm,
+	    HttpServletRequest request, HttpServletResponse response)
+	    throws IOException, ServletException, ToolException {
 
 	LearningUtil.saveFormRequestData(request, qaLearningForm);
 
@@ -1158,8 +1157,8 @@
      * @throws ToolException
      */
     @RequestMapping("/forwardtoReflection")
-    public String forwardtoReflection(@ModelAttribute("qaLearningForm")QaLearningForm qaLearningForm, HttpServletRequest request)
-	    throws IOException, ServletException, ToolException {
+    public String forwardtoReflection(@ModelAttribute("qaLearningForm") QaLearningForm qaLearningForm,
+	    HttpServletRequest request) throws IOException, ServletException, ToolException {
 
 	String httpSessionID = qaLearningForm.getHttpSessionID();
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java
===================================================================
diff -u -r7ea9b852e5fe8dc5688f983f162064d862f147de -re0dcf97659b72435ef0f29c69a4999847ae11d5b
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java	(.../QaMonitoringController.java)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java	(.../QaMonitoringController.java)	(revision e0dcf97659b72435ef0f29c69a4999847ae11d5b)
@@ -39,8 +39,6 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionMapping;
 import org.lamsfoundation.lams.rating.dto.ItemRatingDTO;
 import org.lamsfoundation.lams.rating.dto.RatingCommentDTO;
 import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria;
@@ -325,8 +323,7 @@
      * @return
      */
     @RequestMapping("/setShowOtherAnswersAfterDeadline")
-    public String setShowOtherAnswersAfterDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
+    public String setShowOtherAnswersAfterDeadline(HttpServletRequest request) {
 
 	Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	QaContent content = qaService.getQaContent(contentID);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaAdminForm.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re0dcf97659b72435ef0f29c69a4999847ae11d5b
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaAdminForm.java	(.../QaAdminForm.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaAdminForm.java	(.../QaAdminForm.java)	(revision e0dcf97659b72435ef0f29c69a4999847ae11d5b)
@@ -22,7 +22,7 @@
 
 package org.lamsfoundation.lams.tool.qa.web.form;
 
-import org.apache.struts.upload.FormFile;
+import org.springframework.web.multipart.MultipartFile;
 
 public class QaAdminForm {
 
@@ -36,7 +36,7 @@
     private String deleteCategoriesCSV;
     private String deleteSkillsCSV;
     private String deleteQuestionsCSV;
-    private FormFile importFile;
+    private MultipartFile importFile;
 
     public QaAdminForm() {
     }
@@ -85,11 +85,11 @@
 	this.deleteQuestionsCSV = deleteQuestionsCSV;
     }
 
-    public FormFile getImportFile() {
+    public MultipartFile getImportFile() {
 	return importFile;
     }
 
-    public void setImportFile(FormFile importFile) {
+    public void setImportFile(MultipartFile importFile) {
 	this.importFile = importFile;
     }
 }
Fisheye: Tag e0dcf97659b72435ef0f29c69a4999847ae11d5b refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/struts-config.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e0dcf97659b72435ef0f29c69a4999847ae11d5b refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/tlds/struts/struts-bean-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e0dcf97659b72435ef0f29c69a4999847ae11d5b refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/tlds/struts/struts-bean.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e0dcf97659b72435ef0f29c69a4999847ae11d5b refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/tlds/struts/struts-html-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e0dcf97659b72435ef0f29c69a4999847ae11d5b refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/tlds/struts/struts-html.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e0dcf97659b72435ef0f29c69a4999847ae11d5b refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/tlds/struts/struts-logic-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e0dcf97659b72435ef0f29c69a4999847ae11d5b refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/tlds/struts/struts-logic.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e0dcf97659b72435ef0f29c69a4999847ae11d5b refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/tlds/struts/struts-nested.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e0dcf97659b72435ef0f29c69a4999847ae11d5b refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/tlds/struts/struts-tiles-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e0dcf97659b72435ef0f29c69a4999847ae11d5b refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/tlds/struts/struts-tiles.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e0dcf97659b72435ef0f29c69a4999847ae11d5b refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/validation.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/web/WEB-INF/web.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re0dcf97659b72435ef0f29c69a4999847ae11d5b
--- lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision e0dcf97659b72435ef0f29c69a4999847ae11d5b)
@@ -141,46 +141,7 @@
 
 	<jsp-config>
 
-		<!-- ======================================================== -->
-		<!-- Struts Tag Library Descriptors -->
-		<!-- ======================================================== -->
-		<taglib>
-			<taglib-uri>tags-bean</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-bean.tld</taglib-location>
-		</taglib>
 
-		<taglib>
-			<taglib-uri>tags-html</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-html.tld</taglib-location>
-		</taglib>
-
-		<taglib>
-			<taglib-uri>tags-logic</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-logic.tld</taglib-location>
-		</taglib>
-
-		<taglib>
-			<taglib-uri>tags-tiles</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-tiles.tld</taglib-location>
-		</taglib>
-
-		<taglib>
-			<taglib-uri>tags-bean-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-bean-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-html-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-html-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-logic-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-logic-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-tiles-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-tiles-el.tld</taglib-location>
-		</taglib>
-
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
Index: lams_tool_laqa/web/learning/submissionDeadline.jsp
===================================================================
diff -u -r7ea9b852e5fe8dc5688f983f162064d862f147de -re0dcf97659b72435ef0f29c69a4999847ae11d5b
--- lams_tool_laqa/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
+++ lams_tool_laqa/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision e0dcf97659b72435ef0f29c69a4999847ae11d5b)
@@ -15,8 +15,8 @@
 			if (actionMethod == 'endLearning') {
 				document.getElementById("finishButton").disabled = true;
 			}
-			document.forms.form.action = actionMethod+".do";
-			document.forms.form.submit();
+			document.forms.qaLearningForm.action = actionMethod+".do";
+			document.forms.qaLearningForm.submit();
 		}
 
 		function submitMethod(actionMethod) {
@@ -32,11 +32,11 @@
 
 	<lams:Page type="learner" title="${generalLearnerFlowDTO.activityTitle}">
 
-		<form:form action="learning.do" method="POST" modelAttribute="form" id="form">
-			<form:hidden property="toolSessionID" />
-			<form:hidden property="userID" />
-			<form:hidden property="httpSessionID" />
-			<form:hidden property="totalQuestionCount" />
+		<form:form action="learning.do" method="POST" modelAttribute="qaLearningForm" id="qaLearningForm">
+			<form:hidden path="toolSessionID" />
+			<form:hidden path="userID" />
+			<form:hidden path="httpSessionID" />
+			<form:hidden path="totalQuestionCount" />
 
 
 			<lams:Alert type="danger" id="submission-deadline" close="false">