Updated lesson content function, genral clean up of js

java/org/owasp/webgoat/lessons/ClientSideFiltering/ClientSideFiltering.java

@@ -51,7 +51,7 @@ public class ClientSideFiltering extends SequentialLessonAdapter
 		try
 		{
 
-			ec.addElement(new Script().setSrc("javascript/clientSideFiltering.js"));
+			ec.addElement(new Script().setSrc("lessonJS/clientSideFiltering.js"));
 
 			Input input = new Input(Input.HIDDEN, "userID", 102);
 

java/org/owasp/webgoat/lessons/ClientSideValidation.java

@@ -102,7 +102,7 @@ public class ClientSideValidation extends SequentialLessonAdapter
 		try
 		{
 
-			ec.addElement(new Script().setSrc("javascript/clientSideValidation.js"));
+			ec.addElement(new Script().setSrc("lessonJS/clientSideValidation.js"));
 
 			ec.addElement(new HR().setWidth("90%"));
 			ec.addElement(new Center().addElement(new H1().addElement("Shopping Cart")));
@@ -129,7 +129,7 @@ public class ClientSideValidation extends SequentialLessonAdapter
 		try
 		{
 
-			ec.addElement(new Script().setSrc("javascript/clientSideValidation.js"));
+			ec.addElement(new Script().setSrc("lessonJS/clientSideValidation.js"));
 
 			ec.addElement(new HR().setWidth("90%"));
 			ec.addElement(new Center().addElement(new H1().addElement("Shopping Cart")));
@@ -323,7 +323,7 @@ public class ClientSideValidation extends SequentialLessonAdapter
 
 		t.addElement(tr);
 		tr = new TR();
-		tr.addElement(new TD().addElement("Hewlett-Packard - Pavilion Notebook with Intel® Centrino™"));
+		tr.addElement(new TD().addElement("Hewlett-Packard - Pavilion Notebook with Intel<EFBFBD> Centrino<6E>"));
 
 		tr.addElement(new TD()
 				.addElement(

java/org/owasp/webgoat/lessons/DOMXSS.java

@@ -138,7 +138,7 @@ public class DOMXSS extends SequentialLessonAdapter
 		 * 
 		 * 1. If the DOMXSS.js file contains the lines "escapeHTML(name)"
 		 */
-		String file = s.getWebResource("javascript/DOMXSS.js");
+		String file = s.getWebResource("lessonJS/DOMXSS.js");
 		String content = getFileContent(file);
 
 		if (content.indexOf("escapeHTML(name)") != -1)
@@ -157,9 +157,9 @@ public class DOMXSS extends SequentialLessonAdapter
 		try
 		{
 
-			ec.addElement(new Script().setSrc("javascript/DOMXSS.js"));
+			ec.addElement(new Script().setSrc("lessonJS/DOMXSS.js"));
 
-			ec.addElement(new Script().setSrc("javascript/escape.js"));
+			ec.addElement(new Script().setSrc("lessonJS/escape.js"));
 
 			ec.addElement(new H1().setID("greeting"));
 

java/org/owasp/webgoat/lessons/DangerousEval.java

@@ -86,7 +86,7 @@ public class DangerousEval extends LessonAdapter
 			float runningTotal = 0.0f;
 
 			// FIXME: encode output of field2, then s.setMessage( field2 );
-			ec.addElement("<script src='javascript/eval.js'> </script>");
+			ec.addElement("<script src='lessonJS/eval.js'> </script>");
 			// <script src='javascript/sameOrigin.js' language='JavaScript'></script>
 			ec.addElement(new HR().setWidth("90%"));
 			ec.addElement(new Center().addElement(new H1().addElement("Shopping Cart ")));
@@ -123,7 +123,7 @@ public class DangerousEval extends LessonAdapter
 			tr.addElement(new TD().addElement("$" + total));
 			t.addElement(tr);
 			tr = new TR();
-			tr.addElement(new TD().addElement("Hewlett-Packard - Pavilion Notebook with Intel® Centrino™"));
+			tr.addElement(new TD().addElement("Hewlett-Packard - Pavilion Notebook with Intel<EFBFBD> Centrino<6E>"));
 			tr.addElement(new TD().addElement("1599.99").setAlign("right"));
 		    tr.addElement(new TD().addElement(new Input(Input.TEXT, "QTY3", s.getParser().getStringParameter("QTY3", "1"))).setAlign("right"));
 			quantity = s.getParser().getFloatParameter("QTY3", 0.0f);

java/org/owasp/webgoat/lessons/SameOriginPolicyProtection.java

@@ -38,7 +38,7 @@ public class SameOriginPolicyProtection extends LessonAdapter
 		try
 		{
 
-			ec.addElement(new Script().setSrc("javascript/sameOrigin.js"));
+			ec.addElement(new Script().setSrc("lessonJS/sameOrigin.js"));
 
 			Input hiddenWGStatus = new Input(Input.HIDDEN, "hiddenWGStatus", 0);
 			hiddenWGStatus.setID("hiddenWGStatus");

webapp/WEB-INF/pages/main_new.jsp

@@ -101,7 +101,7 @@
     
 
     <!--Global JS-->
-    <script src="js/jquery-1.10.2.min.js"></script>
+    <script src="js/jquery/jquery-1.10.2.min.js"></script>
     <script src="plugins/bootstrap/js/bootstrap.min.js"></script>
 <!--     <script src="plugins/waypoints/waypoints.min.js"></script> -->
 <!--     <script src="js/application.js"></script> -->