diff --git a/ccm-atoz/web/WEB-INF/web.ccm-atoz.xml b/ccm-atoz/web/WEB-INF/web.d/web.ccm-atoz.xml
similarity index 100%
rename from ccm-atoz/web/WEB-INF/web.ccm-atoz.xml
rename to ccm-atoz/web/WEB-INF/web.d/web.ccm-atoz.xml
diff --git a/ccm-auth-http/web/WEB-INF/web.ccm-auth-http.xml b/ccm-auth-http/web/WEB-INF/web.d/web.ccm-auth-http.xml
similarity index 100%
rename from ccm-auth-http/web/WEB-INF/web.ccm-auth-http.xml
rename to ccm-auth-http/web/WEB-INF/web.d/web.ccm-auth-http.xml
diff --git a/ccm-bookmarks/web/WEB-INF/web.ccm-bookmarks.xml b/ccm-bookmarks/web/WEB-INF/web.d/web.ccm-bookmarks.xml
similarity index 100%
rename from ccm-bookmarks/web/WEB-INF/web.ccm-bookmarks.xml
rename to ccm-bookmarks/web/WEB-INF/web.d/web.ccm-bookmarks.xml
diff --git a/ccm-cms-portletdataprovider/web/WEB-INF/web.ccm-cms-portletdataprovider.xml b/ccm-cms-portletdataprovider/web/WEB-INF/web.d/web.ccm-cms-portletdataprovider.xml
similarity index 100%
rename from ccm-cms-portletdataprovider/web/WEB-INF/web.ccm-cms-portletdataprovider.xml
rename to ccm-cms-portletdataprovider/web/WEB-INF/web.d/web.ccm-cms-portletdataprovider.xml
diff --git a/ccm-cms-publicpersonalprofile/web/WEB-INF/web.ccm-cms-publicpersonalprofile.xml b/ccm-cms-publicpersonalprofile/web/WEB-INF/web.d/web.ccm-cms-publicpersonalprofile.xml
similarity index 100%
rename from ccm-cms-publicpersonalprofile/web/WEB-INF/web.ccm-cms-publicpersonalprofile.xml
rename to ccm-cms-publicpersonalprofile/web/WEB-INF/web.d/web.ccm-cms-publicpersonalprofile.xml
diff --git a/ccm-cms/web/WEB-INF/web.ccm-cms.xml b/ccm-cms/web/WEB-INF/web.d/web.ccm-cms.xml
similarity index 100%
rename from ccm-cms/web/WEB-INF/web.ccm-cms.xml
rename to ccm-cms/web/WEB-INF/web.d/web.ccm-cms.xml
diff --git a/ccm-cms/web/WEB-INF/web.optional-ccm-cms.xml b/ccm-cms/web/WEB-INF/web.d/web.optional-ccm-cms.xml
similarity index 100%
rename from ccm-cms/web/WEB-INF/web.optional-ccm-cms.xml
rename to ccm-cms/web/WEB-INF/web.d/web.optional-ccm-cms.xml
diff --git a/ccm-core/web/WEB-INF/resources.nolongerInUse/core-dmi.xml.nolongerInUse b/ccm-core/etc/resources.nolongerInUse/core-dmi.xml.nolongerInUse
similarity index 100%
rename from ccm-core/web/WEB-INF/resources.nolongerInUse/core-dmi.xml.nolongerInUse
rename to ccm-core/etc/resources.nolongerInUse/core-dmi.xml.nolongerInUse
diff --git a/ccm-core/web/WEB-INF/web.ccm-core.xml b/ccm-core/web/WEB-INF/web.d/web.default.ccm-core.xml
similarity index 100%
rename from ccm-core/web/WEB-INF/web.ccm-core.xml
rename to ccm-core/web/WEB-INF/web.d/web.default.ccm-core.xml
diff --git a/ccm-core/web/WEB-INF/web.optional-ccm-core.xml b/ccm-core/web/WEB-INF/web.d/web.optional-ccm-core.xml
similarity index 100%
rename from ccm-core/web/WEB-INF/web.optional-ccm-core.xml
rename to ccm-core/web/WEB-INF/web.d/web.optional-ccm-core.xml
diff --git a/ccm-core/web/WEB-INF/web.xml b/ccm-core/web/WEB-INF/web.xml
new file mode 100644
index 000000000..7d2113aa0
--- /dev/null
+++ b/ccm-core/web/WEB-INF/web.xml
@@ -0,0 +1,190 @@
+<?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 ANY ccm-core application to work correctly!
+        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!--
+    <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>ccm-dispatcher</servlet-name>
+        <servlet-class>com.arsdigita.web.CCMDispatcherServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </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>webdevsupport</servlet-name>
+        <servlet-class>com.arsdigita.webdevsupport.WebDevSupportServlet</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>
+
+
+    <!--
+      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+      BASE SERVLET MAPPINGS SECTION basically
+      requirred by ccm-core
+      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    -->
+
+    <servlet-mapping>
+        <servlet-name>ccm-dispatcher</servlet-name>
+        <url-pattern>/ccm/*</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>webdevsupport</servlet-name>
+        <url-pattern>/webdevsupport/*</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>
+
+
+    <!--
+      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+      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-docmgr/web/WEB-INF/web.ccm-docmgr.xml b/ccm-docmgr/web/WEB-INF/web.d/web.ccm-docmgr.xml
similarity index 100%
rename from ccm-docmgr/web/WEB-INF/web.ccm-docmgr.xml
rename to ccm-docmgr/web/WEB-INF/web.d/web.ccm-docmgr.xml
diff --git a/ccm-docrepo/web/WEB-INF/web.ccm-docrepo.xml b/ccm-docrepo/web/WEB-INF/web.d/web.ccm-docrepo.xml
similarity index 100%
rename from ccm-docrepo/web/WEB-INF/web.ccm-docrepo.xml
rename to ccm-docrepo/web/WEB-INF/web.d/web.ccm-docrepo.xml
diff --git a/ccm-faq/web/WEB-INF/web.ccm-faq.xml b/ccm-faq/web/WEB-INF/web.d/web.ccm-faq.xml
similarity index 100%
rename from ccm-faq/web/WEB-INF/web.ccm-faq.xml
rename to ccm-faq/web/WEB-INF/web.d/web.ccm-faq.xml
diff --git a/ccm-formbuilder-pdf/web/WEB-INF/web.ccm-formbuilder-pdf.xml b/ccm-formbuilder-pdf/web/WEB-INF/web.d/web.ccm-formbuilder-pdf.xml
similarity index 100%
rename from ccm-formbuilder-pdf/web/WEB-INF/web.ccm-formbuilder-pdf.xml
rename to ccm-formbuilder-pdf/web/WEB-INF/web.d/web.ccm-formbuilder-pdf.xml
diff --git a/ccm-forum/web/WEB-INF/web.ccm-forum.xml b/ccm-forum/web/WEB-INF/web.d/web.ccm-forum.xml
similarity index 100%
rename from ccm-forum/web/WEB-INF/web.ccm-forum.xml
rename to ccm-forum/web/WEB-INF/web.d/web.ccm-forum.xml
diff --git a/ccm-ldn-search/web/WEB-INF/web.ccm-ldn-search.xml b/ccm-ldn-search/web/WEB-INF/web.d/web.ccm-ldn-search.xml
similarity index 100%
rename from ccm-ldn-search/web/WEB-INF/web.ccm-ldn-search.xml
rename to ccm-ldn-search/web/WEB-INF/web.d/web.ccm-ldn-search.xml
diff --git a/ccm-ldn-terms/web/WEB-INF/web.ccm-ldn-terms.xml b/ccm-ldn-terms/web/WEB-INF/web.d/web.ccm-ldn-terms.xml
similarity index 100%
rename from ccm-ldn-terms/web/WEB-INF/web.ccm-ldn-terms.xml
rename to ccm-ldn-terms/web/WEB-INF/web.d/web.ccm-ldn-terms.xml
diff --git a/ccm-navigation/web/WEB-INF/web.ccm-navigation.xml b/ccm-navigation/web/WEB-INF/web.d/web.ccm-navigation.xml
similarity index 100%
rename from ccm-navigation/web/WEB-INF/web.ccm-navigation.xml
rename to ccm-navigation/web/WEB-INF/web.d/web.ccm-navigation.xml
diff --git a/ccm-portalserver/web/WEB-INF/web.ccm-portalserver.xml b/ccm-portalserver/web/WEB-INF/web.d/web.ccm-portalserver.xml
similarity index 100%
rename from ccm-portalserver/web/WEB-INF/web.ccm-portalserver.xml
rename to ccm-portalserver/web/WEB-INF/web.d/web.ccm-portalserver.xml
diff --git a/ccm-portalworkspace/web/WEB-INF/web.ccm-portalworkspace.xml b/ccm-portalworkspace/web/WEB-INF/web.d/web.ccm-portalworkspace.xml
similarity index 100%
rename from ccm-portalworkspace/web/WEB-INF/web.ccm-portalworkspace.xml
rename to ccm-portalworkspace/web/WEB-INF/web.d/web.ccm-portalworkspace.xml
diff --git a/ccm-rssfeed/web/WEB-INF/web.ccm-rssfeed.xml b/ccm-rssfeed/web/WEB-INF/web.d/web.ccm-rssfeed.xml
similarity index 100%
rename from ccm-rssfeed/web/WEB-INF/web.ccm-rssfeed.xml
rename to ccm-rssfeed/web/WEB-INF/web.d/web.ccm-rssfeed.xml
diff --git a/ccm-sci-bundle/bundles/devel/cfg/project.xml b/ccm-sci-bundle/bundles/devel/cfg/project.xml
index 0ba757eb4..c5948fee4 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/project.xml
+++ b/ccm-sci-bundle/bundles/devel/cfg/project.xml
@@ -10,7 +10,7 @@
               prettyName="Scientific CMS" 
                  version="2.3.0" 
                  release="devel-SNAPSHOT-r2620" 
-                  webxml="sci-web.xml" 
+                  webxml="scweb.xml" 
               portletxml="sci-portlet.xml" 
                   webapp="libreccm" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
diff --git a/ccm-sci-publications/web/WEB-INF/web.ccm-sci-publications.xml b/ccm-sci-publications/web/WEB-INF/web.d/web.ccm-sci-publications.xml
similarity index 100%
rename from ccm-sci-publications/web/WEB-INF/web.ccm-sci-publications.xml
rename to ccm-sci-publications/web/WEB-INF/web.d/web.ccm-sci-publications.xml
diff --git a/ccm-shortcuts/web/WEB-INF/web.ccm-shortcuts.xml b/ccm-shortcuts/web/WEB-INF/web.d/web.ccm-shortcuts.xml
similarity index 100%
rename from ccm-shortcuts/web/WEB-INF/web.ccm-shortcuts.xml
rename to ccm-shortcuts/web/WEB-INF/web.d/web.ccm-shortcuts.xml
diff --git a/ccm-simplesurvey/web/WEB-INF/web.ccm-simplesurvey.xml b/ccm-simplesurvey/web/WEB-INF/web.d/web.ccm-simplesurvey.xml
similarity index 100%
rename from ccm-simplesurvey/web/WEB-INF/web.ccm-simplesurvey.xml
rename to ccm-simplesurvey/web/WEB-INF/web.d/web.ccm-simplesurvey.xml
diff --git a/ccm-subsite/web/WEB-INF/web.ccm-subsite.xml b/ccm-subsite/web/WEB-INF/web.d/web.ccm-subsite.xml
similarity index 100%
rename from ccm-subsite/web/WEB-INF/web.ccm-subsite.xml
rename to ccm-subsite/web/WEB-INF/web.d/web.ccm-subsite.xml
diff --git a/ccm-themedirector/web/WEB-INF/web.ccm-themedirector.xml b/ccm-themedirector/web/WEB-INF/web.d/web.ccm-themedirector.xml
similarity index 100%
rename from ccm-themedirector/web/WEB-INF/web.ccm-themedirector.xml
rename to ccm-themedirector/web/WEB-INF/web.d/web.ccm-themedirector.xml
diff --git a/ccm-weblog/web/WEB-INF/web.ccm-weblog.xml b/ccm-weblog/web/WEB-INF/web.d/web.ccm-weblog.xml
similarity index 100%
rename from ccm-weblog/web/WEB-INF/web.ccm-weblog.xml
rename to ccm-weblog/web/WEB-INF/web.d/web.ccm-weblog.xml
diff --git a/environment/local.ccm.properties b/environment/local.ccm.properties
deleted file mode 100644
index bfc6c647c..000000000
--- a/environment/local.ccm.properties
+++ /dev/null
@@ -1,309 +0,0 @@
-## For local modifications of the ccm build details overwrite
-## the appropriate properties
-## The defaults are shown commented out
-
-## -------------------------------------------------
-## Usually you will define your own specific bundle!
-## -------------------------------------------------
-#ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/devel
-#ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/standard
-#ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/local/ccm
-#ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/local/igb
-#ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/local/nsh
-#
-#ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/devel
-#ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/custom
-#ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/demo
-#ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/extended
-#ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/standard
-#ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/local/aap
-#ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/local/iaw
-#
-#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/custom
-#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/demo
-#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/devel
-#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/extended
-#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/standard
-#
-ccm.bundle.folder=${ccm.project.dir}/ccm-lbc-aplaws/bundles/intranet
-
-
-## ====================================================================
-## Update scripts
-## ====================================================================
-
-
-# Alle Versionen / Bundles: 
-# (hb r1554 ccm-simplesurvey  loaded as legacy free application.
-#ccm.upgrade.package=ccm-simplesurvey
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-# Alle Versionen / Bundles: 
-# (hb r1553 Packages CMS Workspace&Service loaded as legacy free application.
-#ccm.upgrade.package=ccm-cms
-#ccm.upgrade.from.version=6.6.6
-#ccm.upgrade.to.version=6.6.7
-
-# Alle Versionen / Bundles: 
-#ccm.upgrade.package=ccm-ldn-atoz
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-# Alle Versionen / Bundles: 
-# (hb r1531 Package ldn-search now loaded as legacy free application.
-#ccm.upgrade.package=ccm-ldn-search
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-
-# ---------------------------------------------------------------------
-# Update von rel. 1.1.6 auf 1.2.0   
-# Müssen NACH dem (regulären) Update 1.1.4 -> 1.1.6 durchgeführt werden
-# Reihenfolge: hier von UNTEN nach OBEN!
-# ---------------------------------------------------------------------
-
-# Alle Versionen / Bundles: 
-# ACHTUNG: evt. ist iaw auf 1.2.0 OHNE letzte Ergänzungen (Login, Admin)
-#ccm.upgrade.package=ccm-core
-#ccm.upgrade.from.version=6.6.3
-#ccm.upgrade.to.version=6.6.4
-
-# Alle Versionen / Bundles: 
-#ccm.upgrade.package=ccm-ldn-terms
-#ccm.upgrade.from.version=6.6.1
-#ccm.upgrade.to.version=6.6.2
-
-# Alle Versionen / Bundles: 
-# (hb r149? Package ccm-forum loaded as legacy free application.
-#ccm.upgrade.package=ccm-forum
-#ccm.upgrade.from.version=6.6.1
-#ccm.upgrade.to.version=6.6.2
-
-# Alle Versionen / Bundles: 
-# (hb r1496 Package ccm-cms ContentSection loaded as legacy free application.
-#ccm.upgrade.package=ccm-cms
-#ccm.upgrade.from.version=6.6.5
-#ccm.upgrade.to.version=6.6.6
-
-# Alle Versionen / Bundles: 
-# (hb r1492 Umbennen ccm-cms Associations between generic content type updated.
-#ccm.upgrade.package=ccm-cms
-#ccm.upgrade.from.version=6.6.4
-#ccm.upgrade.to.version=6.6.5
-
-# Alle Versionen / Bundles: 
-# (hb r13?? Umbennen ccm-ldn-rss nach ccm-rssfeed und legacy free app
-#ccm.upgrade.package=ccm-rssfeed
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-# Alle Versionen / Bundles: 
-# (hb r1398 Umbennen ccm-ldn-shortcuts nach ccm-shortcuts und legacy free app)
-#ccm.upgrade.package=ccm-shortcuts
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-
-# ---------------------------------------------------------------------
-# Update von rel. 1.1.4 auf 1.1.6  
-# Müssen NACH dem (regulären) Update 1.1.3 -> 1.1.4 durchgeführt werden
-# ---------------------------------------------------------------------
-
-# Alle Versionen / Bundles: 
-# (hb r1358: table cms_organizationalunits_hierarchy_map und cms_publish_lock)
-#ccm.upgrade.package=ccm-cms
-#ccm.upgrade.from.version=6.6.3
-#ccm.upgrade.to.version=6.6.4
-
-# Alle Versionen / Bundles: 
-# (hb r1331/: ccm-ldn-subsite umbenannt nach ccm-subsite.)
-#ccm.upgrade.package=ccm-subsite
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-# Alle Versionen / Bundles: 
-# (hb r1257/: ccm-ldn-navigation umbenannt nach ccm-navigation.)
-#ccm.upgrade.package=ccm-navigation
-#ccm.upgrade.from.version=6.6.2
-#ccm.upgrade.to.version=6.6.3
-
-# Alle Versionen / Bundles: 
-# (hb r1248/: ccm-[iaw|zes|...]-aplaws umgestellt auf ccm-sci-bundle.)
-#ccm.upgrade.package=ccm-sci-bundle
-#ccm.upgrade.from.version=0.0.0
-#ccm.upgrade.to.version=6.6.0
-
-
-# ---------------------------------------------------------------------
-# Update von rel. 1.1.3 auf 1.1.4 
-# Müssen NACH dem (regulären) Update 1.1.2 -> 1.1.3 durchgeführt werden
-# ---------------------------------------------------------------------
-# Alle Versionen / Bundles: 
-# (hb r1102/r1081: generic persons Tabelle erweitert.)
-#ccm.upgrade.package=ccm-cms
-#ccm.upgrade.from.version=6.6.2
-#ccm.upgrade.to.version=6.6.3
-
-
-# ---------------------------------------------------------------------
-# Update von rel. 1.1.2 auf 1.1.3
-# Müssen NACH den Updates 1.1.1 -> 1.1.2 durchgeführt werden
-# ---------------------------------------------------------------------
-# Alle Versionen / Bundles: 
-# (hb r903: Navigation legacy free)
-#ccm.upgrade.package=ccm-ldn-navigation
-#ccm.upgrade.from.version=6.6.1
-#ccm.upgrade.to.version=6.6.2
-
-# Alle Versionen / Bundles: 
-# (hb r908 cms new style legacy compatible instead of old style / kernel.package)
-#ccm.upgrade.package=ccm-cms
-#ccm.upgrade.from.version=6.6.1
-#ccm.upgrade.to.version=6.6.2
-
-# ---------------------------------------------------------------------
-# Update von rel. 1.1.1 auf 1.1.2 
-# Müssen NACH den Updates 1.1.0 -> 1.1.1 durchgeführt werden
-# ---------------------------------------------------------------------
-# Alle Versionen / Bundles: 
-# (hb r894/r914: core portal legacy free)
-#ccm.upgrade.package=ccm-core
-#ccm.upgrade.from.version=6.6.2
-#ccm.upgrade.to.version=6.6.3
-
-# Alle Versionen / Bundles: 
-# (hb 799: former type address renamed to simpleaddress)
-#ccm.upgrade.package=ccm-cms-types-simpleaddress
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-# Alle Versionen / Bundles: 
-# (hb r800: rename ccm-ldn-theme to ccm-themedirector) 
-#ccm.upgrade.package=ccm-themedirector
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-# Alle Versionen / Bundles: 
-# (hb r818: rename ccm-ldn-portal to ccm-portalworkspace)
-#ccm.upgrade.package=ccm-portalworkspace
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-# Alle Versionen / Bundles: 
-# (hb r829: portalworkspace [and themedirector] legacy free)
-#ccm.upgrade.package=ccm-portalworkspace
-#ccm.upgrade.from.version=6.6.1
-#ccm.upgrade.to.version=6.6.2
-
-# Alle Versionen / Bundles: 
-# (hb r829: themedirector [and portalworkspace] legacy free)
-#ccm.upgrade.package=ccm-themedirector
-#ccm.upgrade.from.version=6.6.1
-#ccm.upgrade.to.version=6.6.2
-
-# Alle Versionen / Bundles:
-# (hb r803/806: persistent property private mode added) 
-#ccm.upgrade.package=ccm-forum
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-# Alle Versionen / Bundles: 
-# (hb r833: named related links)
-#ccm.upgrade.package=ccm-cms-assets-relatedlink
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-# Alle Versionen / Bundles: 
-# (hb r836: unused table web_apps removed) 
-#ccm.upgrade.package=ccm-core
-#ccm.upgrade.from.version=6.6.1
-#ccm.upgrade.to.version=6.6.2
-
-# -----------------------------------------------------
-# Update von rel. 1.1.0 auf 1.1.1 mit Erweiterungen sci
-# -----------------------------------------------------
-# Alle Versionen / Bundles: 
-#ccm.upgrade.package=ccm-cms-assets-imagestep
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-# Alle Versionen / Bundles: 
-#ccm.upgrade.package=ccm-cms-assets-notes
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-# Alle Versionen / Bundles: 
-#ccm.upgrade.package=ccm-ldn-navigation
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-# Alle Versionen / Bundles: 
-#ccm.upgrade.package=ccm-ldn-terms
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-# Alle Versionen / Bundles: 
-#ccm.upgrade.package=ccm-cms
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-# Alle Versionen / Bundles: 
-#ccm.upgrade.package=ccm-cms-types-article
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-# Alle Versionen / Bundles: 
-#ccm.upgrade.package=ccm-cms-types-newsitem
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-# Alle Versionen / Bundles: 
-#ccm.upgrade.package=ccm-cms-types-event
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-# Alle Versionen / Bundles: 
-#ccm.upgrade.package=ccm-core
-#ccm.upgrade.from.version=6.6.0
-#ccm.upgrade.to.version=6.6.1
-
-
-# -----------------------------------------------------
-# Update von (intern) rel. 1.0.5 auf 1.1.0 
-# ----------------------------------------------------
-# Nur ZeS (vermutlich noch auf 1.0.4):
-# ccm.upgrade.package=ccm-core
-# ccm.upgrade.from.version=6.5.2
-# ccm.upgrade.to.version=6.5.3
-
-# Nur ZeS:
-# ccm.upgrade.package=ccm-core
-# ccm.upgrade.from.version=6.5.5
-# ccm.upgrade.to.version=6.5.6
-
-# ccm.barkhof und zes
-# ccm.upgrade.package=ccm-cms
-# ccm.upgrade.from.version=6.5.3
-# ccm.upgrade.to.version=6.5.4
-
-# ccm.barkhof und zes
-# ccm.upgrade.package=ccm-ldn-portal
-# ccm.upgrade.from.version=6.5.1
-# ccm.upgrade.to.version=6.5.2
-
-# ccm.barkhof und zes
-# ccm.upgrade.package=ccm-ldn-portal
-# ccm.upgrade.from.version=6.5.2
-# ccm.upgrade.to.version=6.5.3
-
-# ccm.barkhof und zes
-# ccm.upgrade.package=ccm-ldn-terms
-# ccm.upgrade.from.version=6.5.0
-# ccm.upgrade.to.version=6.5.1
-
-# ccm.barkhof und zes
-# ccm.upgrade.package=ccm-ldn-terms
-# ccm.upgrade.from.version=6.5.1
-# ccm.upgrade.to.version=6.5.2
-
diff --git a/environment/project.xml.ifs b/environment/project.xml.ifs
deleted file mode 100644
index 432831fc6..000000000
--- a/environment/project.xml.ifs
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--    project.xml -IfS- containing only those modules used for IAW    -->
-
-<ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
-               xmlns:ccm="http://ccm.redhat.com/ccm-project" 
-              ccmVersion="6.1" 
-                    name="aplaws-ifs" 
-              prettyName="APLAWS plus" 
-                 version="1-0-9" 
-                 release="beta-2" 
-                  webxml="web.xml-aplaws" 
-                  webapp="ROOT" 
-      xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
-
-  <ccm:build>
-
-<!--   Main apps   -->
-<!--   - - - - -   -->
-        <ccm:application name="ccm-core"/>
-        <ccm:application name="ccm-cms"/>
-
-<!--   Content Assets   -->
-<!--   - - - - - - -    -->
-        <ccm:application name="ccm-cms-assets-fileattachment"/>
-        <ccm:application name="ccm-cms-assets-notes"/>
-        <ccm:application name="ccm-cms-assets-relatedlink"/>
-
-<!--   Content Types   -->
-<!--   - - - - - - -    -->
-<!--    <ccm:application name="ccm-cms-types-address"/>              -->
-<!--    <ccm:application name="ccm-cms-types-agenda"/>               -->
-        <ccm:application name="ccm-cms-types-article"/>
-        <ccm:application name="ccm-cms-types-baseAddress"/>
-        <ccm:application name="ccm-cms-types-baseContact"/>
-        <ccm:application name="ccm-cms-types-bookmark"/>
-<!--    <ccm:application name="ccm-cms-types-contact"/>              -->
-<!--    <ccm:application name="ccm-cms-types-esdservice"/>           -->
-        <ccm:application name="ccm-cms-types-event"/>
-<!--         faqitem not needed by IfS              -->
-<!--    <ccm:application name="ccm-cms-types-faqitem"/>              -->
-        <ccm:application name="ccm-cms-types-filestorageitem"/>
-        <ccm:application name="ccm-cms-types-formitem"/>
-        <ccm:application name="ccm-cms-types-formsectionitem"/>
-        <ccm:application name="ccm-cms-types-genericorganization"/>
-<!--         glossaryitem not needed by IfS, too              -->
-<!--    <ccm:application name="ccm-cms-types-glossaryitem"/>         -->
-<!--    <ccm:application name="ccm-cms-types-htmlform"/>             -->
-<!--    <ccm:application name="ccm-cms-types-inlinesite"/>           -->
-<!--    <ccm:application name="ccm-cms-types-job"/>                  -->
-<!--    <ccm:application name="ccm-cms-types-legalnotice"/>          -->
-<!--    <ccm:application name="ccm-cms-types-minutes"/>              -->
-<!--    <ccm:application name="ccm-cms-types-motditem"/>             -->
-        <ccm:application name="ccm-cms-types-mparticle"/>
-        <ccm:application name="ccm-cms-types-newsitem"/>
-<!--    <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-organizationalunit"/>               
-        <ccm:application name="ccm-cms-types-person"/>               
-<!--    <ccm:application name="ccm-cms-types-siteproxy"/>            -->
-        <ccm:application name="ccm-cms-types-researchnetwork"/>               
-<!--         xmlfeed is not needed by IfS, too                   -->
-<!--    <ccm:application name="ccm-cms-types-xmlfeed"/>              -->      
-
-<!--  Applications   -->
-<!--  - - - - -  -   -->
-<!--    <ccm:application name="ccm-auth-http"/>                      -->
-<!--    <ccm:application name="ccm-bookmarks"/>                      -->
-<!--    temporarily excluded, produces errors in the build process
-        <ccm:application name="ccm-docmngr"/>                        -->
-<!--    <ccm:application name="ccm-formbuilder-pdf"/>                -->
-        <ccm:application name="ccm-forum"/>
-        <ccm:application name="ccm-simplesurvey"/>
-        <ccm:application name="ccm-user-preferences"/>
-<!--    <ccm:application name="ccm-weblog"/>                         -->
-<!--    <ccm:application name="ccm-webpage"/>                        -->
-
-<!--  LDN extension  -->
-<!--  - - - - - - -  -->
-<!--    <ccm:application name="ccm-ldn-aplaws"/>                     -->
-<!--    <ccm:application name="ccm-ldn-atoz"/>                       -->
-<!--    <ccm:application name="ccm-ldn-dublin"/>                     -->
-<!--    <ccm:application name="ccm-ldn-exporter"/>                   -->
-<!--    <ccm:application name="ccm-ldn-freeform"/>                   -->
-        <ccm:application name="ccm-ldn-image-step"/>
-<!--    <ccm:application name="ccm-ldn-importer"/>                   -->
-        <ccm:application name="ccm-ldn-navigation"/>
-        <ccm:application name="ccm-ldn-portal"/>
-        <ccm:application name="ccm-ldn-rss"/>                        
-        <ccm:application name="ccm-ldn-search"/>
-        <ccm:application name="ccm-ldn-shortcuts"/>
-        <ccm:application name="ccm-ldn-subsite"/>                    
-        <ccm:application name="ccm-ldn-terms"/>
-        <ccm:application name="ccm-ldn-theme"/>
-        <ccm:application name="ccm-ldn-util"/>
-
-
-<!--  IfS extension  -->
-<!--  - - - - - - -  -->
-        <ccm:application name="ccm-ifs-aplaws"/>
-
-
-
-<!-- tools will be downloaded from trunk, but does not
-     contain java code to be compiled!
-        <ccm:application name="tools"/>           -->
-
-
-  </ccm:build>
-</ccm:project>
diff --git a/tools-ng/README b/tools-ng/README
index ffd94eaf7..6bcc3cf75 100644
--- a/tools-ng/README
+++ b/tools-ng/README
@@ -7,12 +7,14 @@ new CCM / APLAWS, standards compliant deployment and execution context.
 
 
 common/
-  Library of files and schemes which may be used by several development
+  Library of files and schemes which are used by several development
   and user tools (ecdc, maven, and others)
 
 devel/
   Library of files which are requirred by either the test runtime
-  or the compiler to do its work (e.g. jdbc drivers).
+  or the compiler to do its work (e.g. servlet API). Libs included in
+  application.xml's <dendencies> ... </dependencies> segment have to
+  be included here.
 
 distribution/
   Several Files to create software distribution, esp. RPM distribution
@@ -23,6 +25,10 @@ ecdc/
   A simplified development environment with minimal installation and
   preparation prerequisites.
 
+liferay portal server
+  ready to be installed into a CCM Tomcat container.
+  ant task 'install liferay' uses this directory.
+
 maven/
   Maven development environment. 
   Comming soon.
@@ -30,8 +36,5 @@ maven/
 netbeans/
   Netbeans integration. Project file which defines all CCM packages. 
 
-webxml/
-  Utilitiy classes to create a web.xml file from package stub files.
-
 README
   This file
diff --git a/tools-ng/webxml/lib/dom4j.jar b/tools-ng/common/lib/dom4j.jar
similarity index 100%
rename from tools-ng/webxml/lib/dom4j.jar
rename to tools-ng/common/lib/dom4j.jar
diff --git a/tools-ng/common/lib/webxml-mergetool.jar b/tools-ng/common/lib/webxml-mergetool.jar
new file mode 100644
index 000000000..50b8c5e14
Binary files /dev/null and b/tools-ng/common/lib/webxml-mergetool.jar differ
diff --git a/tools-ng/common/webxml-mergetool/nbproject/private/private.xml b/tools-ng/common/webxml-mergetool/nbproject/private/private.xml
index c1f155a78..8505fc191 100644
--- a/tools-ng/common/webxml-mergetool/nbproject/private/private.xml
+++ b/tools-ng/common/webxml-mergetool/nbproject/private/private.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
 </project-private>
diff --git a/tools-ng/common/xsl/build-template.xsl b/tools-ng/common/xsl/build-template.xsl
index fb31a804c..335c27a9f 100755
--- a/tools-ng/common/xsl/build-template.xsl
+++ b/tools-ng/common/xsl/build-template.xsl
@@ -68,6 +68,15 @@
   <xsl:template name="SharedProperties">
      <!-- Invoked by template Main at the beginning, setup the basic conf  -->
 
+    <!-- Ensure minmal required ant version                                 -->
+    <fail message="Unsufficient ANT version. At least version 1.7 required.">
+        <condition>
+            <not>
+                <antversion atleast="1.7.0" />
+            </not>
+        </condition>
+    </fail> 
+
     <!-- set basic build variables base on project.xml tags name, prettyName, webapp -->
     <xsl:variable select="@name"       name="name"/>
     <xsl:variable select="@prettyName" name="prettyName" />
@@ -198,12 +207,12 @@
             <xsl:value-of select="@webxml"/>
           </xsl:attribute>
         </property>
+        <echo message="web.xml file requested: ${{webxml.source.file}}" />
       </xsl:when>
       <xsl:otherwise>
-        <property name="webxml.source.file" value="web.ccm-core.xml"/>
+        <echo message="No custom web.xml file requested, using standard web.xml" />
       </xsl:otherwise>
     </xsl:choose>
-    <echo message="web.xml file requested: ${{webxml.source.file}}" />
 
     <!-- Determines the portlet.xml file to use. If the project.xml file 
          contains a ccm:project/portlet.xml property this name is used to 
@@ -220,10 +229,7 @@
        <echo message="portlet.xml file requested: ${{portletxml.source.file}}" />
       </xsl:when>
       <xsl:otherwise>
-        <!--
-        <property name="webxml.source.file" value="web.ccm-core.xml"/>
-        -->
-        <echo message="NO portlet.xml file requested." />
+        <echo message="NO custom portlet.xml file requested." />
       </xsl:otherwise>
     </xsl:choose>
 
@@ -232,14 +238,9 @@
         <include name="conf"/>
       </dirset>
       <pathelement path="${{java.class.path}}"/>
-      <!-- does no longer exist in APLAWS 1.0.4 and beyond
-      <fileset dir="${{ccm.tools.dir}}">
-        <include name="lib/security/*.jar"/>
-      </fileset>
-      --> 
     </path>
 
-    <taskdef resource="net/sf/antcontrib/antcontrib.properties">
+    <taskdef resource="net/sf/antcontrib/antlib.xml">
       <classpath>
         <pathelement location="${{ccm.tools.lib.dir}}/ant-contrib.jar"/>
       </classpath>
@@ -249,6 +250,14 @@
         <pathelement location="${{ccm.tools.rh-jdo.dir}}"/>
       </classpath>
     </taskdef>
+    <taskdef name="webxmlmerge" classname="com.arsdigita.ant.WebXMLMergeTask">
+      <classpath>
+        <pathelement location="${{ccm.tools.lib.dir}}/webxml-mergetool.jar"/>
+        <pathelement location="${{ccm.tools.lib.dir}}/dom4j.jar"/>
+        <pathelement location="${{ccm.tools.lib.dir}}/xerces.jar"/>
+        <pathelement location="${{ccm.tools.lib.dir}}/xercesImpl.jar"/>
+      </classpath>
+    </taskdef>
   </xsl:template>   <!-- template SharedProperties-->
 
 
@@ -1113,7 +1122,7 @@
         </target>
       </xsl:if>
 
-      <!-- Deploy web -->
+      <!-- Deploy web (copy the module's web tree to deploy target)-->
       <target name="deploy-web-{$name}" depends="init">
         <copy todir="${{this.deploy.dir}}">
           <fileset dir="{$name}">
@@ -1249,11 +1258,25 @@
     </target>
 
 
+ 
+    <!-- Builds web.xml either by copying a predefined file from bundle or
+         by merging each modules web.xml stubs into a base file, existing
+         in core.
+         Uses check-webxml to check if the bundle contains a predefined file. 
+         If if does, copy-webxml copies the file, otherwise merge-webxml
+         creates one.
+    -->
+    <target name="build-webxml"
+            depends="check-webxml,copy-webxml,merge-webxml">
+        <echo>Processing web.xml done.</echo>
+    </target>
+
     <!-- Determines whether web.xml as specified in webxml.source.file exists, 
          and determines its fully qualified file name. Uses copy-bundle-init to
          ensure the proper installation bundle.  
          Property "resolved.webxml.source.file" is set to the source.        -->
-    <target name="copy-webxml-init" depends="copy-bundle-init,init">
+    <target name="check-webxml" depends="copy-bundle-init,init"
+            if="webxml.source.file"                           >
       <available file="${{this.deploy.dir}}/WEB-INF" type="dir"
                  property="root.webapp.exists"/>
       <!--           
@@ -1271,6 +1294,7 @@
         </and>
       </condition>
       <!-- Otherwise the file should already be in WEB-INF                   -->
+      <!--
       <condition property="resolved.webxml.source.file"
                  value="${{this.deploy.dir}}/WEB-INF/${{webxml.source.file}}">
         <and>
@@ -1281,58 +1305,46 @@
           </not>
         </and>
       </condition>
+      -->
       
-      <echo message="web.xml to use: ${{resolved.webxml.source.file}}" />
+      <echo message="web.xml spezfied: ${{resolved.webxml.source.file}}" />
     </target>
 
-    <!-- Uses target copy-webxml-init to determines which web.xml should  
-         be used (as specified in project.xml), copies this file into  
-         WEB-INF.xml and invokes merge-xml to merge the web.*.xml stub of 
-         each module (it exist) into that file as necessary                  -->
+    <!-- Copies the web.xml file as specified in bundle's project.xml,
+         provided check-webxml found ssuch a specification.  
+         It does just the copy operation, no further processing.             -->
     <target name="copy-webxml"
-            depends="init,copy-webxml-init" if="root.webapp.exists">
+            depends="init,check-webxml" if="resolved.webxml.source.file">
       <copy file="${{resolved.webxml.source.file}}"
           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.ccm-*.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"/>
-        <!-- manager property javax avoids dependency on bsf which introduced  
-             a lot of cross-OS problems                                      -->
-        <script language="javascript" manager="javax">
-            <classpath>
-                <fileset dir="tools-ng/webxml/lib" includes="*.jar"/>
-            </classpath>
-            importClass(java.lang.System);
-            <!-- Fixed Bug in combination with version ant-apache-bsf tasks 
-                 1.7.1/bsf-2.4.0. by prefixing non Java API packages with "Packages" cf: 
-                 http://wiki.apache.org/ant/AntOddities#Using_your_own_classes_inside_.3Cscript.3E. 
+    <target name="merge-webxml" depends="init"
+            unless="resolved.webxml.source.file">
+        <echo>Start to merge web.xml file.</echo>
+
+        <property name="originalWebXML" 
+                 value="${{this.deploy.dir}}/WEB-INF/web.xml"/>
+        <property name="mergedWebXML" value="${{originalWebXML}}.merged"/>
+        <for param="file">
+            <path>
+                <fileset dir="${{this.deploy.dir}}/WEB-INF/web.d/" 
+                         includes="web.ccm-*.xml"/>
+            </path>
+            <sequential>
+                <echo message="Merging in: @{{file}}"/>
+                <webxmlmerge originalfile="${{originalWebXML}}"
+                                mergefile="@{{file}}" 
+                                 destfile="${{mergedWebXML}}"    /> 
+
+                <!-- the merged file becomes the new original web.xml                -->
+                <copy   file="${{mergedWebXML}}" 
+                      tofile="${{originalWebXML}}" 
+                   overwrite="yes"/>
+                <delete file="${{mergedWebXML}}"/>
+            </sequential>    
+        </for>
 
-                 Need for bsf removed now by introducing manager="javax" above so this 
-                 fix (introduced in r2016) may be removed (Dec. 2009 r2045)
-            -->
-            importClass(Packages.com.liferay.portal.tools.WebXMLBuilder);
-            importClass(Packages.com.liferay.portal.kernel.util.FileUtil);
-            importClass(Packages.com.liferay.portal.util.FileImpl);
-            importClass(Packages.com.liferay.portal.xml.SAXReaderImpl);
-            importClass(Packages.com.liferay.portal.kernel.xml.SAXReaderUtil);
-            new FileUtil().setFile(FileImpl.getInstance());
-            new SAXReaderUtil().setSAXReader(new SAXReaderImpl());
-            <!-- takes the original web.xml file, merges the web.*.xml stub file
-                 from a package to include and merges both into mergedWebXML -->
-            var builder = new WebXMLBuilder(originalWebXML, customWebXML, mergedWebXML);
-        </script>
-        <!-- the merged file becomes the new original web.xml                -->
-        <copy tofile="${{originalWebXML}}" file="${{mergedWebXML}}" overwrite="yes"/>
-        <delete file="${{mergedWebXML}}"/>
     </target>    
 
 
@@ -1488,7 +1500,7 @@
 
     <!-- Master deploy -->
     <target name="deploy"
-         depends="init,deploy-global,deploy-local,copy-webxml,build-portletxml,copy-bundle">
+         depends="init,deploy-global,deploy-local,build-webxml,build-portletxml,copy-bundle">
       <xsl:attribute name="description">
           Builds and deploys all applications, also deploys prebuilt applications and config files
       </xsl:attribute>
diff --git a/tools-ng/ecdc/scriptlib/build-ccm.xml b/tools-ng/ecdc/scriptlib/build-ccm.xml
index 292164507..51005abd0 100644
--- a/tools-ng/ecdc/scriptlib/build-ccm.xml
+++ b/tools-ng/ecdc/scriptlib/build-ccm.xml
@@ -21,26 +21,26 @@
 <project name="load">
 
     <target name="load-bundle" depends="prepare-load">
-		<echo>Loading bundle from ${this.bundle.folder} into ${ccmhome}</echo>
+        <echo>Loading bundle from ${this.bundle.folder} into ${ccmhome}</echo>
 
-		<java classname="com.arsdigita.packaging.MasterTool"  fork="true">
+        <java classname="com.arsdigita.packaging.MasterTool"  fork="true">
             <classpath refid="ccm.classpath" />
-            <sysproperty key="ccm.home" value="${ccmhome}" /> 
-		    <arg line="load --packagekeys-file ${this.bundle.folder}/cfg/package-key.list  --parameter-file ${this.bundle.folder}/cfg/integration.properties" />
-		    <jvmarg value="${app.server.debugger}" />
-		</java>
-	</target>
+            <sysproperty key="ccm.home" value="${ccmhome}" />
+            <arg line="load --packagekeys-file ${this.bundle.folder}/cfg/package-key.list  --parameter-file ${this.bundle.folder}/cfg/integration.properties" />
+            <jvmarg value="${app.server.debugger}" />
+        </java>
+    </target>
 
-	<target name="load-bundle-interactive" depends="prepare-load">
-		<echo>Loading bundle ${this.bundle.folder} interactively into ${ccmhome}</echo>
+    <target name="load-bundle-interactive" depends="prepare-load">
+        <echo>Loading bundle ${this.bundle.folder} interactively into ${ccmhome}</echo>
 
-		<java classname="com.arsdigita.packaging.MasterTool"  fork="true">
+        <java classname="com.arsdigita.packaging.MasterTool"  fork="true">
             <classpath refid="ccm.classpath" />
-		    <sysproperty key="ccm.home" value="${ccmhome}" />
-		    <arg line="load --packagekeys-file ${this.bundle.folder}/cfg/package-key.list --interactive  --parameter-file ${this.bundle.folder}/cfg/integration.properties" />
-		    <jvmarg value="${app.server.debugger}" />
-		</java>
-	</target>
+            <sysproperty key="ccm.home" value="${ccmhome}" />
+            <arg line="load --packagekeys-file ${this.bundle.folder}/cfg/package-key.list --interactive  --parameter-file ${this.bundle.folder}/cfg/integration.properties" />
+            <jvmarg value="${app.server.debugger}" />
+        </java>
+    </target>
 
     <target name="load-bundle-config" depends="prepare-load">
         <echo>Registers configuration from ${this.bundle.folder} for ${applications} into registry</echo> 
@@ -62,19 +62,19 @@
         </java> 
     </target>
 
-	<target name="load" depends="prepare-load">
- 	    <echo>load ${applications} without further configuration specifications but using build in defaults.</echo>
- 	    <java classname="com.arsdigita.packaging.MasterTool" 
+    <target name="load" depends="prepare-load">
+        <echo>load ${applications} without further configuration specifications but using build in defaults.</echo>
+        <java classname="com.arsdigita.packaging.MasterTool" 
               classpathref="ccm.classpath" fork="true">
- 	          <sysproperty key="ccm.home" value="${ccmhome}" />
+            <sysproperty key="ccm.home" value="${ccmhome}" />
               <!--
  	              <sysproperty key="log4j.configuration"
                                value="file:runtime/${app.server.bundles.name}/conf/log4j.xml" />
  	              <sysproperty key="java.protocol.handler.pkgs"
                            value="${java.protocol.handler.pkgs}" />
               -->
- 	          <arg line="load  ${applications} " />
-		    <jvmarg value="${app.server.debugger}" />
+            <arg line="load  ${applications} " />
+            <jvmarg value="${app.server.debugger}" />
         </java>
     </target>
 
diff --git a/tools-ng/ecdc/scriptlib/build-common.xml b/tools-ng/ecdc/scriptlib/build-common.xml
index ff5d30198..c410ffdcb 100644
--- a/tools-ng/ecdc/scriptlib/build-common.xml
+++ b/tools-ng/ecdc/scriptlib/build-common.xml
@@ -41,7 +41,7 @@
       <fileset dir="${ccm.tools.lib.dir}" includes="*.jar" />
     </path>
 
-    <taskdef resource="net/sf/antcontrib/antcontrib.properties">
+    <taskdef resource="net/sf/antcontrib/antlib.xml">
       <classpath>
         <pathelement location="${ccm.tools.lib.dir}/ant-contrib.jar"/>
       </classpath>
diff --git a/tools-ng/ecdc/scriptlib/build-runtime.xml b/tools-ng/ecdc/scriptlib/build-runtime.xml
index e9a4102bc..93dc0779f 100644
--- a/tools-ng/ecdc/scriptlib/build-runtime.xml
+++ b/tools-ng/ecdc/scriptlib/build-runtime.xml
@@ -80,7 +80,7 @@
         <delete dir="${app.server.webapp.dir}/portal"/>
     </target>
 
-	<target name="start" description="Start the Tomcat server">
+    <target name="start" description="Start the Tomcat server">
         <if>
             <equals arg1="${app.server.debug.on}" arg2="true" />
             <then>
@@ -94,34 +94,37 @@
             </else>
         </if>
 
-		<java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
+        <java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
 
-			<!--  nolonger needed ? (if anything works as expected)   
-			      seems to be needed if sysproperty javax....xerces...SAYParser ....  below is set.-->
-			<sysproperty key="java.endorsed.dirs" value="${app.server.shared.dir}/endorsed" />
-			<!-- -->
+        <!-- nolonger needed ? (if anything works as expected)   
+             seems to be needed if sysproperty javax....xerces...SAYParser ....  
+             below is set.-->
+            <!--
+            <sysproperty key="java.endorsed.dirs" 
+                     value="${app.server.shared.dir}/endorsed" />
+        -->
 
-            <!-- Previously required to prevent Tomcat from using AElfred to check web.xml / taglibs  -->
-			<!-- seems to work now without, please comment in if something goes wrong with XML processing
-			<sysproperty key="javax.xml.transform.TransformerFactory" value="com.icl.saxon.TransformerFactoryImpl" />
-			<sysproperty key="javax.xml.parsers.DocumentBuilderFactory" value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl" />
-			<sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl" />
-			-->
+        <!-- Previously required to prevent Tomcat from using AElfred to check web.xml / taglibs  -->
+        <!-- seems to work now without, please comment in if something goes wrong with XML processing
+        <sysproperty key="javax.xml.transform.TransformerFactory" value="com.icl.saxon.TransformerFactoryImpl" />
+        <sysproperty key="javax.xml.parsers.DocumentBuilderFactory" value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl" />
+        <sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl" />
+        -->
 
-		    <!-- standard parameter to Tomcat operation  -->
-		    <sysproperty key="catalina.home" value="${app.server.home.dir}" />
-		    <sysproperty key="catalina.base" value="${app.server.home.dir}" />
-		    <sysproperty key="catalina.config" value="file:///${app.server.conf.dir}/catalina.properties" />
-		    <jvmarg value="-Xms256m" />
-		    <jvmarg value="-Xmx512m" />
-		    <jvmarg value="-XX:PermSize=128m" />
-		    <jvmarg value="-XX:MaxPermSize=128m" />
-		    <jvmarg value="${app.server.debugger}" />
-		    <classpath>
-		        <pathelement path="${app.server.home.dir}/bin/bootstrap.jar:${app.server.home.dir}/bin/tomcat-juli.jar" />
-		    </classpath>
-		</java>
-	</target>
+        <!-- standard parameter to Tomcat operation  -->
+            <sysproperty key="catalina.home" value="${app.server.home.dir}" />
+            <sysproperty key="catalina.base" value="${app.server.home.dir}" />
+            <sysproperty key="catalina.config" value="file:///${app.server.conf.dir}/catalina.properties" />
+            <jvmarg value="-Xms256m" />
+            <jvmarg value="-Xmx512m" />
+            <jvmarg value="-XX:PermSize=128m" />
+            <jvmarg value="-XX:MaxPermSize=128m" />
+            <jvmarg value="${app.server.debugger}" />
+            <classpath>
+                <pathelement path="${app.server.home.dir}/bin/bootstrap.jar:${app.server.home.dir}/bin/tomcat-juli.jar" />
+            </classpath>
+        </java>
+    </target>
 
     <target name="stop" description="Stop the Tomcat server">
         <java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
diff --git a/tools-ng/webxml/lib/jackrabbit-text-extractors.jar b/tools-ng/webxml/lib/jackrabbit-text-extractors.jar
deleted file mode 100644
index d3311aab6..000000000
Binary files a/tools-ng/webxml/lib/jackrabbit-text-extractors.jar and /dev/null differ
diff --git a/tools-ng/webxml/lib/portal-copyright.txt b/tools-ng/webxml/lib/portal-copyright.txt
deleted file mode 100644
index 7cf7cd3e0..000000000
--- a/tools-ng/webxml/lib/portal-copyright.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * 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.
- */
diff --git a/tools-ng/webxml/lib/portal-impl-5.2.3.jar b/tools-ng/webxml/lib/portal-impl-5.2.3.jar
deleted file mode 100644
index 6bc083e7e..000000000
Binary files a/tools-ng/webxml/lib/portal-impl-5.2.3.jar and /dev/null differ
diff --git a/tools-ng/webxml/lib/portal-kernel-5.2.3.jar b/tools-ng/webxml/lib/portal-kernel-5.2.3.jar
deleted file mode 100644
index 283af6ee1..000000000
Binary files a/tools-ng/webxml/lib/portal-kernel-5.2.3.jar and /dev/null differ
diff --git a/tools-ng/webxml/lib/util-java-5.2.3.jar b/tools-ng/webxml/lib/util-java-5.2.3.jar
deleted file mode 100644
index 054bfb128..000000000
Binary files a/tools-ng/webxml/lib/util-java-5.2.3.jar and /dev/null differ