Index: lams_admin/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<display-name>LAMS</display-name>
 
Index: lams_bb_integration/WEB-INF/web.xml
===================================================================
diff -u -r54843a5ae3288a977cdfa75fd43afc9c67831624 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_bb_integration/WEB-INF/web.xml	(.../web.xml)	(revision 54843a5ae3288a977cdfa75fd43afc9c67831624)
+++ lams_bb_integration/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app  xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
-  <servlet>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+	version="3.1">
+<servlet>
     <servlet-name>ConfigServlet</servlet-name>
     <servlet-class>org.lamsfoundation.bb.integration.servlet.ConfigServlet</servlet-class>
   </servlet>
Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -rac26a838efe95d62b8cdb2a44f59fd029feb5f5b -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision ac26a838efe95d62b8cdb2a44f59fd029feb5f5b)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<context-param>
 		<param-name>javax.servlet.jsp.jstl.fmt.localizationContext
@@ -544,11 +544,6 @@
 	</error-page>
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
 
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
@@ -595,6 +590,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 
 	</jsp-config>
 
Index: lams_gradebook/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_gradebook/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_gradebook/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<display-name>LAMS</display-name>
 
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<context-param>
 		<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
Index: lams_monitoring/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_monitoring/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_monitoring/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<context-param>
 		<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
Index: lams_tool_assessment/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_assessment/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_assessment/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<display-name>Assessment</display-name>
 	<description>
Index: lams_tool_bbb/web/WEB-INF/web.xml
===================================================================
diff -u -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_bbb/web/WEB-INF/web.xml	(.../web.xml)	(revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45)
+++ lams_tool_bbb/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<display-name>BBB</display-name>
 	<description>
Index: lams_tool_chat/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_chat/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_chat/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<context-param>
 		<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
Index: lams_tool_daco/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_daco/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_daco/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<display-name>Shared Daco</display-name>
 	<description>
Index: lams_tool_dimdim/web/WEB-INF/web.xml
===================================================================
diff -u -r0916216ee07f1397c3b3528981b937b64dbbd940 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_dimdim/web/WEB-INF/web.xml	(.../web.xml)	(revision 0916216ee07f1397c3b3528981b937b64dbbd940)
+++ lams_tool_dimdim/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<display-name>Dimdim</display-name>
 	<description>
Index: lams_tool_doku/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_doku/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_doku/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<display-name>Dokumaran</display-name>
 	<description>
Index: lams_tool_eadventure/web/WEB-INF/web.xml
===================================================================
diff -u -r05ca07ef40c870800a42b5f700f667509cde1993 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_eadventure/web/WEB-INF/web.xml	(.../web.xml)	(revision 05ca07ef40c870800a42b5f700f667509cde1993)
+++ lams_tool_eadventure/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<display-name>Eadventure</display-name>
 	<description>
Index: lams_tool_forum/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<display-name>forum</display-name>
 	<description>
Index: lams_tool_gmap/web/WEB-INF/web.xml
===================================================================
diff -u -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_gmap/web/WEB-INF/web.xml	(.../web.xml)	(revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45)
+++ lams_tool_gmap/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<display-name>Gmap</display-name>
 	<description>
Index: lams_tool_images/web/WEB-INF/web.xml
===================================================================
diff -u -re84a43d66e9aca783200c5293ac36906bbd907cd -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_images/web/WEB-INF/web.xml	(.../web.xml)	(revision e84a43d66e9aca783200c5293ac36906bbd907cd)
+++ lams_tool_images/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<display-name>Image Gallery</display-name>
 	<description>
Index: lams_tool_imscc/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_imscc/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_imscc/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<display-name>Shared CommonCartridge</display-name>
 	<description>
Index: lams_tool_kaltura/web/WEB-INF/web.xml
===================================================================
diff -u -rb1d90cebfaf11f221fd5f7c81008507b8f146842 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_kaltura/web/WEB-INF/web.xml	(.../web.xml)	(revision b1d90cebfaf11f221fd5f7c81008507b8f146842)
+++ lams_tool_kaltura/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	
 	<display-name>Kaltura</display-name>
Index: lams_tool_lamc/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<context-param>
 		<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
Index: lams_tool_laqa/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 
 	<context-param>
Index: lams_tool_larsrc/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_larsrc/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_larsrc/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<display-name>Shared Resources</display-name>
 	<description>
Index: lams_tool_leader/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_leader/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_leader/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
-
+	
 	<context-param>
 		<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
 		<param-value>org.lamsfoundation.lams.tool.leaderselection.ApplicationResources</param-value>
Index: lams_tool_mindmap/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_mindmap/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_mindmap/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 
 	<context-param>
Index: lams_tool_notebook/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_notebook/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_notebook/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 
 
Index: lams_tool_pixlr/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_pixlr/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_pixlr/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<context-param>
 		<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
Index: lams_tool_preview/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_preview/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_preview/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<display-name>Peer Review</display-name>
 	<description>
Index: lams_tool_sbmt/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<display-name>LAMS</display-name>
 
Index: lams_tool_scratchie/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_scratchie/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_scratchie/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<display-name>Shared Scratchie</display-name>
 	<description>
Index: lams_tool_scribe/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_scribe/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_scribe/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<context-param>
 		<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
Index: lams_tool_spreadsheet/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_spreadsheet/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_spreadsheet/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<display-name>Shared Spreadsheet</display-name>
 	<description>
Index: lams_tool_survey/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_survey/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_survey/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<display-name>Shared Surveys</display-name>
 	<description>
Index: lams_tool_task/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_task/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_task/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<display-name>Shared TaskList</display-name>
 	<description>
Index: lams_tool_videorecorder/web/WEB-INF/web.xml
===================================================================
diff -u -r2d2c869032858b474398c651f8c45371410ba0d2 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_videorecorder/web/WEB-INF/web.xml	(.../web.xml)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
+++ lams_tool_videorecorder/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	
 	<display-name>Video Recorder</display-name>
Index: lams_tool_vote/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<!-- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) This 
 		program is free software; you can redistribute it and/or modify it under 
Index: lams_tool_wiki/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_wiki/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_wiki/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<context-param>
 		<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
Index: lams_tool_wookie/web/WEB-INF/web.xml
===================================================================
diff -u -rec39d1ee6a4b7b3a709058eb39777c872e1b5c97 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_wookie/web/WEB-INF/web.xml	(.../web.xml)	(revision ec39d1ee6a4b7b3a709058eb39777c872e1b5c97)
+++ lams_tool_wookie/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	
 	<display-name>Wookie</display-name>
Index: lams_tool_zoom/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_tool_zoom/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_zoom/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	<!-- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) This 
 		program is free software; you can redistribute it and/or modify it under 
Index: lams_www/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rbf7188dd95898df53f786a38b116214d005c8fb2
--- lams_www/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_www/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 
 	<context-param>