Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/AuthoringController.java
===================================================================
diff -u -r085d47fc4191f2cb614a5a7c8fe3ff6c5abcef0f -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 085d47fc4191f2cb614a5a7c8fe3ff6c5abcef0f)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
@@ -111,7 +111,7 @@
 //		populateQuestionToForm(questionIndex, question, questionForm, request);
 //	    }
 //	}
-//	return findForward(question == null ? -1 : question.getType(), mapping);
+//	return findForward(question == null ? -1 : question.getType();
 //    }
 //
 //    /**
@@ -198,7 +198,7 @@
 //     * @param mapping
 //     * @return
 //     */
-//    protected ActionForward findForward(short type, ActionMapping mapping) {
+//    protected String findForward(short type) {
 //	ActionForward forward;
 //	switch (type) {
 //	    case DacoConstants.QUESTION_TYPE_TEXTFIELD:
Index: lams_tool_scratchie/.classpath
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f
--- lams_tool_scratchie/.classpath	(.../.classpath)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/.classpath	(.../.classpath)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_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="/lams_build/lib/hibernate/src/hibernate-src.zip">
 		<attributes>
 			<attribute name="javadoc_location" value="http://www.hibernate.org/hib_docs/v3/api/"/>
@@ -26,5 +25,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/websocket/api/main/jboss-websocket-api_1.1_spec-1.1.1.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/websocket"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/noStruts"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
===================================================================
diff -u -r22cca1a815f7aee530e14ab87b7744f381d03ac1 -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java	(.../LearningController.java)	(revision 22cca1a815f7aee530e14ab87b7744f381d03ac1)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java	(.../LearningController.java)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
@@ -232,7 +232,7 @@
 	    // show results page
 	} else if (isShowResults) {
 
-	    String redirectURL = "redirect:learning/showResults.do";
+	    String redirectURL = "redirect:showResults.do";
 	    redirectURL = WebUtil.appendParameterToURL(redirectURL, ScratchieConstants.ATTR_SESSION_MAP_ID,
 		    sessionMap.getSessionID());
 	    redirectURL = WebUtil.appendParameterToURL(redirectURL, AttributeNames.ATTR_MODE, mode.toString());
@@ -726,7 +726,7 @@
 	}
 	sessionMap.put(ScratchieConstants.ATTR_REFLECTION_ENTRY, entryText);
 
-	String redirectURL = "redirect:/learning/showResults.do";
+	String redirectURL = "redirect:showResults.do";
 	redirectURL = WebUtil.appendParameterToURL(redirectURL, ScratchieConstants.ATTR_SESSION_MAP_ID,
 		sessionMap.getSessionID());
 	return redirectURL;
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
===================================================================
diff -u -r22cca1a815f7aee530e14ab87b7744f381d03ac1 -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java	(.../TblMonitorController.java)	(revision 22cca1a815f7aee530e14ab87b7744f381d03ac1)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java	(.../TblMonitorController.java)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
@@ -41,8 +41,6 @@
 
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionMapping;
 import org.lamsfoundation.lams.tool.scratchie.ScratchieConstants;
 import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionDTO;
 import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionItemDTO;
@@ -192,8 +190,8 @@
      */
     @RequestMapping(value = "/isBurningQuestionsEnabled", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     @ResponseBody
-    public String isBurningQuestionsEnabled(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException {
+    public String isBurningQuestionsEnabled(HttpServletRequest request, HttpServletResponse response)
+	    throws IOException, ServletException {
 
 	long toolContentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	Scratchie scratchie = scratchieService.getScratchieByContentId(toolContentId);
Fisheye: Tag b18aa49cea9cab29bda065b37ee720bfa0a4ef6f refers to a dead (removed) revision in file `lams_tool_scratchie/web/WEB-INF/struts-config.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f
--- lams_tool_scratchie/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
@@ -32,7 +32,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -123,11 +122,11 @@
     }  				
 </script>	
 <div id="saveCancelButtons" >
-		<html:link href="javascript:doSubmit_Form_Only();" styleId="saveButton" property="submit" styleClass="btn btn-primary pull-right">
+		<a href="javascript:doSubmit_Form_Only();" id="saveButton" name="submit" class="btn btn-primary pull-right">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
-		</html:link>
-		<html:link href="javascript:;" property="cancel" styleId="cancelButton" onclick="javascript:doCancel()" styleClass="btn btn-default roffset5 pull-right">
+		</a>
+		<a href="javascript:;" nname="cancel" id="cancelButton" onclick="javascript:doCancel()" class="btn btn-default roffset5 pull-right">
 			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
-		</html:link>
+		</a>
 </div>
 <!-- end tab content -->
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f
--- lams_tool_scratchie/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_scratchie/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f
--- lams_tool_scratchie/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -284,42 +283,42 @@
 					<label for="minimum-rates">
 						<fmt:message key="${minimumLabel}" />
 					</label>
-					<html:select property="${formContentPrefix}minimumRates" styleId="minimum-rates" onmouseup="validateRatingLimits(true);" 
+					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" onmouseup="validateRatingLimits(true);" 
 							styleClass="form-control form-control-inline">
-						<html:option value="0">
+						<form:option value="0">
 							<fmt:message key="${noMinimumLabel}" />
-						</html:option>
-						<html:option value="1">1</html:option>
-						<html:option value="2">2</html:option>
-						<html:option value="3">3</html:option>
-						<html:option value="4">4</html:option>
-						<html:option value="5">5</html:option>
-						<html:option value="6">6</html:option>
-						<html:option value="7">7</html:option>
-						<html:option value="8">8</html:option>
-						<html:option value="9">9</html:option>
-						<html:option value="10">10</html:option>
-					</html:select>
+						</form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
+					</form:select>
 				
 					<label for="maximum-rates">
 						<fmt:message key="${maximumLabel}" />
 					</label>
-					<html:select property="${formContentPrefix}maximumRates" styleId="maximum-rates" onmouseup="validateRatingLimits(false);" 
+					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" onmouseup="validateRatingLimits(false);" 
 							styleClass="form-control form-control-inline">
-						<html:option value="0">
+						<form:option value="0">
 							<fmt:message key="${noMaximumLabel}" />
-						</html:option>
-						<html:option value="1">1</html:option>
-						<html:option value="2">2</html:option>
-						<html:option value="3">3</html:option>
-						<html:option value="4">4</html:option>
-						<html:option value="5">5</html:option>
-						<html:option value="6">6</html:option>
-						<html:option value="7">7</html:option>
-						<html:option value="8">8</html:option>
-						<html:option value="9">9</html:option>
-						<html:option value="10">10</html:option>
-					</html:select>
+						</form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
+					</form:select>
 				</div>
 			</c:if>
 	
Index: lams_tool_scratchie/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f
--- lams_tool_scratchie/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
@@ -1,5 +1,4 @@
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
@@ -42,23 +41,23 @@
 
 <div class="checkbox">
 	<label>
-	<html:checkbox property="${allowCommentsVariableName}" value="1"
-		styleId="${allowCommentsVariableName}">
-	</html:checkbox>
+	<form:checkbox path="${allowCommentsVariableName}" value="1"
+		id="${allowCommentsVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowCommentLabelKey}"/>
 	</label>
 </div>
 
 <div id="likedislike">
 <div class="loffset20">
-		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
-		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
+		<form:radiobutton path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<form:radiobutton path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
 <div class="checkbox">
 	<label>
-	<html:checkbox property="${allowAnonymousVariableName}" 
-		styleId="${allowAnonymousVariableName}">
-	</html:checkbox>
+	<form:checkbox path="${allowAnonymousVariableName}" 
+		id="${allowAnonymousVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_tool_scratchie/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r22cca1a815f7aee530e14ab87b7744f381d03ac1 -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f
--- lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 22cca1a815f7aee530e14ab87b7744f381d03ac1)
+++ lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
@@ -1,5 +1,5 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
@@ -138,12 +138,12 @@
 				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook/viewAll.do?lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -245,9 +245,8 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : LEARNING_URL + 'learner.do',
+						url : LEARNING_URL + 'learner/getLessonDetails.do',
 						data : {
-							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
 							'toolSessionID' : toolSessionId,
 						},
Index: lams_tool_scratchie/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f
--- lams_tool_scratchie/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_scratchie/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f
--- lams_tool_scratchie/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_scratchie/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f
--- lams_tool_scratchie/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
@@ -34,7 +34,6 @@
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
 
 <c:set var="class" value=""/>
 <c:if test="${id == 1}">
Index: lams_tool_scratchie/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f
--- lams_tool_scratchie/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
@@ -30,7 +30,6 @@
 
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
 
 <div class="panel-body panel-monitor-body">
 	 <jsp:doBody />
Fisheye: Tag b18aa49cea9cab29bda065b37ee720bfa0a4ef6f refers to a dead (removed) revision in file `lams_tool_scratchie/web/WEB-INF/tlds/struts/struts-bean.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b18aa49cea9cab29bda065b37ee720bfa0a4ef6f refers to a dead (removed) revision in file `lams_tool_scratchie/web/WEB-INF/tlds/struts/struts-html.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b18aa49cea9cab29bda065b37ee720bfa0a4ef6f refers to a dead (removed) revision in file `lams_tool_scratchie/web/WEB-INF/tlds/struts/struts-logic.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b18aa49cea9cab29bda065b37ee720bfa0a4ef6f refers to a dead (removed) revision in file `lams_tool_scratchie/web/WEB-INF/tlds/struts/struts-nested.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b18aa49cea9cab29bda065b37ee720bfa0a4ef6f refers to a dead (removed) revision in file `lams_tool_scratchie/web/WEB-INF/tlds/struts/struts-tiles.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b18aa49cea9cab29bda065b37ee720bfa0a4ef6f refers to a dead (removed) revision in file `lams_tool_scratchie/web/WEB-INF/validation.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/web/WEB-INF/web.xml
===================================================================
diff -u -r22cca1a815f7aee530e14ab87b7744f381d03ac1 -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f
--- lams_tool_scratchie/web/WEB-INF/web.xml	(.../web.xml)	(revision 22cca1a815f7aee530e14ab87b7744f381d03ac1)
+++ lams_tool_scratchie/web/WEB-INF/web.xml	(.../web.xml)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
@@ -140,25 +140,6 @@
 
 	<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>
-		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
 		<taglib>
Index: lams_tool_scratchie/web/common/header.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f
--- lams_tool_scratchie/web/common/header.jsp	(.../header.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/web/common/header.jsp	(.../header.jsp)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
@@ -5,7 +5,7 @@
 
 <!-- ********************  CSS ********************** -->
 <lams:css />
-<link href="<html:rewrite page='/includes/css/scratchie.css'/>" rel="stylesheet" type="text/css">
+<link href="<lams:WebAppURL/>includes/css/scratchie.css" rel="stylesheet" type="text/css">
 
 <!-- ********************  javascript ********************** -->
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
Index: lams_tool_scratchie/web/common/tabbedheader.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f
--- lams_tool_scratchie/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
@@ -4,7 +4,7 @@
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
 
 	<!-- ********************  CSS ********************** -->
-<link href="<html:rewrite page='/includes/css/scratchie.css'/>" rel="stylesheet" type="text/css">
+<link href="<lams:WebAppURL/>includes/css/scratchie.css" rel="stylesheet" type="text/css">
 <lams:css/>
 
 	<!-- ********************  javascript ********************** -->
Index: lams_tool_scratchie/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r085d47fc4191f2cb614a5a7c8fe3ff6c5abcef0f -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f
--- lams_tool_scratchie/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 085d47fc4191f2cb614a5a7c8fe3ff6c5abcef0f)
+++ lams_tool_scratchie/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
@@ -45,7 +45,7 @@
 		<form:hidden path="sessionMapID" />
 		<form:hidden path="contentFolderID" />
 		<form:hidden path="currentTab" id="currentTab" />
-		<form:hidden path="itemList" id="itemList" />
+		<input type="hidden" name="itemList" id="itemList" />
 	
 
 		<c:set var="title"><fmt:message key="activity.title" /></c:set>
Index: lams_tool_scratchie/web/pages/authoring/parts/additem.jsp
===================================================================
diff -u -r60b108064c4a844e3f153a849ab51a14bc3a8488 -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f
--- lams_tool_scratchie/web/pages/authoring/parts/additem.jsp	(.../additem.jsp)	(revision 60b108064c4a844e3f153a849ab51a14bc3a8488)
+++ lams_tool_scratchie/web/pages/authoring/parts/additem.jsp	(.../additem.jsp)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
@@ -222,7 +222,7 @@
 			
 			<form:form action="/lams/tool/lascrt11/authoring/saveItem.do" method="post" modelAttribute="scratchieItemForm" id="scratchieItemForm">
 				<form:hidden path="sessionMapID" />
-				<form:hidden path="answerList" id="answerList" />
+				<input type="hidden" name="answerList" id="answerList" />
 				<form:hidden path="itemIndex" />
 				<form:hidden path="contentFolderID" id="contentFolderID"/>
 	
Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
diff -u -r60b108064c4a844e3f153a849ab51a14bc3a8488 -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f
--- lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 60b108064c4a844e3f153a849ab51a14bc3a8488)
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
@@ -69,11 +69,11 @@
 	    			// show static image after animation
 	    			setTimeout(
 	    	    			function(){
-	    					image.attr("src", "<lams:WebAppURL/> includes/images/scratchie-" + imageSuffix + ".png");
+	    					image.attr("src", "<lams:WebAppURL/>includes/images/scratchie-" + imageSuffix + ".png");
 	    				}, 
 	    				1300
 	    			);
-	    		}).attr("src", "<lams:WebAppURL/> includes/images/scratchie-" + imageSuffix + "-animation.gif");
+	    		}).attr("src", "<lams:WebAppURL/>includes/images/scratchie-" + imageSuffix + "-animation.gif");
 		}
 
 		function scratchItem(itemUid, answerUid){
@@ -222,7 +222,7 @@
 				document.getElementById("finishButton").disabled = true;
 
 		        	var myForm = $('#burning-questions');
-		        	myForm.attr("action", '<c:url value="/learning.do?sessionMapID=${sessionMapID}"/>&date=' + new Date().getTime());
+		        	myForm.attr("action", '<lams:WebAppURL />learning/' + method + '.do?sessionMapID=${sessionMapID}&date=' + new Date().getTime());
 		        	myForm.submit();
 			}
 			
Index: lams_tool_scratchie/web/pages/learning/scratchies.jsp
===================================================================
diff -u -r7d11dff5efc5ae24542a53dd8f753bfab66be71d -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f
--- lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision 7d11dff5efc5ae24542a53dd8f753bfab66be71d)
+++ lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
@@ -12,21 +12,21 @@
 				<td style="width: 40px;">
 					<c:choose>
 						<c:when test="${answer.scratched && answer.correct}">
-							<img src="<lams:WebAppURL/> includes/images/scratchie-correct.png" class="scartchie-image"
+							<img src="<lams:WebAppURL/>includes/images/scratchie-correct.png" class="scartchie-image"
 								 id="image-${item.uid}-${answer.uid}">
 						</c:when>
 						<c:when test="${answer.scratched && !answer.correct}">
-							<img src="<lams:WebAppURL/> includes/images/scratchie-wrong.png" class="scartchie-image"
+							<img src="<lams:WebAppURL/>includes/images/scratchie-wrong.png" class="scartchie-image"
 								 id="image-${item.uid}-${answer.uid}">
 						</c:when>
 						<c:when test="${sessionMap.userFinished || item.unraveled || !isUserLeader || (mode == 'teacher') || showResults}">
-							<img src="<lams:WebAppURL/> includes/images/answer-${status.index + 1}.png" class="scartchie-image"
+							<img src="<lams:WebAppURL/>includes/images/answer-${status.index + 1}.png" class="scartchie-image"
 								 id="image-${item.uid}-${answer.uid}">
 						</c:when>
 						<c:otherwise>
 							<a href="#nogo" onclick="scratchItem(${item.uid}, ${answer.uid}); return false;"
 								id="imageLink-${item.uid}-${answer.uid}"> <img
-								src="<lams:WebAppURL/> includes/images/answer-${status.index + 1}.png" class="scartchie-image"
+								src="<lams:WebAppURL/>includes/images/answer-${status.index + 1}.png" class="scartchie-image"
 								id="image-${item.uid}-${answer.uid}" />
 							</a>
 						</c:otherwise>
Index: lams_tool_scratchie/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -r7d11dff5efc5ae24542a53dd8f753bfab66be71d -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f
--- lams_tool_scratchie/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 7d11dff5efc5ae24542a53dd8f753bfab66be71d)
+++ lams_tool_scratchie/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
@@ -28,7 +28,7 @@
 	</tr>
 </table>
 
-<c:url  var="authoringUrl" value="/definelater.do">
+<c:url  var="authoringUrl" value="../authoring/definelater.do">
 	<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
 	<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
 </c:url>