Index: lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r955ea2e56ab29f6953d79efbddb1b8406a57aa05
--- lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 955ea2e56ab29f6953d79efbddb1b8406a57aa05)
@@ -90,7 +90,7 @@
     	}
     }
     function doCancel() {
-    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+    	if(confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='${cancelConfirmMsgKey}'/></spring:escapeBody>")){
     		closeWindow("cancel");
     	}
     }
Index: lams_tool_sbmt/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -rfa2b057ec9dda91bbe9fa54337c32c443f561cd1 -r955ea2e56ab29f6953d79efbddb1b8406a57aa05
--- lams_tool_sbmt/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision fa2b057ec9dda91bbe9fa54337c32c443f561cd1)
+++ lams_tool_sbmt/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 955ea2e56ab29f6953d79efbddb1b8406a57aa05)
@@ -148,8 +148,8 @@
 <script type="text/javascript">
 	var minimumWordsSpinnerArray  = new Array();
 	var maxOrderId;
-	var criteriaArrows = '<div class="arrow-up" title="<fmt:message key="${upLabel}"/>" />' + 
-	 					 '<div class="arrow-down" title="<fmt:message key="${downLabel}"/>" />';
+	var criteriaArrows = '<div class="arrow-up" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+	 					 '<div class="arrow-down" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />';
 	  
 	var newGroupId = -1; // groups existing in DB have ID > 0; new, unsaved ones have ID < 0
 	const MAX_RUBRICS_COLUMNS = 5;
@@ -255,7 +255,7 @@
 		if ( validate ) {
 			str += ' onchange="validateRatingLimits('+validate+','+orderId+');" '
 		} 
-		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><fmt:message key="${allLabel}"/></option>';
+		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><spring:escapeBody javaScriptEscape="true"><fmt:message key="${allLabel}"/></spring:escapeBody></option>';
 		if ( zeroDescription ) {
 			str += '<option value="0" '+ ( 0 == currentValue ? ' selected="selected"' : '' ) + '>'+zeroDescription+'</option>';
 		}
@@ -320,52 +320,52 @@
 		if ( style == 0 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateManadatorySpinner(orderId, '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateManadatorySpinner(orderId, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleComment}" />:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleComment}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, true);
 			
 		} else if ( style == 1 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${allowCommentsLabel}" /></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleStar}" /></spring:escapeBody>:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');
 				
 			activateSpinner(orderId, justifyOrComment);
 			
 		} else if ( style == 2 ) { 
-			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><fmt:message key="${rankLabel}"/></label>&nbsp;'
+			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${rankLabel}"/></spring:escapeBody></label>&nbsp;'
 			  + generateSelect('maxRating' + orderId, null, null, orderId, maxRating);
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleRanking}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
 			})).appendTo('#criterias-table-body');
 	
 		} else if ( style == 3) {
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' + inputField + hiddenInputs
-				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleHedging}" /></spring:escapeBody>:&nbsp;</div>' + inputField + hiddenInputs
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${hedgeRankLabel}"/></spring:escapeBody>&nbsp;</label>'
 			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
-				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+				 + generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${justifyLabel}"/></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit)
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, justifyOrComment);
@@ -417,7 +417,7 @@
 		// it deletes either whole criterion or a rubrics row (which is also a criterion)
 		row.append($('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times delete-criteria" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times delete-criteria" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		}));
 	}
 
@@ -433,7 +433,7 @@
 		var cell = $('<td />', {
 			'class': 'criteria-info',
 			// arrows to move whole rubrics table
-		    html: '<div class="voffset5"><fmt:message key="label.rating.style.rubrics" />:<div class="pull-right">' + criteriaArrows + '</div></div>'
+		    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.style.rubrics" /></spring:escapeBody>:<div class="pull-right">' + criteriaArrows + '</div></div>'
 		}).attr('colspan', '3').appendTo(row);
 
 		var rubricsTable = $("<table />").addClass('table-striped table-condensed rubrics-table').attr('groupId', groupId).appendTo(cell)
@@ -443,7 +443,7 @@
 				$(this).closest('tr').find('textarea').height(height);
 			}),
 			addColumnButton = $('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 rubrics-add-column-button')
-										   	 .text('<fmt:message key="label.rating.rubrics.column.add" />').click(function(){
+										   	 .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.add" /></spring:escapeBody>').click(function(){
 						var columns = $('.rubrics-columns-part .rubrics-column', rubricsTable);
 						// no more than X columns allowed
 						if (columns.length >= MAX_RUBRICS_COLUMNS) {
@@ -457,7 +457,7 @@
 
 						// add delete button
 						$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-								  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+								  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 							deleteRubricsColumn($(this));
 						});
 
@@ -489,7 +489,7 @@
 		}
 		
 		$('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 roffset10')
-					   .text('<fmt:message key="label.rating.rubrics.row.add" />').click(function(){
+					   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.add" /></spring:escapeBody>').click(function(){
 			// this will add a row to the existing rubrics table with the given group ID
 			maxOrderId++;
 			$("#criteria-max-order-id").val(maxOrderId);
@@ -503,7 +503,7 @@
 		row.append('<th />');
 
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.headers" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.headers" /></spring:escapeBody>')
 				   .appendTo(row);
 		// empty cell for action buttons
 		$('<th />').attr('colspan', 2).appendTo(row);
@@ -516,7 +516,7 @@
 		for (var i = 0; i < rubricsColumnsLength; i++) {
 			cell = $('<td />').appendTo(row);
 			$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-					  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+					  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 				deleteRubricsColumn($(this));
 			});
 			
@@ -528,9 +528,9 @@
 
 		// description of the rows part
 		row = $('<tr />').addClass('rubrics-rows-part').appendTo(rubricsTable);
-		$('<th />').addClass('rubrics-row-title').text('<fmt:message key="label.rating.rubrics.row.headers" />').appendTo(row);
+		$('<th />').addClass('rubrics-row-title').text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.headers" /></spring:escapeBody>').appendTo(row);
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.content" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.content" /></spring:escapeBody>')
 				   .appendTo(row);
 		$('<td />').attr('colspan', 2).appendTo(row);
 
@@ -624,7 +624,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_tool_sbmt/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r500f37cffc230632ac8b906e91bcddd44836a814 -r955ea2e56ab29f6953d79efbddb1b8406a57aa05
--- lams_tool_sbmt/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 500f37cffc230632ac8b906e91bcddd44836a814)
+++ lams_tool_sbmt/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 955ea2e56ab29f6953d79efbddb1b8406a57aa05)
@@ -132,12 +132,12 @@
 		    		
 		})).append(jQuery('<td/>', {
 			width: '40px',
-			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
-		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />'
 		    		
 		})).append(jQuery('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		})).appendTo('#criterias-table');
 		
 		reactivateArrows();
@@ -257,7 +257,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r006c6b1060de8f84a95f80940553251f22e7a60a -r955ea2e56ab29f6953d79efbddb1b8406a57aa05
--- lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 006c6b1060de8f84a95f80940553251f22e7a60a)
+++ lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 955ea2e56ab29f6953d79efbddb1b8406a57aa05)
@@ -11,6 +11,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="csrfguard" prefix="csrf" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
@@ -53,10 +54,10 @@
 		outcomeMappingIds${outcomeTagId} = [],
 		outcomeAddEnabled = true,
 		
-		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeExistingNoneLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.existing.none" /></spring:escapeBody>',
+		outcomeCreateNewLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.create.new" /></spring:escapeBody>',
 		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
-		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
+		outcomeMappingRemoveConfirm = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.remove.confirm" /></spring:escapeBody>';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
Index: lams_tool_sbmt/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r955ea2e56ab29f6953d79efbddb1b8406a57aa05
--- lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 955ea2e56ab29f6953d79efbddb1b8406a57aa05)
@@ -186,7 +186,7 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
Index: lams_tool_sbmt/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r955ea2e56ab29f6953d79efbddb1b8406a57aa05
--- lams_tool_sbmt/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_sbmt/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 955ea2e56ab29f6953d79efbddb1b8406a57aa05)
@@ -188,7 +188,7 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
Index: lams_tool_sbmt/web/common/taglibs.jsp
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -r955ea2e56ab29f6953d79efbddb1b8406a57aa05
--- lams_tool_sbmt/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_sbmt/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 955ea2e56ab29f6953d79efbddb1b8406a57aa05)
@@ -5,6 +5,7 @@
 <%@ taglib uri="tags-xml" prefix="x" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 
 
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -rca136be52df70bbdd506d2383d4d4bd2201a3b3f -r955ea2e56ab29f6953d79efbddb1b8406a57aa05
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision ca136be52df70bbdd506d2383d4d4bd2201a3b3f)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 955ea2e56ab29f6953d79efbddb1b8406a57aa05)
@@ -44,9 +44,7 @@
 			UPLOAD_FILE_MAX_SIZE = '<c:out value="${UPLOAD_FILE_MAX_SIZE}"/>',
 			// convert Java syntax to JSON
 	       EXE_FILE_TYPES = JSON.parse("[" + "${EXE_FILE_TYPES}".replace(/\.\w+/g, '"$&"') + "]"),
-		   decoderDiv = $('<div />'),
-	       <fmt:message key="error.attachment.executable" var="EXE_FILE_ERROR_VAR" />
-	       EXE_FILE_ERROR = decoderDiv.html('<c:out value="${EXE_FILE_ERROR_VAR}" />').text();
+		   EXE_FILE_ERROR = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.attachment.executable" /></spring:escapeBody>';
 		
 		
 		$(document).ready(function() {
@@ -174,10 +172,10 @@
 			<c:if test="${sessionMap.minLimitUploadNumber != null}">
 				if (uploadedFilesNumber < ${sessionMap.minLimitUploadNumber}) {
 					if (${sessionMap.mode eq 'author'}) {
-						alert('<fmt:message key="label.should.upload.another"><fmt:param value="${sessionMap.minLimitUploadNumber}" /></fmt:message>' + 
-							  '\n<fmt:message key="label.min.limit.preview"/>');
+						alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.should.upload.another"><fmt:param value="${sessionMap.minLimitUploadNumber}" /></fmt:message></spring:escapeBody>' + 
+							  '\n<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.min.limit.preview"/></spring:escapeBody>');
 					} else {
-						alert('<fmt:message key="label.should.upload.another"><fmt:param value="${sessionMap.minLimitUploadNumber}" /></fmt:message>');
+						alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.should.upload.another"><fmt:param value="${sessionMap.minLimitUploadNumber}" /></fmt:message></spring:escapeBody>');
 						return false;
 					}
 				}
@@ -186,11 +184,11 @@
 			//let user confirm zero files upload
 			if (uploadedFilesNumber == 0) {
 				if (${sessionMap.lockOnFinish}) {
-					if (!confirm("<fmt:message key='learner.finish.without.upload'/>")) {
+					if (!confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='learner.finish.without.upload'/></spring:escapeBody>")) {
 						return false;
 					}
 				} else {
-					if (!confirm("<fmt:message key='messsage.learner.finish.confirm'/>")) {
+					if (!confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='messsage.learner.finish.confirm'/></spring:escapeBody>")) {
 						return false;
 					}
 				}
@@ -228,7 +226,7 @@
 			// check description
 			clearFileError("desc-error-msg");
 			if ( $('#description').val().trim().length == 0 ) {
-				var requiredMsg = '<fmt:message key="errors.required"><fmt:param><fmt:message key="label.learner.fileDescription"/></fmt:param></fmt:message>';
+				var requiredMsg = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="errors.required"><fmt:param><fmt:message key="label.learner.fileDescription"/></fmt:param></fmt:message></spring:escapeBody>';
 				showFileError(requiredMsg, "desc-error-msg");
 				valid = false;
 			}
@@ -252,7 +250,7 @@
 		}
 		
 		function deleteLearnerFile(detailId, filename) {
-			var msg = '<fmt:message key="message.monitor.confirm.original.learner.file.delete"/>';
+			var msg = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.monitor.confirm.original.learner.file.delete"/></spring:escapeBody>';
 			msg = msg.replace('{0}', filename);
 			var answer = confirm(msg);
 			if (answer) {	
Index: lams_tool_sbmt/web/monitoring/mark/allmarks.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r955ea2e56ab29f6953d79efbddb1b8406a57aa05
--- lams_tool_sbmt/web/monitoring/mark/allmarks.jsp	(.../allmarks.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_sbmt/web/monitoring/mark/allmarks.jsp	(.../allmarks.jsp)	(revision 955ea2e56ab29f6953d79efbddb1b8406a57aa05)
@@ -20,8 +20,8 @@
 	<script type="text/javascript" src="<c:url value="/"/>/includes/javascript/marks.js"></script>
 	<script type="text/javascript">
 		//constants for marks.js
-		var LABEL_DELETE = '<fmt:message key="message.monitor.confirm.original.learner.file.delete"/>';
-		var LABEL_RESTORE = '<fmt:message key="message.monitor.confirm.original.learner.file.restore"/>';
+		var LABEL_DELETE = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.monitor.confirm.original.learner.file.delete" /></spring:escapeBody>';
+		var LABEL_RESTORE = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.monitor.confirm.original.learner.file.restore" /></spring:escapeBody>';
 		var MONITOR_URL = "<c:url value="/monitoring"/>";
 
 		function updateMark(detailId,reportId,sessionId,userId){
Index: lams_tool_sbmt/web/monitoring/mark/mark.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r955ea2e56ab29f6953d79efbddb1b8406a57aa05
--- lams_tool_sbmt/web/monitoring/mark/mark.jsp	(.../mark.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_sbmt/web/monitoring/mark/mark.jsp	(.../mark.jsp)	(revision 955ea2e56ab29f6953d79efbddb1b8406a57aa05)
@@ -20,8 +20,8 @@
 	<script type="text/javascript" src="${tool}includes/javascript/marks.js"></script>
 	<script type="text/javascript">
 		//constants for marks.js
-		var LABEL_DELETE = '<fmt:message key="message.monitor.confirm.original.learner.file.delete"/>';
-		var LABEL_RESTORE = '<fmt:message key="message.monitor.confirm.original.learner.file.restore"/>';
+		var LABEL_DELETE = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.monitor.confirm.original.learner.file.delete" /></spring:escapeBody>';
+		var LABEL_RESTORE = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.monitor.confirm.original.learner.file.restore" /></spring:escapeBody>';
 		var MONITOR_URL = "<c:url value="/monitoring"/>";
 		
 		function updateMark(detailId,reportId,sessionId,userId){
Index: lams_tool_sbmt/web/monitoring/mark/updatemark.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r955ea2e56ab29f6953d79efbddb1b8406a57aa05
--- lams_tool_sbmt/web/monitoring/mark/updatemark.jsp	(.../updatemark.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_sbmt/web/monitoring/mark/updatemark.jsp	(.../updatemark.jsp)	(revision 955ea2e56ab29f6953d79efbddb1b8406a57aa05)
@@ -25,7 +25,7 @@
 	<lams:JSImport src="includes/javascript/upload.js" />
 	<script type="text/javascript">
 		function removeMarkFile() {
-			var answer = confirm("<fmt:message key="message.monitor.mark.confirmDeleteFile"/>");
+			var answer = confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='message.monitor.mark.confirmDeleteFile'/></spring:escapeBody>");
 			if (answer) {	
 				document.getElementById("method").value = "removeMarkFile";
 				document.getElementById("updateMarkForm").submit();
@@ -37,8 +37,8 @@
 			var files = fileSelect.files;
 			if (files.length > 0) {
 				var file = files[0];
-				if ( ! validateShowErrorNotExecutable(file, '<fmt:message key="error.attachment.executable"/>', false, '${EXE_FILE_TYPES}')
-						 || ! validateShowErrorFileSize(file, '${UPLOAD_FILE_MAX_SIZE}', '<fmt:message key="errors.maxfilesize"/>') ) {
+				if ( ! validateShowErrorNotExecutable(file, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.attachment.executable"/></spring:escapeBody>', false, '${EXE_FILE_TYPES}')
+						 || ! validateShowErrorFileSize(file, '${UPLOAD_FILE_MAX_SIZE}', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="errors.maxfilesize"/></spring:escapeBody>') ) {
 					return false;
 				}
 			}
Index: lams_tool_sbmt/web/monitoring/parts/summary.jsp
===================================================================
diff -u -r47dddf6db4afaba99d8f3f88fc50b16df9251a76 -r955ea2e56ab29f6953d79efbddb1b8406a57aa05
--- lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision 47dddf6db4afaba99d8f3f88fc50b16df9251a76)
+++ lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision 955ea2e56ab29f6953d79efbddb1b8406a57aa05)
@@ -19,9 +19,9 @@
 		submissionDateString: '${submissionDateString}',
 		setSubmissionDeadlineUrl: '<c:url value="/monitoring/setSubmissionDeadline.do"/>?<csrf:token/>',
 		toolContentID: '<c:out value="${param.toolContentID}" />',
-		messageNotification: '<fmt:message key="monitor.summary.notification" />',
-		messageRestrictionSet: '<fmt:message key="monitor.summary.date.restriction.set" />',
-		messageRestrictionRemoved: '<fmt:message key="monitor.summary.date.restriction.removed" />'
+		messageNotification: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="monitor.summary.notification" /></spring:escapeBody>',
+		messageRestrictionSet: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="monitor.summary.date.restriction.set" /></spring:escapeBody>',
+		messageRestrictionRemoved: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="monitor.summary.date.restriction.removed" /></spring:escapeBody>'
 	};
 </script>
 <script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
@@ -40,7 +40,7 @@
             	resizable: true,
             	// include column filters 
                 filter_columnFilters: true, 
-                filter_placeholder: { search : '<fmt:message key="label.search"/>' }, 
+                filter_placeholder: { search : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.search"/></spring:escapeBody>' }, 
                 filter_searchDelay: 700 
             }
 		});
@@ -71,11 +71,11 @@
 							
 							rows += '<td align="center">';
 							if ( userData["marked"] ) {
-								rows += '<fmt:message key="label.yes"/>';
+								rows += '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.yes"/></spring:escapeBody>';
 							} else {
-								rows += '<fmt:message key="label.no"/>';
+								rows += '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.no"/></spring:escapeBody>';
 							}
-							rows += ' [<a href=\"javascript:viewMark('+userId+','+$(table).attr("data-session-id")+');\"><fmt:message key="label.view.files" /></a>]';
+							rows += ' [<a href=\"javascript:viewMark('+userId+','+$(table).attr("data-session-id")+');\"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.view.files" /></spring:escapeBody></a>]';
 							rows += '</td>';
 
 							<c:if test="${reflectOn}">
@@ -152,7 +152,7 @@
 				reqID: (new Date()).getTime()
 			},
 			success: function(response) {
-				alert("<fmt:message key='label.monitoring.releaseMarks.notify.message'/>".replace('[0]', response));
+				alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.monitoring.releaseMarks.notify.message'/></spring:escapeBody>".replace('[0]', response));
 			}
 		});
 	}
@@ -176,15 +176,15 @@
     				'<csrf:tokenname/>' : '<csrf:tokenvalue/>'
     			},
     			success : function(){
-    				alert("<fmt:message key='label.monitoring.leader.successfully.changed'/>");
+    				alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.monitoring.leader.successfully.changed'/></spring:escapeBody>");
     			},
     			error : function(){
-    				alert("<fmt:message key='label.monitoring.leader.not.changed'/>");
+    				alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.monitoring.leader.not.changed'/></spring:escapeBody>");
         		}
             });
         	
 		} else {
-			alert("<fmt:message key='label.monitoring.leader.not.changed'/>");
+			alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.monitoring.leader.not.changed'/></spring:escapeBody>");
 		}
 	}
 </script>