Index: lams_admin/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_admin/web/policies/policies.jsp
===================================================================
diff -u -ra65568cc36db07abf19550359c0db03a9561c964 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_admin/web/policies/policies.jsp	(.../policies.jsp)	(revision a65568cc36db07abf19550359c0db03a9561c964)
+++ lams_admin/web/policies/policies.jsp	(.../policies.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -22,7 +22,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+	<lams:JSImport src="includes/javascript/dialog.js" />
 	<script type="text/javascript">
 		$(window).on('load', function(){
 			//dialog displaying user consents given for the specified policy
Index: lams_admin/web/toolcontent/toolcontentlist.jsp
===================================================================
diff -u -r3a68c970297a965f73cc4bda061a05c69a2818de -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_admin/web/toolcontent/toolcontentlist.jsp	(.../toolcontentlist.jsp)	(revision 3a68c970297a965f73cc4bda061a05c69a2818de)
+++ lams_admin/web/toolcontent/toolcontentlist.jsp	(.../toolcontentlist.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -15,7 +15,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+	<lams:JSImport src="includes/javascript/dialog.js" />
 	
 	<script type="text/javascript">
 		function openToolGroups(){
Index: lams_central/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -r58e6f5ac35747334cb88141e4d3e6c5baf34473a -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 58e6f5ac35747334cb88141e4d3e6c5baf34473a)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -17,13 +17,13 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/learning-design-treeview.js" ></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>	
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringGeneral.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringActivity.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringDecoration.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringProperty.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringHandler.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringMenu.js"></script>
+	<lams:JSImport src="includes/javascript/dialog.js" />	
+	<lams:JSImport src="includes/javascript/authoring/authoringGeneral.js" />
+	<lams:JSImport src="includes/javascript/authoring/authoringActivity.js" />
+	<lams:JSImport src="includes/javascript/authoring/authoringDecoration.js" />
+	<lams:JSImport src="includes/javascript/authoring/authoringProperty.js" />
+	<lams:JSImport src="includes/javascript/authoring/authoringHandler.js" />
+	<lams:JSImport src="includes/javascript/authoring/authoringMenu.js" />
 	<script type="text/javascript">
 		var LAMS_URL = '<lams:LAMSURL/>',
 			LD_THUMBNAIL_URL_BASE = LAMS_URL + 'home/getLearningDesignThumbnail.do?ldId=',
Index: lams_central/web/lti/addLesson.jsp
===================================================================
diff -u -rf7be4ba0bcbfca19280812b0df58b3413d9c7a91 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_central/web/lti/addLesson.jsp	(.../addLesson.jsp)	(revision f7be4ba0bcbfca19280812b0df58b3413d9c7a91)
+++ lams_central/web/lti/addLesson.jsp	(.../addLesson.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -38,7 +38,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap-treeview.js" ></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/learning-design-treeview.js" ></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.dialogextend.js"></script>	
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+	<lams:JSImport src="includes/javascript/dialog.js" />
 	<script type="text/javascript">
     	var isSelected = false;
 		var tree;
Index: lams_central/web/main.jsp
===================================================================
diff -u -r296669b296ec5eb26514f5a4a7c5791253c677ef -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_central/web/main.jsp	(.../main.jsp)	(revision 296669b296ec5eb26514f5a4a7c5791253c677ef)
+++ lams_central/web/main.jsp	(.../main.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -24,7 +24,7 @@
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-pager.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-widgets.js"></script> 	
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.dialogextend.js"></script>	
-	<script type="text/javascript" src="${lams}includes/javascript/dialog.js"></script>
+	<lams:JSImport src="includes/javascript/dialog.js" />
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap-tourist.min.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.ui.touch-punch.js"></script>
Index: lams_central/web/orgGroup.jsp
===================================================================
diff -u -r1f36b35778786b60680405e0c313ccb507af5f4a -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_central/web/orgGroup.jsp	(.../orgGroup.jsp)	(revision 1f36b35778786b60680405e0c313ccb507af5f4a)
+++ lams_central/web/orgGroup.jsp	(.../orgGroup.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -18,7 +18,7 @@
 	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.cookie.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/dialog.js"></script>
+	<lams:JSImport src="includes/javascript/dialog.js" />
 	<script type="text/javascript" src="${lams}includes/javascript/orgGroup.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/portrait.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
Index: lams_central/web/orgGrouping.jsp
===================================================================
diff -u -r4c2d1f37b92435907ec4ce23cb635a7cd9e4161e -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_central/web/orgGrouping.jsp	(.../orgGrouping.jsp)	(revision 4c2d1f37b92435907ec4ce23cb635a7cd9e4161e)
+++ lams_central/web/orgGrouping.jsp	(.../orgGrouping.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -15,7 +15,7 @@
 	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/orgGrouping.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/dialog.js"></script>
+	<lams:JSImport src="includes/javascript/dialog.js" />
 	<script type="text/javascript">
 		var groupingActivityId = '${param.activityID}',
 			lessonMode = ${lessonMode},
Index: lams_central/web/outcome/outcomeEdit.jsp
===================================================================
diff -u -re6dc4db4137cfd6b07a4aa79711b9d12b39fb78e -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_central/web/outcome/outcomeEdit.jsp	(.../outcomeEdit.jsp)	(revision e6dc4db4137cfd6b07a4aa79711b9d12b39fb78e)
+++ lams_central/web/outcome/outcomeEdit.jsp	(.../outcomeEdit.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -11,7 +11,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/outcome.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+	<lams:JSImport src="includes/javascript/dialog.js" />
 	<script type="text/javascript">
 		<c:if test="${saved}">
 			var outcomesFrame = $('#dialogOutcome iframe', window.parent.document);
Index: lams_central/web/outcome/outcomeManage.jsp
===================================================================
diff -u -r1fea4f51dbeb914dd958a90845e02151b50bf982 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_central/web/outcome/outcomeManage.jsp	(.../outcomeManage.jsp)	(revision 1fea4f51dbeb914dd958a90845e02151b50bf982)
+++ lams_central/web/outcome/outcomeManage.jsp	(.../outcomeManage.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -12,7 +12,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/outcome.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.cookie.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+	<lams:JSImport src="includes/javascript/dialog.js" />
 	<script type="text/javascript">
 		var LAMS_URL = '<lams:LAMSURL/>',
 			
Index: lams_central/web/outcome/scaleEdit.jsp
===================================================================
diff -u -re6dc4db4137cfd6b07a4aa79711b9d12b39fb78e -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_central/web/outcome/scaleEdit.jsp	(.../scaleEdit.jsp)	(revision e6dc4db4137cfd6b07a4aa79711b9d12b39fb78e)
+++ lams_central/web/outcome/scaleEdit.jsp	(.../scaleEdit.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -11,7 +11,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/outcome.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+	<lams:JSImport src="includes/javascript/dialog.js" />
 	<script type="text/javascript">
 		<c:if test="${saved}">
 			var scalesFrame = $('#dialogOutcomeScale iframe', window.parent.document);
Index: lams_central/web/outcome/scaleManage.jsp
===================================================================
diff -u -re6dc4db4137cfd6b07a4aa79711b9d12b39fb78e -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_central/web/outcome/scaleManage.jsp	(.../scaleManage.jsp)	(revision e6dc4db4137cfd6b07a4aa79711b9d12b39fb78e)
+++ lams_central/web/outcome/scaleManage.jsp	(.../scaleManage.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -12,7 +12,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/outcome.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.cookie.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+	<lams:JSImport src="includes/javascript/dialog.js" />
 	<script type="text/javascript">
 		var LAMS_URL = '<lams:LAMSURL/>',
 			
Index: lams_gradebook/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_gradebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_gradebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_gradebook/web/gradebookCourseMonitor.jsp
===================================================================
diff -u -rac26a838efe95d62b8cdb2a44f59fd029feb5f5b -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_gradebook/web/gradebookCourseMonitor.jsp	(.../gradebookCourseMonitor.jsp)	(revision ac26a838efe95d62b8cdb2a44f59fd029feb5f5b)
+++ lams_gradebook/web/gradebookCourseMonitor.jsp	(.../gradebookCourseMonitor.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -14,7 +14,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/portrait.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.blockUI.js"></script>	
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.cookie.js"></script>
-	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/blockexportbutton.js"></script>
+	<lams:JSImport src="includes/javascript/blockexportbutton.js" relative="true" />
 	
 	<jsp:include page="includes/jsp/jqGridIncludes.jsp"></jsp:include>
 
Index: lams_learning/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_learning/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_learning/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_learning/web/kumalive/kumalive.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_learning/web/kumalive/kumalive.jsp	(.../kumalive.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_learning/web/kumalive/kumalive.jsp	(.../kumalive.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -52,7 +52,7 @@
 			};
 			
 	</script>
-	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/kumalive.js"></script>
+	<lams:JSImport src="includes/javascript/kumalive.js" relative="true" />
 </lams:head>
 <body>
 	<div id="initDiv">
Index: lams_learning/web/presenceChat.jsp
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_learning/web/presenceChat.jsp	(.../presenceChat.jsp)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_learning/web/presenceChat.jsp	(.../presenceChat.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -35,7 +35,7 @@
 							 tag  : "groupchat"
 							};
 	</script>
-	<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/presence.js"></script>
+	<lams:JSImport src="includes/javascript/presence.js" relative="true" />
 	<script type="text/javascript">
 		$(document).ready(function() {
 			resizeChat();
Index: lams_monitoring/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_monitoring/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_monitoring/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -reb459d1edd7a91f2bb5b1baf83bcaca05e4b4ea2 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision eb459d1edd7a91f2bb5b1baf83bcaca05e4b4ea2)
+++ lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -221,7 +221,7 @@
 			};
 	</script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
-	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/monitorLesson.js"></script>
+	<lams:JSImport src="includes/javascript/monitorLesson.js" relative="true" />
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.timepicker.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
@@ -231,7 +231,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.tabcontroller.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/bootstrap-tourist.min.js"></script> 
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+	<lams:JSImport src="includes/javascript/dialog.js" />
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/portrait.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/x-editable.js"></script>
 	<script type="text/javascript">
Index: lams_monitoring/web/tblmonitor/sequence.jsp
===================================================================
diff -u -r1cacada3b99a289e0a7fa6e887fd62285be99a81 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_monitoring/web/tblmonitor/sequence.jsp	(.../sequence.jsp)	(revision 1cacada3b99a289e0a7fa6e887fd62285be99a81)
+++ lams_monitoring/web/tblmonitor/sequence.jsp	(.../sequence.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -25,14 +25,14 @@
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/readmore.min.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL />includes/javascript/d3.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL />includes/javascript/chart.js"></script>
-<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/monitorLesson.js"></script>
+<lams:JSImport src="includes/javascript/monitorLesson.js" relative="true" />
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
 <script>
 
 </script>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.tabcontroller.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL />includes/javascript/bootstrap-tourist.min.js"></script> 
-<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+<lams:JSImport src="includes/javascript/dialog.js" />
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/portrait.js"></script>
 <script>
 	//avoid name clash between bootstrap and jQuery UI
Index: lams_tool_assessment/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r4f526e3455fe0ed91e6a838c833f1cd916844b98 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4f526e3455fe0ed91e6a838c833f1cd916844b98)
+++ lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_assessment/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -rdcb841b4b4a04f726fe9f4581e2864c243e18724 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision dcb841b4b4a04f726fe9f4581e2864c243e18724)
+++ lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -91,7 +91,7 @@
    		<script type="text/javascript" src="${lams}includes/javascript/d3.js"></script>
  		<script type="text/javascript" src="${lams}includes/javascript/chart.js"></script>
  		<script type="text/javascript" src="${lams}includes/javascript/chart.bundle.min.js"></script>
- 		<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/chart.js"></script>
+ 		<lams:JSImport src="includes/javascript/chart.js" relative="true" />
  		<script type="text/javascript" src="${lams}includes/javascript/jquery.cookie.js"></script>
 		<script type="text/javascript" src="${lams}includes/javascript/jquery.countdown.js"></script>
  		<script type="text/javascript" src="${lams}includes/javascript/download.js"></script>
Index: lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp
===================================================================
diff -u -r0d458a161ee50dd2db8283520b80b5cc559705bf -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp	(.../assessmentStudentChoices.jsp)	(revision 0d458a161ee50dd2db8283520b80b5cc559705bf)
+++ lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp	(.../assessmentStudentChoices.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -14,7 +14,7 @@
 <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
 <script src="<lams:LAMSURL/>includes/javascript/jquery.plugin.js"></script>
 <script src="<lams:LAMSURL/>includes/javascript/jquery.countdown.js"></script>
-<script src="<lams:WebAppURL />includes/javascript/chart.js"></script>
+<lams:JSImport src="includes/javascript/chart.js" relative="true" />
 	
 <script>
 	var WEB_APP_URL = '<lams:WebAppURL />',
Index: lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
===================================================================
diff -u -r0d458a161ee50dd2db8283520b80b5cc559705bf -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp	(.../iraAssessmentStudentChoices.jsp)	(revision 0d458a161ee50dd2db8283520b80b5cc559705bf)
+++ lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp	(.../iraAssessmentStudentChoices.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -10,7 +10,7 @@
 <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
 <script src="<lams:LAMSURL/>includes/javascript/jquery.plugin.js"></script>
 <script src="<lams:LAMSURL/>includes/javascript/jquery.countdown.js"></script>
-<script src="<lams:WebAppURL />includes/javascript/chart.js"></script>
+<lams:JSImport src="includes/javascript/chart.js" relative="true" />
 
 <script>	
 	var WEB_APP_URL = '<lams:WebAppURL />',
Index: lams_tool_chat/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_chat/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r1a6408137fed60838b5744155f0884381c37d2c0 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_chat/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
+++ lams_tool_chat/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -13,7 +13,7 @@
 		</title>
 		<link href="${tool}includes/css/chat.css" rel="stylesheet" type="text/css">
 		<lams:headItems />
-		<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/authoring.js"></script>
+		<lams:JSImport src="includes/javascript/authoring.js" relative="true" />
 	</lams:head>
 	
 	<body class="stripes" onload="init();">
Index: lams_tool_chat/web/pages/authoring/headItems.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_chat/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_chat/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -1,2 +1,2 @@
 <%@ include file="/common/taglibs.jsp"%>
-<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/authoring.js"></script>
+<lams:JSImport src="includes/javascript/authoring.js" relative="true" />
Index: lams_tool_chat/web/pages/learning/defineLater.jsp
===================================================================
diff -u -r0e2f12434841f2b6d2f6b98210b6543c59483c1e -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_chat/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 0e2f12434841f2b6d2f6b98210b6543c59483c1e)
+++ lams_tool_chat/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -20,7 +20,7 @@
 		var MODE = "${MODE}", TOOL_SESSION_ID = '${param.toolSessionID}', APP_URL = '<lams:WebAppURL />', LEARNING_ACTION = "<c:url value='learning/learning.do'/>", LAMS_URL = '<lams:LAMSURL/>';
 		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/portrait.js"></script>
-		<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/learning.js"></script>
+		<lams:JSImport src="includes/javascript/learning.js" relative="true" />
 		
 	</lams:head>
 	<body class="stripes">
Index: lams_tool_chat/web/pages/learning/learning.jsp
===================================================================
diff -u -r0e2f12434841f2b6d2f6b98210b6543c59483c1e -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_chat/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 0e2f12434841f2b6d2f6b98210b6543c59483c1e)
+++ lams_tool_chat/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -20,7 +20,7 @@
 		var MODE = "${MODE}", TOOL_SESSION_ID = '${param.toolSessionID}', APP_URL = '<lams:WebAppURL />', LEARNING_ACTION = "<c:url value='learning/learning.do'/>", LAMS_URL = '<lams:LAMSURL/>';
 		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/portrait.js"></script>
-		<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/learning.js"></script>
+		<lams:JSImport src="includes/javascript/learning.js" relative="true" />
 			
 	
 	</lams:head>
Index: lams_tool_chat/web/pages/learning/submissionDeadline.jsp
===================================================================
diff -u -r1395f246e4d712e6723dae1a9f9477c7ce87dd86 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_chat/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 1395f246e4d712e6723dae1a9f9477c7ce87dd86)
+++ lams_tool_chat/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -20,7 +20,7 @@
 		var MODE = "${MODE}", TOOL_SESSION_ID = '${param.toolSessionID}', APP_URL = '<lams:WebAppURL />', LEARNING_ACTION = "<c:url value='learning/learning.do'/>", LAMS_URL = '<lams:LAMSURL/>';
 		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/portrait.js"></script>
-		<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/learning.js"></script>
+		<lams:JSImport src="includes/javascript/learning.js" relative="true" />
 			
 		
 	</lams:head>
Index: lams_tool_daco/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_daco/web/common/header.jsp
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_daco/web/common/header.jsp	(.../header.jsp)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/common/header.jsp	(.../header.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -10,7 +10,7 @@
 
  	<!-- ********************  javascript ********************** -->
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/dacoCommon.js"></script>
+	<lams:JSImport src="includes/javascript/dacoCommon.js" relative="true" />
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>    
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>		
Index: lams_tool_daco/web/common/jqueryheader.jsp
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_daco/web/common/jqueryheader.jsp	(.../jqueryheader.jsp)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/common/jqueryheader.jsp	(.../jqueryheader.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -20,5 +20,5 @@
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>    
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>		
 	
-	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/dacoCommon.js"></script>
+	<lams:JSImport src="includes/javascript/dacoCommon.js" relative="true" />
 	
\ No newline at end of file
Index: lams_tool_daco/web/common/tabbedheader.jsp
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_daco/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -9,7 +9,7 @@
 
  	<!-- ********************  javascript ********************** -->
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/dacoCommon.js"></script>
+	<lams:JSImport src="includes/javascript/dacoCommon.js" relative="true" />
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>    
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>		
Index: lams_tool_daco/web/pages/authoring/basic.jsp
===================================================================
diff -u -r862a8e07b6ea55951a9047221ed0a86486b93b71 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_daco/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 862a8e07b6ea55951a9047221ed0a86486b93b71)
+++ lams_tool_daco/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -2,7 +2,7 @@
 <c:url var="showMessageURL" value='/authoring/newQuestion.do'>
 	<c:param name="sessionMapID" value="${authoringForm.sessionMapID}" />
 </c:url>
-	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/dacoAuthoring.js"></script>
+	<lams:JSImport src="includes/javascript/dacoAuthoring.js" relative="true" />
 
 <script type="text/javascript">
 	//Showes the add/edit question area
Index: lams_tool_daco/web/pages/learning/learning.jsp
===================================================================
diff -u -r1a6408137fed60838b5744155f0884381c37d2c0 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_daco/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
+++ lams_tool_daco/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -56,7 +56,7 @@
 		var LABEL_NOT_ALLOWED_FORMAT = '<c:out value="${LABEL_NOT_ALLOWED_FORMAT_VAR}" />';	
 
     </script>
-    <script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/dacoLearning.js"></script>
+    <lams:JSImport src="includes/javascript/dacoLearning.js" relative="true" />
 </lams:head>
 
 
Index: lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp
===================================================================
diff -u -r37c404bc2d0032716112057bebc1314cbc30d102 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp	(.../listRecordsHorizontalPart.jsp)	(revision 37c404bc2d0032716112057bebc1314cbc30d102)
+++ lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp	(.../listRecordsHorizontalPart.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -30,7 +30,7 @@
 		var removeRecordUrl = "<lams:WebAppURL/>learning/removeRecord.do";
 		var recordListLength = "${fn:length(recordList)}";
 	</script>
-	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/dacoLearning.js"></script>
+	<lams:JSImport src="includes/javascript/dacoLearning.js" relative="true" />
 </lams:head>
 <body class="tabpart">
 	
Index: lams_tool_daco/web/pages/monitoring/listRecords.jsp
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_daco/web/pages/monitoring/listRecords.jsp	(.../listRecords.jsp)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/pages/monitoring/listRecords.jsp	(.../listRecords.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -19,7 +19,7 @@
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/prototype.js"></script>					
 		<%@ include file="/common/header.jsp"%>
 
-		<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/dacoMonitoring.js"></script>
+		<lams:JSImport src="includes/javascript/dacoMonitoring.js" relative="true" />
 		<script type="text/javascript">
 			function checkCheckbox(checkboxName){
 				var checkbox = document.getElementById(checkboxName);
Index: lams_tool_daco/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r1a6408137fed60838b5744155f0884381c37d2c0 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_daco/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
+++ lams_tool_daco/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -16,7 +16,7 @@
 			var gStatisticsUrl = "${statisticsUrl}"; // used by the tab functions
 			var gRefreshUrl = "${refreshSummaryUrl}"; // used by the tab functions
 		</script>
-		<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/dacoMonitoring.js"></script> 
+		<lams:JSImport src="includes/javascript/dacoMonitoring.js" relative="true" /> 
 		
 		<title><fmt:message key="title.monitoring" /></title>
 
Index: lams_tool_doku/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_doku/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_tool_doku/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_forum/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_forum/web/jsps/learning/edit.jsp
===================================================================
diff -u -r6132d98ee813109713fda3579007d4359596fc1e -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_forum/web/jsps/learning/edit.jsp	(.../edit.jsp)	(revision 6132d98ee813109713fda3579007d4359596fc1e)
+++ lams_tool_forum/web/jsps/learning/edit.jsp	(.../edit.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -67,7 +67,7 @@
 	</lams:head>
 	
 	<body class="stripes">
-		<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/message.js"></script>
+		<lams:JSImport src="includes/javascript/message.js" relative="true" />
 
 		<script type="text/javascript">
 			// The treetable code uses the clicks to expand and collapse the replies but then 
Index: lams_tool_forum/web/jsps/learning/reply.jsp
===================================================================
diff -u -r6132d98ee813109713fda3579007d4359596fc1e -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_forum/web/jsps/learning/reply.jsp	(.../reply.jsp)	(revision 6132d98ee813109713fda3579007d4359596fc1e)
+++ lams_tool_forum/web/jsps/learning/reply.jsp	(.../reply.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -68,7 +68,7 @@
 	</lams:head>
 	
 	<body class="stripes">
-		<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/message.js"></script>
+		<lams:JSImport src="includes/javascript/message.js" relative="true" />
 
 		<script type="text/javascript">
 			// The treetable code uses the clicks to expand and collapse the replies but then 
Index: lams_tool_gmap/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_gmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_tool_gmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_images/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_images/web/common/header.jsp
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_images/web/common/header.jsp	(.../header.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_images/web/common/header.jsp	(.../header.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -8,7 +8,7 @@
 
  <!-- ********************  javascript ********************** -->
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/imageGallerycommon.js"></script>
+<lams:JSImport src="includes/javascript/imageGallerycommon.js" relative="true" />
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
Index: lams_tool_images/web/common/tabbedheader.jsp
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_images/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_images/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -11,4 +11,4 @@
 <script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
-<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/imageGallerycommon.js"></script>
+<lams:JSImport src="includes/javascript/imageGallerycommon.js" relative="true" />
Index: lams_tool_images/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rbc66c534c18e8e49ce8ed510418400cbc56fd605 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_images/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision bc66c534c18e8e49ce8ed510418400cbc56fd605)
+++ lams_tool_images/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -25,7 +25,7 @@
 		var UPLOAD_ALLOWED_EXTENSIONS = JSON.parse("[" + "${ALLOWED_EXTENSIONS_IMAGE}".replace(/\.\w+/g, '"$&"') + "]");
 		var LABEL_ITEM_BLANK = '<fmt:message key="error.resource.item.file.blank"/>';
 	</script>
-	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/imageGalleryitem.js"></script>
+	<lams:JSImport src="includes/javascript/imageGalleryitem.js" relative="true" />
 	
 	<script type="text/javascript" src="${lams}includes/javascript/uppy/uppy.min.js"></script>
 	<c:choose>
Index: lams_tool_images/web/pages/authoring/basic.jsp
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_images/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_images/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -5,7 +5,7 @@
 <script type="text/javascript"> 
 	var pathToImageFolder = "<lams:WebAppURL/>includes/images/"; 
 </script>
-<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/lytebox.js" ></script>
+<lams:JSImport src="includes/javascript/lytebox.js" relative="true" />
 <script lang="javascript">
 
 	function hideMessage(){
Index: lams_tool_images/web/pages/learning/learning.jsp
===================================================================
diff -u -rbc66c534c18e8e49ce8ed510418400cbc56fd605 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision bc66c534c18e8e49ce8ed510418400cbc56fd605)
+++ lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -50,7 +50,7 @@
 		var UPLOAD_ALLOWED_EXTENSIONS = JSON.parse("[" + "${ALLOWED_EXTENSIONS_IMAGE}".replace(/\.\w+/g, '"$&"') + "]");
 		var LABEL_ITEM_BLANK = '<fmt:message key="error.resource.item.file.blank"/>';
 	</script>
-	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/imageGalleryitem.js"></script>
+	<lams:JSImport src="includes/javascript/imageGalleryitem.js" relative="true" />
 	
 	<script type="text/javascript" src="${lams}includes/javascript/uppy/uppy.min.js"></script>
 	<c:choose>
@@ -65,10 +65,10 @@
 		</c:when>
 	</c:choose>
 	
-	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/uploadImageLearning.js"></script>
+	<lams:JSImport src="includes/javascript/uploadImageLearning.js" relative="true" />
     <script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
  	<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
- 	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/fotorama.js"></script>
+ 	<lams:JSImport src="includes/javascript/fotorama.js" relative="true" />
 	<script type="text/javascript">
 	
 		$(document).ready(function(){ 
Index: lams_tool_images/web/pages/learning/parts/commentsarea.jsp
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -33,7 +33,7 @@
 	</script>
 	<script type="text/javascript" src="${lams}includes/javascript/rating.js"></script>
 </c:if>
-<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/uploadImageLearning.js"></script>
+<lams:JSImport src="includes/javascript/uploadImageLearning.js" relative="true" />
 <script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
 <script type="text/javascript">
 	$(document).ready(function(){
Index: lams_tool_images/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -rbc66c534c18e8e49ce8ed510418400cbc56fd605 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_images/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision bc66c534c18e8e49ce8ed510418400cbc56fd605)
+++ lams_tool_images/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -66,7 +66,7 @@
 			var UPLOAD_ALLOWED_EXTENSIONS = JSON.parse("[" + "${ALLOWED_EXTENSIONS_IMAGE}".replace(/\.\w+/g, '"$&"') + "]");
 			var LABEL_ITEM_BLANK = '<fmt:message key="error.resource.item.file.blank"/>';
 		</script>
-		<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/imageGalleryitem.js"></script>
+		<lams:JSImport src="includes/javascript/imageGalleryitem.js" relative="true" />
 		
 		<script type="text/javascript" src="${lams}includes/javascript/uppy/uppy.min.js"></script>
 		<c:choose>
@@ -81,7 +81,7 @@
 			</c:when>
 		</c:choose>
 	
-		<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/uploadImageLearning.js"></script>
+		<lams:JSImport src="includes/javascript/uploadImageLearning.js" relative="true" />
     	<script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
  		<script type="text/javascript" src="${lams}includes/javascript/thickbox.js"></script>
 		<script type="text/javascript" src="${lams}includes/javascript/monitorToolSummaryAdvanced.js" ></script>
Index: lams_tool_imscc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_imscc/web/common/header.jsp
===================================================================
diff -u -r1d6eef003bf303f75c5405b66a13ac86232cec03 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_imscc/web/common/header.jsp	(.../header.jsp)	(revision 1d6eef003bf303f75c5405b66a13ac86232cec03)
+++ lams_tool_imscc/web/common/header.jsp	(.../header.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -11,6 +11,6 @@
 <script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
-<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/commonCartridgecommon.js"></script>
+<lams:JSImport src="includes/javascript/commonCartridgecommon.js" relative="true" />
 
 	
Index: lams_tool_imscc/web/common/tabbedheader.jsp
===================================================================
diff -u -r1d6eef003bf303f75c5405b66a13ac86232cec03 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_imscc/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 1d6eef003bf303f75c5405b66a13ac86232cec03)
+++ lams_tool_imscc/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -11,6 +11,6 @@
 <script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
-<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/commonCartridgecommon.js"></script>
+<lams:JSImport src="includes/javascript/commonCartridgecommon.js" relative="true" />
 
 	
Index: lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp
===================================================================
diff -u -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp	(.../addbasiclti.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
+++ lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp	(.../addbasiclti.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -5,7 +5,7 @@
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
 		
-	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/commonCartridgeItem.js"></script>
+	<lams:JSImport src="includes/javascript/commonCartridgeItem.js" relative="true" />
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
 	<script type="text/javascript">
    		function formSubmit(){
Index: lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp
===================================================================
diff -u -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp	(.../addcommoncartridge.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
+++ lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp	(.../addcommoncartridge.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -11,7 +11,7 @@
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
 	<script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
-	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/commonCartridgeItem.js"></script>
+	<lams:JSImport src="includes/javascript/commonCartridgeItem.js" relative="true" />
 	
 	<script type="text/javascript">
 		function verifyAndSubmit() {
Index: lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp
===================================================================
diff -u -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp	(.../selectResources.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
+++ lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp	(.../selectResources.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -8,7 +8,7 @@
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
 
-	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/commonCartridgeItem.js"></script>
+	<lams:JSImport src="includes/javascript/commonCartridgeItem.js" relative="true" />
 	<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
 	<script type="text/javascript">
Index: lams_tool_lamc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_laqa/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_larsrc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp
===================================================================
diff -u -rbc66c534c18e8e49ce8ed510418400cbc56fd605 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision bc66c534c18e8e49ce8ed510418400cbc56fd605)
+++ lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -49,7 +49,7 @@
 			});
 
 		</script>
-		<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/rsrcresourceitem.js"></script>
+		<lams:JSImport src="includes/javascript/rsrcresourceitem.js" relative="true" />
 	</lams:head>
 	<body>
 
Index: lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp
===================================================================
diff -u -r80f23aae24a17df9dfcd1770f396aaba0d0650c3 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	(.../addlearningobject.jsp)	(revision 80f23aae24a17df9dfcd1770f396aaba0d0650c3)
+++ lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	(.../addlearningobject.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -48,7 +48,7 @@
 			    }
 			});	 		
 		</script>
-		<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/rsrcresourceitem.js"></script>
+		<lams:JSImport src="includes/javascript/rsrcresourceitem.js" relative="true" />
 
 	</lams:head>
 	<body>
Index: lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp
===================================================================
diff -u -r26661ca85899e95649257c3d5e59eb6b9841ad3c -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision 26661ca85899e95649257c3d5e59eb6b9841ad3c)
+++ lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -32,7 +32,7 @@
 			});
 
 		</script>
-		<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/rsrcresourceitem.js"></script>
+		<lams:JSImport src="includes/javascript/rsrcresourceitem.js" relative="true" />
 	</lams:head>
 	<body>
 
Index: lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp
===================================================================
diff -u -r80f23aae24a17df9dfcd1770f396aaba0d0650c3 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision 80f23aae24a17df9dfcd1770f396aaba0d0650c3)
+++ lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -55,7 +55,7 @@
 			    }
 			});
 		</script>
-		<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/rsrcresourceitem.js"></script>
+		<lams:JSImport src="includes/javascript/rsrcresourceitem.js" relative="true" />
 
 	</lams:head>
 	<body>
Index: lams_tool_leader/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_mindmap/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_nb/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_notebook/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_notebook/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r1a6408137fed60838b5744155f0884381c37d2c0 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_notebook/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
+++ lams_tool_notebook/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -5,7 +5,7 @@
 <lams:html>
 	<lams:head>
 		<lams:headItems/>
-		<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/authoring.js"></script>
+		<lams:JSImport src="includes/javascript/authoring.js" relative="true" />
 	</lams:head>
 	<body class="stripes">
 		<form:form action="/lams/tool/lantbk11/authoring/updateContent.do" modelAttribute="authoringForm" id="authoringForm" method="post">
Index: lams_tool_pixlr/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_preview/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_preview/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_tool_preview/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_preview/web/pages/learning/rankall.jsp
===================================================================
diff -u -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_preview/web/pages/learning/rankall.jsp	(.../rankall.jsp)	(revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
+++ lams_tool_preview/web/pages/learning/rankall.jsp	(.../rankall.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -1,5 +1,5 @@
 	<script type="text/javascript" src="${lams}includes/javascript/interact.min.js"></script>
-	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/ranking.js"></script>
+	<lams:JSImport src="includes/javascript/ranking.js" relative="true" />
 
 	<%-- Build up the divs now and the ordering, then include the divs in the body and trigger the ordering in document.ready --%>
 	<c:choose>
Index: lams_tool_preview/web/pages/learning/ranking.jsp
===================================================================
diff -u -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_preview/web/pages/learning/ranking.jsp	(.../ranking.jsp)	(revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
+++ lams_tool_preview/web/pages/learning/ranking.jsp	(.../ranking.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -1,5 +1,5 @@
 	<script type="text/javascript" src="${lams}includes/javascript/interact.min.js"></script>
-	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/ranking.js"></script>
+	<lams:JSImport src="includes/javascript/ranking.js" relative="true" />
 
 	<%-- Build up the divs now and the ordering, then include the divs in the body and trigger the ordering in document.ready --%>
 	<c:choose>
Index: lams_tool_sbmt/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_scratchie/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rca273b5530c1fead65c271da891dcdd3cb5709f7 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision ca273b5530c1fead65c271da891dcdd3cb5709f7)
+++ lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_scribe/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_spreadsheet/web/common/header.jsp
===================================================================
diff -u -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_spreadsheet/web/common/header.jsp	(.../header.jsp)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
+++ lams_tool_spreadsheet/web/common/header.jsp	(.../header.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -9,7 +9,7 @@
 
 <!-- ********************  javascript ********************** -->
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/spreadsheetcommon.js"></script>
+<lams:JSImport src="includes/javascript/spreadsheetcommon.js" relative="true" />
 <script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
Index: lams_tool_spreadsheet/web/common/tabbedheader.jsp
===================================================================
diff -u -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_spreadsheet/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
+++ lams_tool_spreadsheet/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -8,7 +8,7 @@
 
 <!-- ********************  javascript ********************** -->
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/spreadsheetcommon.js"></script>
+<lams:JSImport src="includes/javascript/spreadsheetcommon.js" relative="true" />
 <script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-widgets.js"></script>
Index: lams_tool_survey/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp
===================================================================
diff -u -r47c01513981c11359304562c8f9ba39a2f0c0ba5 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp	(.../addopenquestion.jsp)	(revision 47c01513981c11359304562c8f9ba39a2f0c0ba5)
+++ lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp	(.../addopenquestion.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -4,7 +4,7 @@
   		var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
      		var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
 </script>
-<script type="text/javascript" src="<lams:WebAppURL/>/includes/javascript/surveyitem.js"></script>
+<lams:JSImport src="includes/javascript/surveyitem.js" relative="true" />
 
 	<div class="panel panel-default add-file">
 		<div class="panel-heading panel-title">
Index: lams_tool_task/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_task/web/common/header.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_task/web/common/header.jsp	(.../header.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/common/header.jsp	(.../header.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -15,6 +15,6 @@
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.timeago.js"></script>    
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>   
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
-	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/taskListcommon.js"></script>
+	<lams:JSImport src="includes/javascript/taskListcommon.js" relative="true" />
 	<script type="text/javascript" src="${lams}includes/javascript/timeagoi18n/jquery.timeago.${fn:toLowerCase(localeLanguage)}.js"></script>
 	
Index: lams_tool_task/web/common/tabbedheader.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_task/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -12,6 +12,6 @@
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
-	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/taskListcommon.js"></script>
+	<lams:JSImport src="includes/javascript/taskListcommon.js" relative="true" />
 
 	
Index: lams_tool_vote/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_whiteboard/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r230d3d5e5abbbcf84aa40fb4b3eba4109716ca8c -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_whiteboard/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 230d3d5e5abbbcf84aa40fb4b3eba4109716ca8c)
+++ lams_tool_whiteboard/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_wiki/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_tool_wiki/web/pages/monitoring/headItems.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_wiki/web/pages/monitoring/headItems.jsp	(.../headItems.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_wiki/web/pages/monitoring/headItems.jsp	(.../headItems.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -12,7 +12,7 @@
 <script type="text/javascript" src="${tool}includes/javascript/monitoring.js">
 </script>
 
-<script type="text/javascript" src="<lams:WebAppURL />/includes/javascript/wikiCommon.js"></script>
+<lams:JSImport src="includes/javascript/wikiCommon.js" relative="true" />
 
 <script type="text/javascript">
 	$(document).ready(function() {$("time.timeago").timeago();});
Index: lams_tool_wiki/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r1a6408137fed60838b5744155f0884381c37d2c0 -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_wiki/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
+++ lams_tool_wiki/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -23,7 +23,7 @@
 		<script type="text/javascript" src="${tool}includes/javascript/monitoring.js">
 		</script>
 		
-		<script type="text/javascript" src="<lams:WebAppURL />/includes/javascript/wikiCommon.js"></script>
+		<lams:JSImport src="includes/javascript/wikiCommon.js" relative="true" />
 		
 		<script type="text/javascript">
 			$(document).ready(function() {$("time.timeago").timeago();});
Index: lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp
===================================================================
diff -u -rece365a86ee1455787d33619fd5c46cb53d73f7f -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp	(.../wikiDisplay.jsp)	(revision ece365a86ee1455787d33619fd5c46cb53d73f7f)
+++ lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp	(.../wikiDisplay.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -23,7 +23,7 @@
 		<script type="text/javascript" src="${tool}includes/javascript/monitoring.js">
 		</script>
 		
-		<script type="text/javascript" src="<lams:WebAppURL />/includes/javascript/wikiCommon.js"></script>
+		<lams:JSImport src="includes/javascript/wikiCommon.js" relative="true" />
 		
 		<script type="text/javascript">
 			$(document).ready(function() {$("time.timeago").timeago();});
Index: lams_tool_zoom/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_tool_zoom/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_tool_zoom/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
Index: lams_www/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06a1b71e208bdebf43003c989a1685a824f525bd -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2
--- lams_www/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06a1b71e208bdebf43003c989a1685a824f525bd)
+++ lams_www/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
@@ -59,7 +59,7 @@
 			// Adding bootstrap.js if it hasn't been loaded already
 			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
 		</script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+		<lams:JSImport src="includes/javascript/dialog.js" />
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>