diff --git a/ccm-core/application.xml b/ccm-core/application.xml
index f48292694..c2637a2b5 100755
--- a/ccm-core/application.xml
+++ b/ccm-core/application.xml
@@ -3,7 +3,7 @@
   name="ccm-core"
   prettyName="Core"
   version="6.6.6"
-  release="2"
+  release="3"
   shared="true"
   webapp="ROOT"
   buildHooks="build-hooks.xml">
diff --git a/ccm-core/web/WEB-INF/web.d/web.default-ccm-core.xml b/ccm-core/web/WEB-INF/web.d/web.default-ccm-core.xml
index f0d54bcb3..98687e8f9 100644
--- a/ccm-core/web/WEB-INF/web.d/web.default-ccm-core.xml
+++ b/ccm-core/web/WEB-INF/web.d/web.default-ccm-core.xml
@@ -87,17 +87,6 @@
         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>
diff --git a/ccm-core/web/WEB-INF/web.d/web.optional-ccm-core.xml b/ccm-core/web/WEB-INF/web.d/web.optional-ccm-core.xml
index 53969009c..f160f0396 100755
--- a/ccm-core/web/WEB-INF/web.d/web.optional-ccm-core.xml
+++ b/ccm-core/web/WEB-INF/web.d/web.optional-ccm-core.xml
@@ -31,6 +31,26 @@ To turn on database health monitoring:
     <url-pattern>/__ccm__/monitoring/db-test</url-pattern>
   </servlet-mapping>
 
+<!--
+    pre core 6.6.6 release 3 used to register modules not installed into the
+    same context as core. Set up a list of modules to resolve request to 
+    resources as JSP and XML files.
+    Removed without direct replacement. May no longer work at all.
+    
+    IF cross context access my re required in the future, a standard compatible
+    way should be implemented.
+      
+    <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>
+-->
+
 The prefixer servlet adds prefixes to chosen classes of requests.
 This is useful if you wish to migrate users off the old dispatcher to
 the new dispatcher, which uses a prefix for URLs.  The following
diff --git a/ccm-core/web/WEB-INF/web.xml b/ccm-core/web/WEB-INF/web.xml
index f0d54bcb3..98687e8f9 100644
--- a/ccm-core/web/WEB-INF/web.xml
+++ b/ccm-core/web/WEB-INF/web.xml
@@ -87,17 +87,6 @@
         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>
diff --git a/ccm-sci-bundle/bundles/devel/cfg/PlutoInjection.xml.in b/ccm-sci-bundle/bundles/devel/cfg/PlutoInjection.xml.in
deleted file mode 100644
index a76a7b73f..000000000
--- a/ccm-sci-bundle/bundles/devel/cfg/PlutoInjection.xml.in
+++ /dev/null
@@ -1,21 +0,0 @@
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     Apache Pluto 
-     portlet injection code 
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <servlet>
-    <servlet-name>ContentItemJSRPortlet</servlet-name>
-    <servlet-class>
-       org.apache.pluto.container.driver.PortletServlet
-    </servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>ContentItemJSRPortlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>ContentItemJSRPortlet</servlet-name>
-    <url-pattern>/PlutoInvoker/ContentItemJSRPortlet</url-pattern>
-  </servlet-mapping>
diff --git a/ccm-sci-bundle/bundles/devel/cfg/sci-web-woPluto.xml b/ccm-sci-bundle/bundles/devel/cfg/sci-web-woPluto.xml
deleted file mode 100644
index 5370898e2..000000000
--- a/ccm-sci-bundle/bundles/devel/cfg/sci-web-woPluto.xml
+++ /dev/null
@@ -1,569 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app         xmlns="http://java.sun.com/xml/ns/j2ee"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-               version="2.4">
-
-  <display-name>Scientific CMS</display-name> 
-  <description>Content and Collaboration Management for Scientific Institutions</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>
-
-
-  <!-- Require secure connection by redirect to host-port part
-       of parameter waf.web.secure_server               
-  <filter>
-    <filter-name>secured</filter-name>
-    <filter-class>com.arsdigita.web.SecureFilter</filter-class>
-  </filter>
-  -->
-  <!-- Initialize Profiler timers
-       NOT USED with standard / production                                  
-  <filter>
-    <filter-name>profiler</filter-name>
-    <filter-class>com.arsdigita.profiler.ProfilerFilter</filter-class>
-  </filter>
-  -->
-
-  <filter>
-    <filter-name>shortcuts</filter-name>
-    <filter-class>com.arsdigita.shortcuts.ShortcutFilter</filter-class>
-  </filter>
-
-  <filter>
-    <filter-name>subsite</filter-name>
-    <filter-class>com.arsdigita.subsite.SubsiteFilter</filter-class>
-  </filter>
-
-<!--    NOT USED HERE
-  <filter-mapping>
-    <filter-name>secured</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-
-  <filter-mapping>
-    <filter-name>profiler</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
--->
-
-
-  <filter-mapping>
-    <filter-name>subsite</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-
-  <filter-mapping>
-    <filter-name>shortcuts</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     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>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    Apache Pluto 
-    portlet injection code 
-    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <!--<servlet>
-        <servlet-name>ContentItemJSRPortlet</servlet-name>
-        <servlet-class>
-            org.apache.pluto.container.driver.PortletServlet
-        </servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>ContentItemJSRPortlet</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>ContentItemJSRPortlet</servlet-name>
-        <url-pattern>/PlutoInvoker/ContentItemJSRPortlet</url-pattern>
-    </servlet-mapping>-->
-        
-
-    
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     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>ccm-dispatcher</servlet-name>
-    <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
-    <load-on-startup>2</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>login</servlet-name>
-    <servlet-class>com.arsdigita.ui.login.LoginServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>webadmin</servlet-name>
-    <servlet-class>com.arsdigita.ui.admin.AdminServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>webadmin-permissions</servlet-name>
-    <servlet-class>com.arsdigita.ui.permissions.PermissionsServlet</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>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     ADDITIONAL SERVLET DECLARATIONS SECTION 
-     basically requirred by ccm-cms
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-  <servlet>
-    <servlet-name>content-center</servlet-name>
-    <servlet-class>com.arsdigita.cms.ContentCenterServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>content-section</servlet-name>
-    <servlet-class>com.arsdigita.cms.ContentSectionServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>cms-service</servlet-name>
-    <servlet-class>com.arsdigita.cms.ServiceServlet</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>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     MODULES SERVLET DECLARATIONS SECTION
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-
-  <!-- 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    -->  
-
-  <servlet>
-    <servlet-name>portalworkspace-files</servlet-name>
-    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
-    <init-param>
-      <param-name>template-path</param-name>
-      <param-value>/templates/ccm-portalworkspace</param-value>
-    </init-param>
-  </servlet>
-
-  <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-navigation</param-value>
-    </init-param>
-    <init-param>
-      <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.navigation.NavigationFileResolver</param-value>
-    </init-param>
-  </servlet>
-
-  <servlet>
-    <servlet-name>portlet-type-xsl</servlet-name>
-    <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
-  </servlet>
- 
-  <!-- module ccm-rssfeed  -  servlet declaration BEGIN   -->
-  <servlet>
-    <servlet-name>rssfeed-files</servlet-name>
-    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
-    <init-param>
-      <param-name>template-path</param-name>
-      <param-value>/templates/ccm-rssfeed</param-value>
-    </init-param>
-    <init-param>
-      <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.rssfeed.RSSFileResolver</param-value>
-    </init-param>
-  </servlet>
-  <!-- module ccm-rssfeed  -  servlet declaration END   -->
-
-  <!-- module ccm-ldn-search  -  servlet declarations BEGIN   -->
-  <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-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-shortcuts</param-value>
-    </init-param>
-  </servlet>
-
-  <!-- module ccm-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-subsite</param-value>
-    </init-param>
-  </servlet>
-  <!-- module ccm-subsite  -  servlet declarations END  -->
-
-  <!-- module ccm-ldn-terms  -  servlet declarations BEGIN   -->
-  <servlet>
-    <servlet-name>terms-files</servlet-name>
-    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
-    <init-param>
-      <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-terms</param-value>
-    </init-param>
-  </servlet>
-  <!-- module ccm-ldn-terms  -  servlet declarations END   -->
-
-  <!-- module ccm-themedirector  -  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-themedirector</param-value>
-    </init-param>
-  </servlet>
-
-  <servlet>
-     <servlet-name>ThemeDownload</servlet-name>
-     <servlet-class>com.arsdigita.themedirector.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.themedirector.dispatcher.InternalThemePrefixerServlet
-    </servlet-class>
-    <init-param>
-      <param-name>prefix</param-name>
-      <param-value>/theme</param-value>
-    </init-param>
-  </servlet>
-  <!-- module ccm-themedirector  -  servlet declarations END   -->
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     MODULES SERVLET MAPPINGS SECTION
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-
-  <!-- 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    -->
-
-  <servlet-mapping>
-    <servlet-name>portlet-type-xsl</servlet-name>
-    <url-pattern>/themes/servlet/portlet-type/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>portalworkspace-files</servlet-name>
-    <url-pattern>/ccm-portalworkspace/files/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>navigation-files</servlet-name>
-    <url-pattern>/ccm-navigation/files/*</url-pattern>
-  </servlet-mapping>
-
-  <!-- module ccm-rssfeed  -  servlet mappings  BEGIN   -->
-  <servlet-mapping>
-    <servlet-name>rssfeed-files</servlet-name>
-    <url-pattern>/ccm-rssfeed/files/*</url-pattern>
-  </servlet-mapping>
-  <!-- module ccm-rssfeed  -  servlet mappings  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  -->
-
-  <!-- module ccm-shortcuts  -  servlet mappings   -->
-  <servlet-mapping>
-    <servlet-name>shortcuts-files</servlet-name>
-    <url-pattern>/ccm-shortcuts/files/*</url-pattern>
-  </servlet-mapping>
-
-  <!-- module ccm-subsite  -  servlet mappings BEGIN  -->
-  <servlet-mapping>
-    <servlet-name>subsite-files</servlet-name>
-    <url-pattern>/ccm-subsite/files/*</url-pattern>
-  </servlet-mapping>
-  <!-- module ccm-subsite  -  servlet mappings END  -->
-
-  <!-- module ccm-ldn-terms  -  servlet mappings BEGIN  -->
-  <servlet-mapping>
-    <servlet-name>terms-files</servlet-name>
-    <url-pattern>/ccm-ldn-terms/files/*</url-pattern>
-  </servlet-mapping>
-  <!-- module ccm-ldn-terms  -  servlet mappings END  -->
-
-  <!-- module ccm-themedirector  -  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-themedirector  -  servlet mappings END   -->
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     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>login</servlet-name>
-    <url-pattern>/login/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>webadmin</servlet-name>
-    <url-pattern>/admin/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>webadmin-permissions</servlet-name>
-    <url-pattern>/admin-permissions/*</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>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     ADDITIONAL SERVLET MAPPINGS SECTION
-     basically requirred by ccm-cms
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-  <servlet-mapping>
-    <servlet-name>content-center</servlet-name>
-    <url-pattern>/templates/servlet/content-center/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>content-section</servlet-name>
-    <url-pattern>/templates/servlet/content-section/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>cms-service</servlet-name>
-    <url-pattern>/templates/servlet/cms-service/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>content-item-xsl</servlet-name>
-    <url-pattern>/templates/servlet/content-item/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>content-type-xsl</servlet-name>
-    <url-pattern>/themes/servlet/content-type/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>template-xsl</servlet-name>
-    <url-pattern>/themes/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
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-  <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-sci-bundle/bundles/devel/cfg/sci-web.xml b/ccm-sci-bundle/bundles/devel/cfg/sci-web.xml
index 57f6004d0..0b992b7d2 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/sci-web.xml
+++ b/ccm-sci-bundle/bundles/devel/cfg/sci-web.xml
@@ -71,49 +71,12 @@
   <listener>
     <listener-class>com.arsdigita.web.CCMApplicationContextListener</listener-class>
   </listener>
+    
 
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     Apache Pluto 
-     portlet injection code 
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <servlet>
-    <servlet-name>ContentItemJSRPortlet</servlet-name>
-    <servlet-class>
-       org.apache.pluto.container.driver.PortletServlet
-    </servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>ContentItemJSRPortlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>ContentItemJSRPortlet</servlet-name>
-    <url-pattern>/PlutoInvoker/ContentItemJSRPortlet</url-pattern>
-  </servlet-mapping>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      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>ccm-dispatcher</servlet-name>
-    <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
-    <load-on-startup>2</load-on-startup>
-  </servlet>
--->
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
   <servlet>
     <servlet-name>ccm-dispatcher</servlet-name>
diff --git a/tools-ng/common/lib/pluto-ant-tasks-2.0.3.jar b/tools-ng/common/lib/pluto-ant-tasks-2.0.3.jar
new file mode 100644
index 000000000..863bd82bb
Binary files /dev/null and b/tools-ng/common/lib/pluto-ant-tasks-2.0.3.jar differ
diff --git a/tools-ng/common/lib/pluto-container-2.0.3.jar b/tools-ng/common/lib/pluto-container-2.0.3.jar
new file mode 100644
index 000000000..15d63ddd8
Binary files /dev/null and b/tools-ng/common/lib/pluto-container-2.0.3.jar differ
diff --git a/tools-ng/common/lib/pluto-container-api-2.0.3.jar b/tools-ng/common/lib/pluto-container-api-2.0.3.jar
new file mode 100644
index 000000000..ce919eb61
Binary files /dev/null and b/tools-ng/common/lib/pluto-container-api-2.0.3.jar differ
diff --git a/tools-ng/common/lib/pluto-util-2.0.3.jar b/tools-ng/common/lib/pluto-util-2.0.3.jar
new file mode 100644
index 000000000..a7846d0c6
Binary files /dev/null and b/tools-ng/common/lib/pluto-util-2.0.3.jar differ
diff --git a/tools-ng/ecdc/scriptlib/build-ccm.xml b/tools-ng/ecdc/scriptlib/build-ccm.xml
index 51005abd0..cf22d2ae9 100644
--- a/tools-ng/ecdc/scriptlib/build-ccm.xml
+++ b/tools-ng/ecdc/scriptlib/build-ccm.xml
@@ -10,16 +10,40 @@
 -->
 
 <!--  Already definded:
-		ccm.project.dir:		base dir of the development project
+		ccm.project.dir:	base dir of the development project
 		app.server.bundles.zip	name of the installation file
 		app.server.parent.dir	name of the dir to install the server into
-		app.server.home.dir	    dir the server is installed into (i.e. CATALINA_HOME)
+		app.server.home.dir	dir the server is installed into (i.e. CATALINA_HOME)
 		app.server.deploy.dir	dir the server is installed into (i.e. CATALINA_BASE)
-		app.server.conf.dir		name of the servers configuration dir
+		app.server.conf.dir	name of the servers configuration dir
 		app.server.webapp.dir	distribution dir for web applications      -->
 
 <project name="load">
 
+    <path id="plutotoolsclasses">
+    <!--
+      Pluto Ant Tasks depend upon the following libraries:
+        * pluto-ant-tasks-${version}.jar
+        * pluto-util-${version}.jar
+        * pluto-descriptor-api-${version}.jar
+        * pluto-descriptor-util-${version}.jar
+        * commons-logging-1.0.4.jar
+        * castor-1.1.1.jar
+    -->
+      <fileset dir="${ccm.tools.lib.dir}" includes="pluto-ant-tasks-*.jar"/>
+      <fileset dir="${ccm.tools.lib.dir}" includes="pluto-util-*.jar"/>
+      <fileset dir="${ccm.tools.lib.dir}" includes="pluto-container-*.jar"/>
+      <fileset dir="${ccm.tools.lib.dir}" includes="pluto-container-api-*.jar"/>
+      <fileset dir="${app.server.webapp.dir}/pluto/WEB-INF/lib" includes="**/*.jar"/>
+    <!--
+      <fileset dir="/path/to/commons-logging" includes="**/*.jar"/>
+      <fileset dir="/path/to/castor" includes="**/*.jar"/>
+    -->
+    </path>
+
+    <typedef name="passemble" classname="org.apache.pluto.ant.AssembleTask"
+                  classpathref="plutotoolsclasses"/>
+
     <target name="load-bundle" depends="prepare-load">
         <echo>Loading bundle from ${this.bundle.folder} into ${ccmhome}</echo>
 
@@ -301,4 +325,20 @@
             <arg line="${ccm.parameters}" />
         </java>
     </target>
+
+    <target name="pluto-assemble">
+        <echo>Inject Pluto portlet initialisation code into ${app.server.webapp.dir}/${this.appContext}/WEB-INF/ </echo>
+
+        <passemble webxml="${app.server.webapp.dir}/${this.appContext}/WEB-INF/web.xml" 
+               portletxml="${app.server.webapp.dir}/${this.appContext}/WEB-INF/portlet.xml" 
+                 destfile="${app.server.webapp.dir}/${this.appContext}/WEB-INF/web.xml.pluto-assembled"/>
+
+        <move   file="${app.server.webapp.dir}/${this.appContext}/WEB-INF/web.xml" 
+              tofile="${app.server.webapp.dir}/${this.appContext}/WEB-INF/web.xml.asdeployed"
+              preservelastmodified="true" overwrite="yes" />
+        <copy   file="${app.server.webapp.dir}/${this.appContext}/WEB-INF/web.xml.pluto-assembled" 
+              tofile="${app.server.webapp.dir}/${this.appContext}/WEB-INF/web.xml"
+              preservelastmodified="true" verbose="true" overwrite="yes" />
+
+    </target>
 </project>
diff --git a/tools-ng/ecdc/scriptlib/build-common.xml b/tools-ng/ecdc/scriptlib/build-common.xml
index c410ffdcb..3c51b67c2 100644
--- a/tools-ng/ecdc/scriptlib/build-common.xml
+++ b/tools-ng/ecdc/scriptlib/build-common.xml
@@ -12,8 +12,8 @@
          ccm.tools.xsl.dir
          ccm.tools.xsd.dir
          ccm.tools.lib.dir
-         ccm.build.lib.dir
          ccm.tools.rh-jdo.dir
+         ccm.build.lib.dir
          ccm.context.dir
          ccm.home
          shared.lib.dist.dir      DEPRECATED  prebuild modules no longer used