diff --git a/ccm-gen-aplaws/bundles/devel/cfg/web.xml b/ccm-gen-aplaws/bundles/devel/cfg/web.xml
index 88f0ef4a5..e387a46c6 100755
--- a/ccm-gen-aplaws/bundles/devel/cfg/web.xml
+++ b/ccm-gen-aplaws/bundles/devel/cfg/web.xml
@@ -1,8 +1,8 @@
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-        "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
-
-<web-app>
+<?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">
 
   <display-name>OpenCCM</display-name> 
   <description>Community and Content Management</description>
diff --git a/ccm-gen-aplaws/bundles/develpb/cfg/project.xml b/ccm-gen-aplaws/bundles/develpb/cfg/project.xml
index 67845a274..71c0f4da0 100644
--- a/ccm-gen-aplaws/bundles/develpb/cfg/project.xml
+++ b/ccm-gen-aplaws/bundles/develpb/cfg/project.xml
@@ -87,7 +87,7 @@
 <!--    <ccm:application name="ccm-ldn-exporter"/>                   -->
 <!--    <ccm:application name="ccm-ldn-freeform"/>                   -->
 <!--    <ccm:application name="ccm-ldn-importer"/>                   -->
-        <ccm:application name="ccm-ldn-navigation"/>                 
+        <ccm:application name="ccm-ldn-navigation"/>
 <!--    <ccm:application name="ccm-ldn-rss"/>                        -->
         <ccm:application name="ccm-ldn-search"/>
         <ccm:application name="ccm-ldn-shortcuts"/>
diff --git a/ccm-gen-aplaws/bundles/develpb/cfg/web.xml b/ccm-gen-aplaws/bundles/develpb/cfg/web.xml
index cd35301a1..f206078bf 100644
--- a/ccm-gen-aplaws/bundles/develpb/cfg/web.xml
+++ b/ccm-gen-aplaws/bundles/develpb/cfg/web.xml
@@ -1,8 +1,8 @@
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-        "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
-
-<web-app>
+<?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">
 
   <display-name>OpenCCM</display-name> 
   <description>Community and Content Management</description>
diff --git a/ccm-gen-aplaws/bundles/handbook/cfg/web.xml b/ccm-gen-aplaws/bundles/handbook/cfg/web.xml
index 8221cf6f2..5f0b3d5e0 100755
--- a/ccm-gen-aplaws/bundles/handbook/cfg/web.xml
+++ b/ccm-gen-aplaws/bundles/handbook/cfg/web.xml
@@ -1,8 +1,8 @@
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-        "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
-
-<web-app>
+<?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">
 
   <filter>
     <filter-name>shortcuts</filter-name>
diff --git a/ccm-gen-aplaws/bundles/igb/cfg/web.xml b/ccm-gen-aplaws/bundles/igb/cfg/web.xml
index cd35301a1..f206078bf 100644
--- a/ccm-gen-aplaws/bundles/igb/cfg/web.xml
+++ b/ccm-gen-aplaws/bundles/igb/cfg/web.xml
@@ -1,8 +1,8 @@
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-        "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
-
-<web-app>
+<?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">
 
   <display-name>OpenCCM</display-name> 
   <description>Community and Content Management</description>
diff --git a/ccm-gen-aplaws/bundles/nsh/cfg/web.xml b/ccm-gen-aplaws/bundles/nsh/cfg/web.xml
index 53eb9b869..37764dde9 100755
--- a/ccm-gen-aplaws/bundles/nsh/cfg/web.xml
+++ b/ccm-gen-aplaws/bundles/nsh/cfg/web.xml
@@ -1,8 +1,8 @@
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-        "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
-
-<web-app>
+<?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">
 
   <display-name>OpenCCM</display-name> 
   <description>Community and Content Management</description>
diff --git a/ccm-gen-aplaws/bundles/staatsschiff/cfg/web.xml b/ccm-gen-aplaws/bundles/staatsschiff/cfg/web.xml
index 8221cf6f2..5f0b3d5e0 100755
--- a/ccm-gen-aplaws/bundles/staatsschiff/cfg/web.xml
+++ b/ccm-gen-aplaws/bundles/staatsschiff/cfg/web.xml
@@ -1,8 +1,8 @@
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-        "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
-
-<web-app>
+<?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">
 
   <filter>
     <filter-name>shortcuts</filter-name>
diff --git a/ccm-gen-aplaws/bundles/wsf/cfg/web.xml b/ccm-gen-aplaws/bundles/wsf/cfg/web.xml
index 8221cf6f2..5f0b3d5e0 100755
--- a/ccm-gen-aplaws/bundles/wsf/cfg/web.xml
+++ b/ccm-gen-aplaws/bundles/wsf/cfg/web.xml
@@ -1,8 +1,8 @@
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-        "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
-
-<web-app>
+<?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">
 
   <filter>
     <filter-name>shortcuts</filter-name>
diff --git a/ccm-gen-aplaws/bundles/zsr/cfg/web.xml b/ccm-gen-aplaws/bundles/zsr/cfg/web.xml
index 8221cf6f2..5f0b3d5e0 100644
--- a/ccm-gen-aplaws/bundles/zsr/cfg/web.xml
+++ b/ccm-gen-aplaws/bundles/zsr/cfg/web.xml
@@ -1,8 +1,8 @@
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-        "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
-
-<web-app>
+<?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">
 
   <filter>
     <filter-name>shortcuts</filter-name>
diff --git a/ccm-iaw-aplaws/bundles/devel/cfg/web.xml b/ccm-iaw-aplaws/bundles/devel/cfg/web.xml
index 4eabd72dd..aafa3183a 100644
--- a/ccm-iaw-aplaws/bundles/devel/cfg/web.xml
+++ b/ccm-iaw-aplaws/bundles/devel/cfg/web.xml
@@ -1,8 +1,8 @@
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-        "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
-
-<web-app>
+<?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">
 
   <display-name>CCM ZeS</display-name> 
   <description>Content and Collaboration Management</description>
diff --git a/ccm-iaw-aplaws/bundles/standard/cfg/web.xml b/ccm-iaw-aplaws/bundles/standard/cfg/web.xml
index 4eabd72dd..aafa3183a 100644
--- a/ccm-iaw-aplaws/bundles/standard/cfg/web.xml
+++ b/ccm-iaw-aplaws/bundles/standard/cfg/web.xml
@@ -1,8 +1,8 @@
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-        "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
-
-<web-app>
+<?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">
 
   <display-name>CCM ZeS</display-name> 
   <description>Content and Collaboration Management</description>
diff --git a/ccm-ldn-aplaws/bundles/custom/cfg/web.xml b/ccm-ldn-aplaws/bundles/custom/cfg/web.xml
index 2c7c01497..f2a9be5f2 100755
--- a/ccm-ldn-aplaws/bundles/custom/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/custom/cfg/web.xml
@@ -1,8 +1,8 @@
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-        "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
-
-<web-app>
+<?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">
 
   <display-name>CCM</display-name>
   <description>Content and Collaboration Management</description>
diff --git a/ccm-ldn-aplaws/bundles/demo/cfg/web.xml b/ccm-ldn-aplaws/bundles/demo/cfg/web.xml
index 29ff94b80..f01344d93 100755
--- a/ccm-ldn-aplaws/bundles/demo/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/demo/cfg/web.xml
@@ -1,8 +1,8 @@
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-        "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
-
-<web-app>
+<?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">
 
   <display-name>CCM</display-name>
   <description>Content and Collaboration Management</description>
diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/web.xml b/ccm-ldn-aplaws/bundles/devel/cfg/web.xml
index 2d3c7498a..7650112c3 100755
--- a/ccm-ldn-aplaws/bundles/devel/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/devel/cfg/web.xml
@@ -1,8 +1,8 @@
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-        "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
-
-<web-app>
+<?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">
 
   <display-name>CCM</display-name>
   <description>Content and Collaboration Management</description>
diff --git a/ccm-ldn-aplaws/bundles/extended/cfg/web.xml b/ccm-ldn-aplaws/bundles/extended/cfg/web.xml
index 2c7c01497..f2a9be5f2 100755
--- a/ccm-ldn-aplaws/bundles/extended/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/extended/cfg/web.xml
@@ -1,8 +1,8 @@
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-        "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
-
-<web-app>
+<?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">
 
   <display-name>CCM</display-name>
   <description>Content and Collaboration Management</description>
diff --git a/ccm-ldn-aplaws/bundles/standard/cfg/web.xml b/ccm-ldn-aplaws/bundles/standard/cfg/web.xml
index 2d3c7498a..7650112c3 100755
--- a/ccm-ldn-aplaws/bundles/standard/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/standard/cfg/web.xml
@@ -1,8 +1,8 @@
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-        "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
-
-<web-app>
+<?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">
 
   <display-name>CCM</display-name>
   <description>Content and Collaboration Management</description>
diff --git a/ccm-zes-aplaws/bundles/devel/cfg/web.xml b/ccm-zes-aplaws/bundles/devel/cfg/web.xml
index 0b7af1767..ff5d1eadf 100644
--- a/ccm-zes-aplaws/bundles/devel/cfg/web.xml
+++ b/ccm-zes-aplaws/bundles/devel/cfg/web.xml
@@ -1,8 +1,8 @@
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-        "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
-
-<web-app>
+<?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">
 
   <display-name>CCM ZeS</display-name> 
   <description>Content and Collaboration Management</description>
diff --git a/ccm-zes-aplaws/bundles/standard/cfg/web.xml b/ccm-zes-aplaws/bundles/standard/cfg/web.xml
index 8522be0ad..c59e56169 100644
--- a/ccm-zes-aplaws/bundles/standard/cfg/web.xml
+++ b/ccm-zes-aplaws/bundles/standard/cfg/web.xml
@@ -1,8 +1,8 @@
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-        "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
-
-<web-app>
+<?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">
 
   <display-name>CCM ZeS</display-name> 
   <description>Content and Collaboration Management</description>