diff --git a/ccm-sci-bundle/bundles/local/aap/AUTHORS b/ccm-sci-bundle/bundles/local/aap/AUTHORS
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ccm-sci-bundle/bundles/local/aap/ChangeLog b/ccm-sci-bundle/bundles/local/aap/ChangeLog
deleted file mode 100644
index 786623bdb..000000000
--- a/ccm-sci-bundle/bundles/local/aap/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-* Thu Sep 22 2005 Alan Pevec <apevec@redhat.com>
-- Build all APLAWS+ bundles from the common set of templates.
-
-* Mon Feb 21 2005 Alan Pevec <apevec@redhat.com>
-- Requires applications.
-
-* Mon Jan 26 2004 Daniel Berrange <berrange@redhat.com>
-- Initial build.
-
diff --git a/ccm-sci-bundle/bundles/local/aap/NEWS b/ccm-sci-bundle/bundles/local/aap/NEWS
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ccm-sci-bundle/bundles/local/aap/README b/ccm-sci-bundle/bundles/local/aap/README
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ccm-sci-bundle/bundles/local/aap/bundle.in b/ccm-sci-bundle/bundles/local/aap/bundle.in
deleted file mode 100644
index 093aac421..000000000
--- a/ccm-sci-bundle/bundles/local/aap/bundle.in
+++ /dev/null
@@ -1,4 +0,0 @@
-BUNDLE_NAME=aplaws-plus-zes-devel
-BUNDLE_PRETTY_NAME="APLAWS+ ZeS Devel Bundle"
-VERSION=1.1.2devel
-RELEASE=1
diff --git a/ccm-sci-bundle/bundles/local/aap/cfg/integration.properties b/ccm-sci-bundle/bundles/local/aap/cfg/integration.properties
deleted file mode 100644
index e68d1436e..000000000
--- a/ccm-sci-bundle/bundles/local/aap/cfg/integration.properties
+++ /dev/null
@@ -1,137 +0,0 @@
-# Scientific CMS devel bundle integration.properties
-#
-waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
-#
-; dhtml editor to use (system wide)
-; Xinha is default
-; default: Xinha editor & src=/assets/xinha/XinhaLoader.js
-#waf.bebop.dhtml_editor=FCKeditor
-
-waf.categorization.show_internal_name=true
-waf.categorization.supported_languages=de,en
-
-waf.dispatcher.default_expiry=3600
-;
-waf.kernel.data_permission_check_enabled=false
-waf.kernel.primary_user_identifier=email
-; if you activate screen_name, forum loader does not work.
-; waf.kernel.primary_user_identifier=screen_name
-waf.kernel.supported_languages=de,en
-
-; security.properties: 
-waf.auto_registration_on=false
-
-; Searches for localized style sheet (among others) 
-waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
-waf.templating.stylesheet_paths=/WEB-INF/resources/scientificCMS-stylesheet-paths.txt
-
-core.ui.pagemap.root_page_url=navigation/
-core.ui.pagemap.workspace_url=navigation/
-core.ui.pagemap.user_redirect_url=content/content-center-redirect.jsp
-
-; workflow configuration
-waf.workflow.simple.alerts_enabled=true
-waf.workflow.simple.alerts_sender=root@localhost.localdomain
-
-; Configures the xml processing
-waf.xml.xsl_transformer=xalan
-waf.xml.activate_full_date_formatter=true
-
-# ccm-cms parameters
-
-com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
-
-com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
-com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
-com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver
-
-; Configure dhtml editor for use in cms content-center
-; Xinha is default and should work out of the box
-; com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
-; as a temporary measure a different configuration file which includes a link selection box for CCM items
-; and CCM images should be specified:
-com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/CCMcmsXinhaConfig.js
-
-; to use FCKeditor:
-; com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js
-; com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
-; com.arsdigita.cms.dhtml_editor_hidden_buttons=
-; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
-com.arsdigita.cms.dhtml_editor_plugins=
-
-com.arsdigita.cms.disable_item_pfs=true
-
-com.arsdigita.cms.hide_admin_tabs=true
-com.arsdigita.cms.hide_folder_index_checkbox=true
-com.arsdigita.cms.hide_launch_date=true
-com.arsdigita.cms.hide_templates_tab=true
-com.arsdigita.cms.hide_timezone=true
-com.arsdigita.cms.hide_udct_ui=true
-
-com.arsdigita.cms.use_section_categories=false
-com.arsdigita.cms.use_streamlined_creation=true
-
-
-# ccm-cms-types-event parameters
-com.arsdigita.cms.contenttypes.event.hide_cost=true
-com.arsdigita.cms.contenttypes.event.hide_link_to_map=true
-com.arsdigita.cms.contenttypes.event.use_html_date_description=false
-com.arsdigita.cms.contenttypes.event.start_year=2000
-com.arsdigita.cms.contenttypes.event.end_year_delta=5
-
-
-# ccm-cms-types-newsitem parameters
-com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true
-com.arsdigita.cms.contenttypes.newsitem.start_year=2000
-com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
-
-
-# Forum application
-com.arsdigita.forum.show_new_tabs=true
-com.arsdigita.forum.use_wysiwyg_editor=true
-com.arsdigita.forum.allow_quick_finish=true
-com.arsdigita.forum.disable_page_caching=true
-
-
-# ccm-navigation application
-com.arsdigita.navigation.category_menu_show_grand_children=false
-com.arsdigita.navigation.default_cat_root_path=/navigation/
-com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/sci-default.jsp
-
-
-# ccm-ldn-search application
-com.arsdigita.london.search.show_sponsored_links=true
-
-
-# ccm-ldn-subsite application
-com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
-
-
-# ccm-ldn-themedirector application
-themedirector.default_theme_context=
-#themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf
-themedirector.default_theme_path=themes/static/aplaws-generic
-themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl
-
-
-# =============================================================================================
-# runtime specific configurations
-
-waf.admin.email=webmaster@scientificCMS.org
-waf.admin.name.given=SCI
-waf.admin.name.family=Administrator
-waf.admin.password=sci2000
-waf.admin.password.question=12345
-waf.admin.password.answer=6
-
-waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm-sci?user\=sci&password\=sci47web&stringtype\=unspecified
-waf.runtime.jdbc_pool_size=30
-
-waf.web.server=localhost\:8080
-
-
-# =============================================================================================
-# devel specific configurations
-waf.debug=true
-waf.bebop.fancy_xsl_errors=true
-
diff --git a/ccm-sci-bundle/bundles/local/aap/cfg/project.xml b/ccm-sci-bundle/bundles/local/aap/cfg/project.xml
deleted file mode 100644
index ae8fb9458..000000000
--- a/ccm-sci-bundle/bundles/local/aap/cfg/project.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--  project.xml SCI devel - containing only modules used for ScientificCMS  -->
-
-<ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
-               xmlns:ccm="http://ccm.redhat.com/ccm-project" 
-              ccmVersion="6.1" 
-                    name="ScientificCMS" 
-              prettyName="Scientific CMS" 
-                 version="1-1-6" 
-                 release="devel" 
-                  webxml="web.xml-sci" 
-                  webapp="ROOT" 
-      xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
-
-  <ccm:build>
-
-<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-<!--    Scientific CMS set of CORE packages                                  -->
-<!--    NONE can be omitted for technical reasons / internal dependencies    -->
-<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-
-<!--   Main apps   -->
-        <ccm:application name="ccm-core"/>
-        <ccm:application name="ccm-cms"/>
-
-<!--   Content Assets   -->
-        <ccm:application name="ccm-cms-assets-imagestep"/>
-        <ccm:application name="ccm-cms-assets-relatedlink"/>
-
-<!--   Content Types   -->
-        <ccm:application name="ccm-cms-types-article"/>
-        <ccm:application name="ccm-cms-types-filestorageitem"/>
-        <ccm:application name="ccm-cms-types-formitem"/>
-        <ccm:application name="ccm-cms-types-formsectionitem"/>
-
-<!--   Applications   -->
-        <ccm:application name="ccm-navigation"/>
-        <ccm:application name="ccm-portalworkspace"/>
-        <ccm:application name="ccm-themedirector"/>
-
-<!--   LDN extension  -->
-        <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-util"/>
-
-<!--   SCI extension  -->
-        <ccm:application name="ccm-sci-bundle"/>
-
-
-
-<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-<!--    Scientific CMS  OPTIONAL packages                                    -->
-<!--    Various combinations of packages make up specific editions           -->
-<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-
-<!--   Content Assets   -->
-        <ccm:application name="ccm-cms-assets-fileattachment"/>
-        <ccm:application name="ccm-cms-assets-notes"/>
-
-<!--   Content Types   -->
-        <ccm:application name="ccm-cms-types-address"/>
-        <ccm:application name="ccm-cms-types-bookmark"/>
-        <ccm:application name="ccm-cms-types-contact"/>
-        <ccm:application name="ccm-cms-types-event"/>
-        <ccm:application name="ccm-cms-types-image"/>
-        <ccm:application name="ccm-cms-types-mparticle"/>
-        <ccm:application name="ccm-cms-types-newsitem"/>
-        <ccm:application name="ccm-cms-types-person"/>
-
-<!--   Applications   -->
-        <ccm:application name="ccm-cms-publicpersonalprofile"/>
-        <ccm:application name="ccm-portalserver"/>
-
-<!--   LDN extension  -->
-        <ccm:application name="ccm-ldn-rss"/>                        
-
-<!--   SCI extension  -->
-<!--
-        <ccm:application name="ccm-sci-personalprojects"/>
--->
-        <ccm:application name="ccm-sci-personalpublications"/>
-        <ccm:application name="ccm-sci-publications"/>
-
-        <ccm:application name="ccm-sci-types-member"/>
-
-
-
-<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-<!--    Scientific CMS   potential ADD-ONS packages                          -->
-<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-
-<!--   Content Types   -->
-<!--    
-        <ccm:application name="ccm-cms-types-agenda"/>
-        <ccm:application name="ccm-cms-types-faqitem"/>
-        <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-organization"/>
-        <ccm:application name="ccm-cms-types-pressrelease"/>
-        <ccm:application name="ccm-cms-types-service"/>
-        <ccm:application name="ccm-cms-types-siteproxy"/>
-        <ccm:application name="ccm-cms-types-xmlfeed"/>
--->
-
-<!--   Applications   -->
-<!--
-        <ccm:application name="ccm-auth-http"/>
-        <ccm:application name="ccm-bookmarks"/>
-        <ccm:application name="ccm-docmgr"/>
--->
-        <ccm:application name="ccm-docrepo"/>
-        <ccm:application name="ccm-forum"/>  
-        <ccm:application name="ccm-forum-categorised"/>
-<!--
-        <ccm:application name="ccm-weblog"/>
-        <ccm:application name="ccm-webpage"/>
--->
-
-<!--   LDN extension  -->
-<!--
-        <ccm:application name="ccm-ldn-exporter"/>
-        <ccm:application name="ccm-ldn-freeform"/>
-        <ccm:application name="ccm-ldn-importer"/>
--->
-
-
-  </ccm:build>
-
-
-<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-<!--    Scientific CMS   list of OBSOLETE modules                            -->
-<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-
-<!--   Content Types   -->
-<!--    Without known funcionality
-        <ccm:application name="ccm-cms-types-motditem"/>             -->
-
-<!--   Applications   -->
-<!--    currently doesn't work for unknown reason
-        <ccm:application name="ccm-simplesurvey"/>                   -->
-<!--    Without known funcionality
-        <ccm:application name="ccm-formbuilder-pdf"/>
-        <ccm:application name="ccm-user-preferences"/>               -->
-
-<!--   LDN extension  -->
-<!--    Conflicts with ccm-sci-bundle (this package)                 -->
-<!--    <ccm:application name="ccm-ldn-aplaws"/>                     -->
-<!--    In it's current implementation very ldn / aplaws specific
-        <ccm:application name="ccm-ldn-atoz"/>  
-        <ccm:application name="ccm-ldn-dublin"/>                     -->
-
-
-<!-- tools will be downloaded from trunk, but does not
-     contain java code to be compiled!
-        <ccm:application name="tools"/>           -->
-
-</ccm:project>
diff --git a/ccm-sci-bundle/bundles/local/aap/cfg/web.xml-sci b/ccm-sci-bundle/bundles/local/aap/cfg/web.xml-sci
deleted file mode 100644
index 5babaffe0..000000000
--- a/ccm-sci-bundle/bundles/local/aap/cfg/web.xml-sci
+++ /dev/null
@@ -1,540 +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               
-       NOT USED with ZeS                                        
-  <filter>
-    <filter-name>secured</filter-name>
-    <filter-class>com.arsdigita.web.SecureFilter</filter-class>
-  </filter>
-  -->
-  <!-- Initialize Profiler timers
-       NOT USED with ZeS 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.london.shortcuts.ShortcutFilter</filter-class>
-  </filter>
-
-  <filter>
-    <filter-name>subsite</filter-name>
-    <filter-class>com.arsdigita.london.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>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     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>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     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-ldn-rss  -  servlet declaration BEGIN   -->
-  <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 declaration END   -->
-
-  <!-- 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-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-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-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>/__ccm__/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-ldn-rss  -  servlet mappings   -->
-  <servlet-mapping>
-    <servlet-name>rss-files</servlet-name>
-    <url-pattern>/ccm-ldn-rss/files/*</url-pattern>
-  </servlet-mapping>
-
-  <!-- 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-ldn-shortcuts  -  servlet mappings   -->
-  <servlet-mapping>
-    <servlet-name>shortcuts-files</servlet-name>
-    <url-pattern>/ccm-ldn-shortcuts/files/*</url-pattern>
-  </servlet-mapping>
-
-  <!-- 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  -->
-
-  <!-- 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>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
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-  <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>