diff --git a/ccm-auth-http/.svnignore b/ccm-auth-http/.svnignore
deleted file mode 100755
index 378eac25d..000000000
--- a/ccm-auth-http/.svnignore
+++ /dev/null
@@ -1 +0,0 @@
-build
diff --git a/ccm-auth-http/README.txt b/ccm-auth-http/README.txt
deleted file mode 100755
index 07f97131d..000000000
--- a/ccm-auth-http/README.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-  Installing BouncyCastle
-  -----------------------
-  
-Add the following to 
-
-   $JAVA_HOME/jre/lib/security/java.security
-   
-security.provider.3=org.bouncycastle.jce.provider.BouncyCastleProvider
-
-
-Copy the files lib/*.jar to
- 
-   $JAVA_HOME/jre/lib/ext
-   
-   
diff --git a/ccm-auth-http/build.xml b/ccm-auth-http/build.xml
deleted file mode 100755
index d34eaad49..000000000
--- a/ccm-auth-http/build.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE project [
-    <!ENTITY projectProperties SYSTEM "project.xml">
-    <!ENTITY commonProperties SYSTEM "../properties.xml">
-    <!ENTITY commonTargets SYSTEM "../targets.xml">
-]>
-
-<!-- 
-Arsdigita Standards build.xml file for ANT: http://jakarta.apache.org/ant/ 
-Written by Bryan Quinn
-Copyright (c) 2001 ArsDigita Corporation.  All Rights Reserved.
--->
-
-<!--
-The project defines the system to be built.  The default attribute
-indicates which task is to be executed by default when ant is run.
-The basedir attribute indicates which directory the build process
-based in; this establishes relative paths.
--->
-<project name="content types" default="usage" basedir=".">
-
-
-  <property environment="env"/>
-
-  <property name="slash" value="${file.separator}"/>
-
-  <!--
-  local-specific properties
-  -->
-  <property name="app.name"                value="ntlm"/>
-  <property name="dependencies.dirs"       value="../util"/>
-  <property name="java.package.dir"        value="com/arsdigita/intranet/cms" />  
-
-  <!--
-  Project-specific targets
-  -->
-
-  <!-- 
-  Import all the project properties
-  -->
-  &projectProperties;
-
-  <!-- 
-  Import all the common properties
-  -->
-  &commonProperties;
-
-  <!-- 
-  Import all the common build targets
-  -->
-  &commonTargets;
-
-</project>
-
diff --git a/ccm-auth-http/project.xml b/ccm-auth-http/project.xml
deleted file mode 100755
index 08f4756ec..000000000
--- a/ccm-auth-http/project.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-  <path id="dependencies.class.path">
-    <pathelement path="../util/build/classes"/>
-  </path>
diff --git a/ccm-auth-http/web/WEB-INF/web.xml-auth-http.in b/ccm-auth-http/web/WEB-INF/web.ccm-auth-http.xml
old mode 100755
new mode 100644
similarity index 71%
rename from ccm-auth-http/web/WEB-INF/web.xml-auth-http.in
rename to ccm-auth-http/web/WEB-INF/web.ccm-auth-http.xml
index 785eaf03c..30eec55e3
--- a/ccm-auth-http/web/WEB-INF/web.xml-auth-http.in
+++ b/ccm-auth-http/web/WEB-INF/web.ccm-auth-http.xml
@@ -1,3 +1,5 @@
+<?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">
 
   <!-- module ccm-auth-http  -  servlet definitions BEGIN  -->
   <servlet>
@@ -17,3 +19,4 @@
   </servlet-mapping>
   <!-- module ccm-auth-http  -  servlet mappings END  -->
 
+</web-app>
diff --git a/ccm-core/web/WEB-INF/web.ccm-core.xml b/ccm-core/web/WEB-INF/web.ccm-core.xml
new file mode 100644
index 000000000..33f670d73
--- /dev/null
+++ b/ccm-core/web/WEB-INF/web.ccm-core.xml
@@ -0,0 +1,279 @@
+<?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">
+
+    <!--
+        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - basic web.xml for ccm-core and basic functions. If
+        additional modules provide specific web.xml snippets they must be integrated before CCM is ready to work. Alternatively a
+        complete web.xml file from an installation bundle may be used. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+        - - - - -
+    -->
+
+
+    <display-name>CCM</display-name>
+    <description>Content and Collaboration Management</description>
+
+    <!--
+        path and filename of the log4j user accessible config file WEB-INF/conf/log4j.properties is the built-in default value
+    -->
+    <context-param>
+        <param-name>log4j-conf-file</param-name>
+        <param-value>WEB-INF/conf/log4j.properties</param-value>
+    </context-param>
+
+
+    <!--
+        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Context Listener required and used to
+        initialize the runtime environment before any other task is performed or any servlet initialized. - - - - - - - - - - - -
+        - - - - - - - - - - - - - - - - - - - - - - - - - -
+    -->
+    <listener>
+        <listener-class>com.arsdigita.web.CCMApplicationContextListener</listener-class>
+    </listener>
+
+    <!--
+        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - BASE SERVLET DECLARATIONS SECTION basically
+        requirred by ccm-core - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    -->
+
+    <servlet>
+        <servlet-name>reg</servlet-name>
+        <servlet-class>com.arsdigita.web.ContextRegistrationServlet</servlet-class>
+        <init-param>
+            <param-name>uri</param-name>
+            <param-value>/</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>legacy-dispatcher</servlet-name>
+        <servlet-class>com.arsdigita.sitenode.SiteNodeDispatcher</servlet-class>
+        <load-on-startup>3</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>ccm-dispatcher</servlet-name>
+        <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
+        <init-param>
+            <param-name>fallback-servlet</param-name>
+            <param-value>legacy-dispatcher</param-value>
+        </init-param>
+        <load-on-startup>2</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>legacy-adapter</servlet-name>
+        <servlet-class>com.arsdigita.web.LegacyAdapterServlet</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>cache-manager</servlet-name>
+        <servlet-class>com.arsdigita.caching.CacheServlet</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>db-test</servlet-name>
+        <servlet-class>com.arsdigita.web.monitoring.DBTestServlet</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>versioning-log</servlet-name>
+        <servlet-class>com.arsdigita.versioning.VersioningServlet</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>oid-redirect</servlet-name>
+        <servlet-class>com.arsdigita.web.OIDRedirectServlet</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>resource-resolver</servlet-name>
+        <servlet-class>com.arsdigita.web.ResourceServlet</servlet-class>
+    </servlet>
+
+    <!--
+        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ADDITIONAL SERVLET DECLARATIONS SECTION
+        basically requirred by ccm-cms - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    -->
+
+    <servlet>
+        <servlet-name>content-section</servlet-name>
+        <servlet-class>com.arsdigita.cms.ContentSectionServlet</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>content-type-xsl</servlet-name>
+        <servlet-class>com.arsdigita.cms.dispatcher.ContentTypeXSLServlet</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>content-item-xsl</servlet-name>
+        <servlet-class>com.arsdigita.cms.dispatcher.ContentItemXSLServlet</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>template-xsl</servlet-name>
+        <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>TextOnlyServlet</servlet-name>
+        <display-name>Text Only Servlet</display-name>
+        <servlet-class>com.arsdigita.web.InternalPrefixerServlet</servlet-class>
+        <init-param>
+            <param-name>prefix</param-name>
+            <param-value>/text</param-value>
+        </init-param>
+    </servlet>
+
+    <servlet>
+        <servlet-name>PrintFriendlyServlet</servlet-name>
+        <display-name>Printer Friendly Output Servlet</display-name>
+        <servlet-class>com.arsdigita.web.InternalPrefixerServlet</servlet-class>
+        <init-param>
+            <param-name>prefix</param-name>
+            <param-value>/print</param-value>
+        </init-param>
+    </servlet>
+
+    <!--
+        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - BASE SERVLET MAPPINGS SECTION basically
+        requirred by ccm-core - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    -->
+
+    <servlet-mapping>
+        <servlet-name>reg</servlet-name>
+        <url-pattern>/__ccm__/null/reg/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>ccm-dispatcher</servlet-name>
+        <url-pattern>/ccm/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>legacy-adapter</servlet-name>
+        <url-pattern>/__ccm__/servlet/legacy-adapter/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>cache-manager</servlet-name>
+        <url-pattern>/expireCache/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>db-test</servlet-name>
+        <url-pattern>/dbtest</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>versioning-log</servlet-name>
+        <url-pattern>/versioning/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>oid-redirect</servlet-name>
+        <url-pattern>/redirect/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>resource-resolver</servlet-name>
+        <url-pattern>/resource/*</url-pattern>
+    </servlet-mapping>
+
+    <!--
+        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ADDITIONAL SERVLET MAPPINGS SECTION basically
+        requirred by ccm-cms - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    -->
+
+    <servlet-mapping>
+        <servlet-name>content-section</servlet-name>
+        <url-pattern>/__ccm__/servlet/content-section/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>content-item-xsl</servlet-name>
+        <url-pattern>/__ccm__/servlet/content-item/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>content-type-xsl</servlet-name>
+        <url-pattern>/__ccm__/servlet/content-type/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>template-xsl</servlet-name>
+        <url-pattern>/__ccm__/servlet/template/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>TextOnlyServlet</servlet-name>
+        <url-pattern>/text/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>PrintFriendlyServlet</servlet-name>
+        <url-pattern>/print/*</url-pattern>
+    </servlet-mapping>
+
+    <!--
+        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ERROR PAGES - - - - - - - - - - - - - - - - -
+        - - - - - - - - - - - - - - - - - - - - -
+    -->
+
+    <error-page>
+        <exception-type>com.arsdigita.dispatcher.AccessDeniedException</exception-type>
+        <location>/error/access-denied.jsp</location>
+    </error-page>
+
+    <error-page>
+        <exception-type>com.arsdigita.dispatcher.ObjectNotFoundException</exception-type>
+        <location>/error/object-not-found.jsp</location>
+    </error-page>
+
+    <error-page>
+        <exception-type>com.arsdigita.kernel.permissions.PermissionException</exception-type>
+        <location>/error/permission-denied.jsp</location>
+    </error-page>
+
+    <error-page>
+        <exception-type>com.arsdigita.persistence.DbNotAvailableException</exception-type>
+        <location>/error/db-not-available.jsp</location>
+    </error-page>
+
+    <error-page>
+        <exception-type>com.arsdigita.db.DbNotAvailableException</exception-type>
+        <location>/error/db-not-available.jsp</location>
+    </error-page>
+
+    <error-page>
+        <exception-type>java.lang.Exception</exception-type>
+        <location>/error/general.jsp</location>
+    </error-page>
+
+    <error-page>
+        <exception-type>java.lang.Error</exception-type>
+        <location>/error/general.jsp</location>
+    </error-page>
+
+    <!--
+        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - TAG LIBS - - - - - - - - - - - - - - - - - - -
+        - - - - - - - - - - - - - - - - - - -
+    -->
+
+    <jsp-config>
+        <taglib>
+            <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+            <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+        </taglib>
+
+        <taglib>
+            <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+            <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+        </taglib>
+    </jsp-config>
+
+</web-app>
diff --git a/ccm-core/web/WEB-INF/web.xml-core b/ccm-core/web/WEB-INF/web.xml-core
deleted file mode 100755
index dabbff297..000000000
--- a/ccm-core/web/WEB-INF/web.xml-core
+++ /dev/null
@@ -1,247 +0,0 @@
-<!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>
-
-  <!--  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-        basic web.xml for ccm-core and basic functions.
-        If additional modules provide specific web.xml snippets they must be
-        integrated before CCM is ready to work.
-
-        Alternatively a complete web.xml file from an installation bundle
-        may be used.                                                           
-        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   -->
-
-
-  <display-name>CCM</display-name>
-  <description>Content and Collaboration Management</description>
-
-  <!-- path and filename of the log4j user accessible config file  
-       WEB-INF/conf/log4j.properties is the built-in default value -->
-  <context-param>
-    <param-name>log4j-conf-file</param-name>
-    <param-value>WEB-INF/conf/log4j.properties</param-value>
-  </context-param>
-
-
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     Context Listener 
-     required and used to initialize the runtime environment before any other 
-     task is performed or any servlet initialized. 
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <listener>
-    <listener-class>com.arsdigita.web.CCMApplicationContextListener</listener-class>
-  </listener>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     BASE SERVLET DECLARATIONS SECTION
-     basically requirred by ccm-core
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-  <servlet>
-    <servlet-name>reg</servlet-name>
-    <servlet-class>com.arsdigita.web.ContextRegistrationServlet</servlet-class>
-    <init-param>
-      <param-name>uri</param-name>
-      <param-value>/</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet>
-    <servlet-name>legacy-dispatcher</servlet-name>
-    <servlet-class>com.arsdigita.sitenode.SiteNodeDispatcher</servlet-class>
-    <load-on-startup>3</load-on-startup>
-  </servlet>
-
-  <servlet>
-    <servlet-name>ccm-dispatcher</servlet-name>
-    <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
-    <init-param>
-      <param-name>fallback-servlet</param-name>
-      <param-value>legacy-dispatcher</param-value>
-    </init-param>
-    <load-on-startup>2</load-on-startup>
-  </servlet>
-
-  <servlet>
-    <servlet-name>legacy-adapter</servlet-name>
-    <servlet-class>com.arsdigita.web.LegacyAdapterServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>cache-manager</servlet-name>
-    <servlet-class>com.arsdigita.caching.CacheServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>db-test</servlet-name>
-    <servlet-class>com.arsdigita.web.monitoring.DBTestServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>versioning-log</servlet-name>
-    <servlet-class>com.arsdigita.versioning.VersioningServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>oid-redirect</servlet-name>
-    <servlet-class>com.arsdigita.web.OIDRedirectServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>resource-resolver</servlet-name>
-    <servlet-class>com.arsdigita.web.ResourceServlet</servlet-class>
-  </servlet>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     ADDITIONAL SERVLET DECLARATIONS SECTION 
-     basically requirred by ccm-cms
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-  <servlet>
-    <servlet-name>content-section</servlet-name>
-    <servlet-class>com.arsdigita.cms.ContentSectionServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>content-type-xsl</servlet-name>
-    <servlet-class>com.arsdigita.cms.dispatcher.ContentTypeXSLServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>content-item-xsl</servlet-name>
-    <servlet-class>com.arsdigita.cms.dispatcher.ContentItemXSLServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>template-xsl</servlet-name>
-    <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
-  </servlet>
-
-  
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     BASE SERVLET MAPPINGS SECTION
-     basically requirred by ccm-core
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-  <servlet-mapping>
-    <servlet-name>reg</servlet-name>
-    <url-pattern>/__ccm__/null/reg/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>ccm-dispatcher</servlet-name>
-    <url-pattern>/ccm/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>legacy-adapter</servlet-name>
-    <url-pattern>/__ccm__/servlet/legacy-adapter/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>cache-manager</servlet-name>
-    <url-pattern>/expireCache/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>db-test</servlet-name>
-    <url-pattern>/dbtest</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>versioning-log</servlet-name>
-    <url-pattern>/versioning/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>oid-redirect</servlet-name>
-    <url-pattern>/redirect/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>resource-resolver</servlet-name>
-    <url-pattern>/resource/*</url-pattern>
-  </servlet-mapping>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     ADDITIONAL SERVLET MAPPINGS SECTION
-     basically requirred by ccm-cms
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-  <servlet-mapping>
-    <servlet-name>content-section</servlet-name>
-    <url-pattern>/__ccm__/servlet/content-section/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>content-item-xsl</servlet-name>
-    <url-pattern>/__ccm__/servlet/content-item/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>content-type-xsl</servlet-name>
-    <url-pattern>/__ccm__/servlet/content-type/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>template-xsl</servlet-name>
-    <url-pattern>/__ccm__/servlet/template/*</url-pattern>
-  </servlet-mapping>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     ERROR PAGES
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-  <error-page>
-    <exception-type>com.arsdigita.dispatcher.AccessDeniedException</exception-type>
-    <location>/error/access-denied.jsp</location>
-  </error-page>
-
-  <error-page>
-    <exception-type>com.arsdigita.dispatcher.ObjectNotFoundException</exception-type>
-    <location>/error/object-not-found.jsp</location>
-  </error-page>
-
-  <error-page>
-    <exception-type>com.arsdigita.kernel.permissions.PermissionException</exception-type>
-    <location>/error/permission-denied.jsp</location>
-  </error-page>
-
-  <error-page>
-    <exception-type>com.arsdigita.persistence.DbNotAvailableException</exception-type>
-    <location>/error/db-not-available.jsp</location>
-  </error-page>
-
-  <error-page>
-    <exception-type>com.arsdigita.db.DbNotAvailableException</exception-type>
-    <location>/error/db-not-available.jsp</location>
-  </error-page>
-
-  <error-page>
-    <exception-type>java.lang.Exception</exception-type>
-    <location>/error/general.jsp</location>
-  </error-page>
-
-  <error-page>
-    <exception-type>java.lang.Error</exception-type>
-    <location>/error/general.jsp</location>
-  </error-page>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     TAG LIBS
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
-  </taglib>
-
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
-  </taglib>
-
-</web-app>
diff --git a/ccm-formbuilder-pdf/web/WEB-INF/web.xml-formbuilder-pdf.in b/ccm-formbuilder-pdf/web/WEB-INF/web.ccm-formbuilder-pdf.xml
old mode 100755
new mode 100644
similarity index 66%
rename from ccm-formbuilder-pdf/web/WEB-INF/web.xml-formbuilder-pdf.in
rename to ccm-formbuilder-pdf/web/WEB-INF/web.ccm-formbuilder-pdf.xml
index 059885407..beae23b67
--- a/ccm-formbuilder-pdf/web/WEB-INF/web.xml-formbuilder-pdf.in
+++ b/ccm-formbuilder-pdf/web/WEB-INF/web.ccm-formbuilder-pdf.xml
@@ -1,3 +1,5 @@
+<?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">
 
   <!-- module ccm-formbuilder-pdf  -  servlet definitions BEGIN  -->
   <servlet>
@@ -13,3 +15,4 @@
   </servlet-mapping>
   <!-- module ccm-formbuilder-pdf  -  servlet mappings END  -->
 
+</web-app>
diff --git a/ccm-forum/web/WEB-INF/web.ccm-forum.xml b/ccm-forum/web/WEB-INF/web.ccm-forum.xml
new file mode 100644
index 000000000..d0e397590
--- /dev/null
+++ b/ccm-forum/web/WEB-INF/web.ccm-forum.xml
@@ -0,0 +1,18 @@
+<?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">
+
+  <!-- module ccm-forum  -  servlet declarations BEGIN  -->  
+  <servlet>
+    <servlet-name>forum-main</servlet-name>
+    <servlet-class>com.arsdigita.forum.ForumServlet</servlet-class>
+  </servlet>
+  <!-- module ccm-forum  -  servlet declarations END    -->  
+
+  <!-- module ccm-forum  -  servlet mappings BEGIN  -->
+  <servlet-mapping>
+    <servlet-name>forum-main</servlet-name>
+    <url-pattern>/forum-main/main/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-forum  -  servlet mappings END    -->
+
+</web-app>
diff --git a/ccm-ldn-aplaws/web/WEB-INF/web.empty.xml b/ccm-ldn-aplaws/web/WEB-INF/web.empty.xml
new file mode 100644
index 000000000..8a67a8770
--- /dev/null
+++ b/ccm-ldn-aplaws/web/WEB-INF/web.empty.xml
@@ -0,0 +1,4 @@
+<?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">
+</web-app>
diff --git a/ccm-ldn-atoz/web/WEB-INF/web.xml-atoz.in b/ccm-ldn-atoz/web/WEB-INF/web.ccm-ldn-atoz.xml
old mode 100755
new mode 100644
similarity index 71%
rename from ccm-ldn-atoz/web/WEB-INF/web.xml-atoz.in
rename to ccm-ldn-atoz/web/WEB-INF/web.ccm-ldn-atoz.xml
index 1dbb9ecd1..cb99ac135
--- a/ccm-ldn-atoz/web/WEB-INF/web.xml-atoz.in
+++ b/ccm-ldn-atoz/web/WEB-INF/web.ccm-ldn-atoz.xml
@@ -1,3 +1,5 @@
+<?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">
 
   <!-- module ccm-ldn-atoz  -  servlet declarations BEGIN   -->
   <servlet>
@@ -17,3 +19,4 @@
   </servlet-mapping>
   <!-- module ccm-ldn-atoz  -  servlet mappings END  -->
 
+</web-app>
diff --git a/ccm-ldn-navigation/web/WEB-INF/web.ccm-ldn-navigation.xml b/ccm-ldn-navigation/web/WEB-INF/web.ccm-ldn-navigation.xml
new file mode 100644
index 000000000..a1f6cabaa
--- /dev/null
+++ b/ccm-ldn-navigation/web/WEB-INF/web.ccm-ldn-navigation.xml
@@ -0,0 +1,21 @@
+<?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>
+        <servlet-name>navigation-files</servlet-name>
+        <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+        <init-param>
+            <param-name>template-path</param-name>
+            <param-value>/templates/ccm-ldn-navigation</param-value>
+        </init-param>
+        <init-param>
+            <param-name>file-resolver</param-name>
+            <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value>
+        </init-param>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>navigation-files</servlet-name>
+        <url-pattern>/ccm-ldn-navigation/files/*</url-pattern>
+    </servlet-mapping>
+</web-app>
diff --git a/ccm-ldn-portal/web/WEB-INF/web.ccm-ldn-portal.xml b/ccm-ldn-portal/web/WEB-INF/web.ccm-ldn-portal.xml
new file mode 100644
index 000000000..b53e037dd
--- /dev/null
+++ b/ccm-ldn-portal/web/WEB-INF/web.ccm-ldn-portal.xml
@@ -0,0 +1,43 @@
+<?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">
+
+    <!-- module ccm-ldn-portal  -  servlet definitions BEGIN  -->
+    <servlet>
+        <servlet-name>files</servlet-name>
+        <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+        <init-param>
+            <param-name>template-path</param-name>
+            <param-value>/templates/ccm-ldn-portal</param-value>
+        </init-param>
+    </servlet>
+    <servlet>
+        <servlet-name>portal-files</servlet-name>
+        <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+        <init-param>
+            <param-name>template-path</param-name>
+            <param-value>/templates/ccm-ldn-portal</param-value>
+        </init-param>
+    </servlet>
+    <servlet>
+        <servlet-name>portlet-type-xsl</servlet-name>
+        <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
+    </servlet>
+    <!-- module ccm-ldn-portal  -  servlet definitions END  -->
+
+    <!-- module ccm-ldn-portal  -  servlet mappings BEGIN  -->
+    <servlet-mapping>
+        <servlet-name>files</servlet-name>
+        <url-pattern>/files/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>portal-files</servlet-name>
+        <url-pattern>/ccm-ldn-portal/files/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>portlet-type-xsl</servlet-name>
+        <url-pattern>/__ccm__/servlet/portlet-type/*</url-pattern>
+    </servlet-mapping>
+    <!-- module ccm-ldn-portal  -  servlet mappings END  -->
+
+</web-app>
diff --git a/ccm-ldn-rss/web/WEB-INF/web.ccm-ldn-rss.xml b/ccm-ldn-rss/web/WEB-INF/web.ccm-ldn-rss.xml
new file mode 100644
index 000000000..a111daa20
--- /dev/null
+++ b/ccm-ldn-rss/web/WEB-INF/web.ccm-ldn-rss.xml
@@ -0,0 +1,25 @@
+<?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">
+
+    <!-- module ccm-ldn-rss  -  servlet definitions   -->
+    <servlet>
+        <servlet-name>rss-files</servlet-name>
+        <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+        <init-param>
+            <param-name>template-path</param-name>
+            <param-value>/templates/ccm-ldn-rss</param-value>
+        </init-param>
+        <init-param>
+            <param-name>file-resolver</param-name>
+            <param-value>com.arsdigita.london.rss.RSSFileResolver</param-value>
+        </init-param>
+    </servlet>
+
+    <!-- module ccm-ldn-rss  -  servlet mappings   -->
+    <servlet-mapping>
+        <servlet-name>rss-files</servlet-name>
+        <url-pattern>/ccm-ldn-rss/files/*</url-pattern>
+    </servlet-mapping>
+
+</web-app>
diff --git a/ccm-ldn-search/web/WEB-INF/web.ccm-ldn-search.xml b/ccm-ldn-search/web/WEB-INF/web.ccm-ldn-search.xml
new file mode 100644
index 000000000..3354af5de
--- /dev/null
+++ b/ccm-ldn-search/web/WEB-INF/web.ccm-ldn-search.xml
@@ -0,0 +1,42 @@
+<?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">
+
+    <!-- module ccm-ldn-search  -  servlet declarations BEGIN   -->
+    <servlet>
+        <servlet-name>worker</servlet-name>
+        <servlet-class>com.arsdigita.london.search.SearchWorkerServlet</servlet-class>
+        <load-on-startup>4</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>search-files</servlet-name>
+        <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+        <init-param>
+            <param-name>template-path</param-name>
+            <param-value>/templates/ccm-ldn-search</param-value>
+        </init-param>
+    </servlet>
+
+    <servlet>
+        <servlet-name>AxisServlet</servlet-name>
+        <display-name>Apache-Axis Servlet</display-name>
+        <servlet-class>org.apache.axis.transport.http.AxisServlet</servlet-class>
+    </servlet>
+    <!-- module ccm-ldn-search  -  servlet declarations END  -->
+
+    <!-- module ccm-ldn-search  -  servlet mappings BEGIN  -->
+    <servlet-mapping>
+        <servlet-name>search-files</servlet-name>
+        <url-pattern>/ccm-ldn-search/files/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>AxisServlet</servlet-name>
+        <url-pattern>/services/*</url-pattern>
+    </servlet-mapping>
+    <!-- module ccm-ldn-search  -  servlet mappings END  -->
+
+</web-app>
diff --git a/ccm-ldn-shortcuts/web/WEB-INF/web.ccm-ldn-shortcuts.xml b/ccm-ldn-shortcuts/web/WEB-INF/web.ccm-ldn-shortcuts.xml
new file mode 100644
index 000000000..c75d173a8
--- /dev/null
+++ b/ccm-ldn-shortcuts/web/WEB-INF/web.ccm-ldn-shortcuts.xml
@@ -0,0 +1,31 @@
+<?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>
+        <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>shortcuts</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <!-- module ccm-ldn-shortcuts  -  servlet definitions   -->
+    <servlet>
+        <servlet-name>shortcuts-files</servlet-name>
+        <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+        <init-param>
+            <param-name>template-path</param-name>
+            <param-value>/templates/ccm-ldn-shortcuts</param-value>
+        </init-param>
+    </servlet>
+
+    <!-- module ccm-ldn-shortcuts  -  servlet mappings   -->
+    <servlet-mapping>
+        <servlet-name>shortcuts-files</servlet-name>
+        <url-pattern>/ccm-ldn-shortcuts/files/*</url-pattern>
+    </servlet-mapping>
+
+</web-app>
diff --git a/ccm-ldn-subsite/web/WEB-INF/web.ccm-ldn-subsite.xml b/ccm-ldn-subsite/web/WEB-INF/web.ccm-ldn-subsite.xml
new file mode 100644
index 000000000..937ad8082
--- /dev/null
+++ b/ccm-ldn-subsite/web/WEB-INF/web.ccm-ldn-subsite.xml
@@ -0,0 +1,36 @@
+<?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>subsite</filter-name>
+        <filter-class>com.arsdigita.london.subsite.SubsiteFilter</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>subsite</filter-name>
+        <url-pattern>/ccm/*</url-pattern>
+        <!-- please check: with or w/o ccm?
+    <url-pattern>/*</url-pattern>
+-->
+    </filter-mapping>
+
+    <!-- module ccm-ldn-subsite  -  servlet declarations BEGIN  -->
+    <servlet>
+        <servlet-name>subsite-files</servlet-name>
+        <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+        <init-param>
+            <param-name>template-path</param-name>
+            <param-value>/templates/ccm-ldn-subsite</param-value>
+        </init-param>
+    </servlet>
+    <!-- module ccm-ldn-subsite  -  servlet declarations END  -->
+
+    <!-- module ccm-ldn-subsite  -  servlet mappings BEGIN  -->
+    <servlet-mapping>
+        <servlet-name>subsite-files</servlet-name>
+        <url-pattern>/ccm-ldn-subsite/files/*</url-pattern>
+    </servlet-mapping>
+    <!-- module ccm-ldn-subsite  -  servlet mappings END  -->
+
+</web-app>
diff --git a/ccm-ldn-terms/web/WEB-INF/web.ccm-ldn-terms.xml b/ccm-ldn-terms/web/WEB-INF/web.ccm-ldn-terms.xml
index adbe4516f..a0f23ae83 100755
--- a/ccm-ldn-terms/web/WEB-INF/web.ccm-ldn-terms.xml
+++ b/ccm-ldn-terms/web/WEB-INF/web.ccm-ldn-terms.xml
@@ -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">
+<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">
 
     <!-- module ccm-ldn-terms  -  servlet declarations BEGIN  -->
     <servlet>
@@ -20,4 +22,4 @@
     </servlet-mapping>
     <!-- module ccm-ldn-terms  -  servlet mappings END  -->
 
-</web-app>
\ No newline at end of file
+</web-app>
diff --git a/ccm-ldn-theme/web/WEB-INF/web.ccm-ldn-theme.xml b/ccm-ldn-theme/web/WEB-INF/web.ccm-ldn-theme.xml
new file mode 100644
index 000000000..17e7af7e4
--- /dev/null
+++ b/ccm-ldn-theme/web/WEB-INF/web.ccm-ldn-theme.xml
@@ -0,0 +1,52 @@
+<?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">
+
+    <!-- module ccm-ldn-themes  -  servlet declarations BEGIN   -->
+    <servlet>
+        <servlet-name>theme-files</servlet-name>
+        <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+        <init-param>
+            <param-name>template-path</param-name>
+            <param-value>/templates/ccm-ldn-theme</param-value>
+        </init-param>
+    </servlet>
+
+    <servlet>
+        <servlet-name>ThemeDownload</servlet-name>
+        <servlet-class>com.arsdigita.london.theme.dispatcher.ThemeDownloadServlet</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>ThemePreviewServlet</servlet-name>
+        <display-name>Servlet to allow admins to preview look/feel</display-name>
+        <servlet-class>
+            com.arsdigita.london.theme.dispatcher.InternalThemePrefixerServlet
+    </servlet-class>
+        <init-param>
+            <param-name>prefix</param-name>
+            <param-value>/theme</param-value>
+        </init-param>
+    </servlet>
+    <!-- module ccm-ldn-themes  -  servlet declarations END   -->
+
+    <!-- module ccm-ldn-theme  -  servlet mappings BEGIN   -->
+    <servlet-mapping>
+        <servlet-name>theme-files</servlet-name>
+        <url-pattern>/theme-files/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>ThemeDownload</servlet-name>
+        <url-pattern>/theme-files/download/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>ThemePreviewServlet</servlet-name>
+        <url-pattern>/theme/*</url-pattern>
+    </servlet-mapping>
+    <!-- module ccm-ldn-themes  -  servlet mappings END   -->
+
+</web-app>
diff --git a/ccm-simplesurvey/web/WEB-INF/web.ccm-simplesurvey.xml b/ccm-simplesurvey/web/WEB-INF/web.ccm-simplesurvey.xml
new file mode 100644
index 000000000..7c0e5d07f
--- /dev/null
+++ b/ccm-simplesurvey/web/WEB-INF/web.ccm-simplesurvey.xml
@@ -0,0 +1,23 @@
+<?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">
+
+    <!-- module ccm-simplesurvey  -  servlet definitions   -->
+    <servlet>
+        <servlet-name>simplesurvey-files</servlet-name>
+        <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+        <init-param>
+            <param-name>template-path</param-name>
+            <param-value>/templates/ccm-simplesurvey</param-value>
+        </init-param>
+    </servlet>
+
+    <!-- module ccm-simplesurvey  -  servlet mappings   -->
+    <servlet-mapping>
+        <servlet-name>simplesurvey-files</servlet-name>
+        <url-pattern>/ccm-simplesurvey/files/*</url-pattern>
+    </servlet-mapping>
+
+</web-app>
diff --git a/environment/project.xml.shp b/environment/project.xml.shp
index a12b00b7b..3fd255c0c 100644
--- a/environment/project.xml.shp
+++ b/environment/project.xml.shp
@@ -52,7 +52,9 @@
 <!--    <ccm:application name="ccm-cms-types-organization"/>         -->
 <!--    <ccm:application name="ccm-cms-types-pressrelease"/>         -->
 <!--    <ccm:application name="ccm-cms-types-service"/>              -->
-<!--    <ccm:application name="ccm-cms-types-siteproxy"/>            -->
+<!-- Fuer OpenCCM aktivieren:                                        -->
+        <ccm:application name="ccm-cms-types-siteproxy"/>            
+        <ccm:application name="ccm-cms-types-xmlfeed"/>                    
 
 <!--  Applications   -->
 <!--  - - - - -  -   -->
@@ -86,7 +88,6 @@
         <ccm:application name="ccm-ldn-terms"/>
         <ccm:application name="ccm-ldn-theme"/>
         <ccm:application name="ccm-ldn-util"/>
-<!--    <ccm:application name="ccm-ldn-xmlfeed"/>                    -->
 
 
 <!--  SHP extension  -->
diff --git a/tools-ng/common/xsl/build-template.xsl b/tools-ng/common/xsl/build-template.xsl
index 899be2d42..d2553435e 100755
--- a/tools-ng/common/xsl/build-template.xsl
+++ b/tools-ng/common/xsl/build-template.xsl
@@ -1207,9 +1207,37 @@
     <target name="copy-webxml"
             depends="init,copy-webxml-init" if="root.webapp.exists">
       <copy file="${{resolved.webxml.source.file}}"
-            tofile="${{this.deploy.dir}}/WEB-INF/web.xml"/>
+            tofile="${{this.deploy.dir}}/WEB-INF/web.xml" overwrite="yes"/>
+      <foreach param="file" target="merge-webxml">
+         <path>
+           <fileset dir="${{this.deploy.dir}}/WEB-INF" includes="web.*.xml"/>
+         </path>
+      </foreach>
     </target>
 
+    <target name="merge-webxml" depends="init">
+        <echo>Merging in ${file}</echo>
+        <property name="customWebXML" value="${{file}}"/>
+        <property name="originalWebXML" value="${{this.deploy.dir}}/WEB-INF/web.xml"/>
+        <property name="mergedWebXML" value="${{customWebXML}}.merged"/>
+        <script language="javascript">
+            <classpath>
+                <fileset dir="tools-ng/webxml/lib" includes="*.jar"/>
+            </classpath>
+            importClass(java.lang.System);
+            importClass(com.liferay.portal.tools.WebXMLBuilder);
+            importClass(com.liferay.portal.kernel.util.FileUtil);
+            importClass(com.liferay.portal.util.FileImpl);
+            importClass(com.liferay.portal.xml.SAXReaderImpl);
+            importClass(com.liferay.portal.kernel.xml.SAXReaderUtil);
+            new FileUtil().setFile(FileImpl.getInstance());
+            new SAXReaderUtil().setSAXReader(new SAXReaderImpl());
+            var builder = new WebXMLBuilder(originalWebXML, customWebXML, mergedWebXML);
+        </script>
+        <copy tofile="${{originalWebXML}}" file="${{mergedWebXML}}" overwrite="yes"/>
+        <delete file="${{mergedWebXML}}"/>
+    </target>    
+
     <!-- Master deploy -->
     <target name="deploy"
          depends="init,deploy-global,deploy-local,copy-webxml">
diff --git a/tools-ng/common/xsl/build-version.xsl b/tools-ng/common/xsl/build-version.xsl
new file mode 100644
index 000000000..05ea3b851
--- /dev/null
+++ b/tools-ng/common/xsl/build-version.xsl
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:common="http://exslt.org/common"
+  xmlns:xalan="http://xml.apache.org/xslt"
+  xmlns:ccm="http://ccm.redhat.com/ccm-project"
+  exclude-result-prefixes="ccm common">
+
+  <xsl:output method="text" />
+
+  <xsl:template match="ccm:project">
+    <xsl:text>version=</xsl:text><xsl:value-of select="@version"/><xsl:text>&#13;</xsl:text>  
+    <xsl:text>release=</xsl:text><xsl:value-of select="@release"/><xsl:text>&#13;</xsl:text>
+  </xsl:template>
+  
+</xsl:stylesheet>
diff --git a/tools-ng/ecdc/project.xml.complete b/tools-ng/ecdc/project.xml.complete
index 60f2bdc0c..ba7ebec2d 100644
--- a/tools-ng/ecdc/project.xml.complete
+++ b/tools-ng/ecdc/project.xml.complete
@@ -16,7 +16,7 @@
                    type="application"
                 version="1-0-5"
                 release="alpha-1"
-                 webxml="web.xml-aplaws"
+                 webxml="web.empty.xml"
                  webapp="ROOT" >
 
   <!-- List all target databases here -->
@@ -80,6 +80,9 @@
 		<ccm:application name="ccm-ldn-util"/>
 		<ccm:application name="ccm-simplesurvey"/>
 		<ccm:application name="ccm-user-preferences"/>
+        <ccm:application name="ccm-portlet"/>
+        <ccm:application name="ccm-portlet-helloworld"/>
+        <ccm:application name="ccm-portlet-content-item"/>
 	</ccm:build>
 
   <!-- List all shared, pre-built applications here -->
diff --git a/tools-ng/webxml/lib/portal-copyright.txt b/tools-ng/webxml/lib/portal-copyright.txt
new file mode 100644
index 000000000..7cf7cd3e0
--- /dev/null
+++ b/tools-ng/webxml/lib/portal-copyright.txt
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) 2000-2009 Liferay, Inc. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */