diff --git a/ccm-sci-bundle/bundles/local/iaw/AUTHORS b/ccm-sci-bundle/bundles/demo/AUTHORS
similarity index 100%
rename from ccm-sci-bundle/bundles/local/iaw/AUTHORS
rename to ccm-sci-bundle/bundles/demo/AUTHORS
diff --git a/ccm-sci-bundle/bundles/local/iaw/ChangeLog b/ccm-sci-bundle/bundles/demo/ChangeLog
similarity index 100%
rename from ccm-sci-bundle/bundles/local/iaw/ChangeLog
rename to ccm-sci-bundle/bundles/demo/ChangeLog
diff --git a/ccm-sci-bundle/bundles/local/iaw/NEWS b/ccm-sci-bundle/bundles/demo/NEWS
similarity index 100%
rename from ccm-sci-bundle/bundles/local/iaw/NEWS
rename to ccm-sci-bundle/bundles/demo/NEWS
diff --git a/ccm-sci-bundle/bundles/local/iaw/README b/ccm-sci-bundle/bundles/demo/README
similarity index 100%
rename from ccm-sci-bundle/bundles/local/iaw/README
rename to ccm-sci-bundle/bundles/demo/README
diff --git a/ccm-sci-bundle/bundles/local/iaw/bundle.in b/ccm-sci-bundle/bundles/demo/bundle.in
similarity index 100%
rename from ccm-sci-bundle/bundles/local/iaw/bundle.in
rename to ccm-sci-bundle/bundles/demo/bundle.in
diff --git a/ccm-sci-bundle/bundles/demo/cfg/integration.properties b/ccm-sci-bundle/bundles/demo/cfg/integration.properties
new file mode 100644
index 000000000..367634a7e
--- /dev/null
+++ b/ccm-sci-bundle/bundles/demo/cfg/integration.properties
@@ -0,0 +1,142 @@
+# 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-ldn-navigation application
+com.arsdigita.london.navigation.category_menu_show_grand_children=false
+com.arsdigita.london.navigation.default_cat_root_path=/navigation/
+# com.arsdigita.london.navigation.default_template=/packages/navigation/templates/zes-default.jsp
+com.arsdigita.london.navigation.default_template=/templates/ccm-ldn-navigation/navigation/sci-default.jsp
+com.arsdigita.london.navigation.templates_file=WEB-INF/navigation/sci-templates.txt
+
+
+# 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
+
+
+# ccm-sci-bundle (Loader only)
+# com.arsdigita.bundle.category_files=WEB-INF/sci/sci-nav-domain-1.00.xml,WEB-INF/sci/sci-nav-hierarchy-1.00.xml
+
+# =============================================================================================
+# 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/demo/cfg/project.xml b/ccm-sci-bundle/bundles/demo/cfg/project.xml
new file mode 100644
index 000000000..1b6253d3a
--- /dev/null
+++ b/ccm-sci-bundle/bundles/demo/cfg/project.xml
@@ -0,0 +1,166 @@
+<?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-portalworkspace"/>
+        <ccm:application name="ccm-themedirector"/>
+
+<!--   LDN extension  -->
+        <ccm:application name="ccm-ldn-navigation"/>
+        <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 these 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  -->
+<!--    temporyrily excluded because configuration has to be cleared
+        <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/iaw/cfg/web.xml-sci b/ccm-sci-bundle/bundles/demo/cfg/web.xml-sci
similarity index 100%
rename from ccm-sci-bundle/bundles/local/iaw/cfg/web.xml-sci
rename to ccm-sci-bundle/bundles/demo/cfg/web.xml-sci
diff --git a/ccm-sci-bundle/bundles/devel/res/bundle/categories/dummy b/ccm-sci-bundle/bundles/devel/res/bundle/categories/dummy
new file mode 100644
index 000000000..f9c053b8b
--- /dev/null
+++ b/ccm-sci-bundle/bundles/devel/res/bundle/categories/dummy
@@ -0,0 +1 @@
+Dummy file for developing & testing purpose
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/devel/cat/placeholder.info b/ccm-sci-bundle/bundles/devel/res/bundle/categories/placeholder.info
similarity index 100%
rename from ccm-sci-bundle/bundles/devel/cat/placeholder.info
rename to ccm-sci-bundle/bundles/devel/res/bundle/categories/placeholder.info
diff --git a/ccm-sci-bundle/bundles/local/aap/cat/placeholder.info b/ccm-sci-bundle/bundles/devel/res/placeholder.info
similarity index 100%
rename from ccm-sci-bundle/bundles/local/aap/cat/placeholder.info
rename to ccm-sci-bundle/bundles/devel/res/placeholder.info
diff --git a/ccm-sci-bundle/bundles/devel/nav/placeholder.info b/ccm-sci-bundle/bundles/devel/templates/placeholder.info
similarity index 100%
rename from ccm-sci-bundle/bundles/devel/nav/placeholder.info
rename to ccm-sci-bundle/bundles/devel/templates/placeholder.info
diff --git a/ccm-sci-bundle/bundles/devel/themes/README b/ccm-sci-bundle/bundles/devel/themes/README
new file mode 100644
index 000000000..13248d9bb
--- /dev/null
+++ b/ccm-sci-bundle/bundles/devel/themes/README
@@ -0,0 +1,13 @@
+Bundle subdir themes
+
+Purpose:
+This subdir may optionally contain theme files which either replace part of the
+theme or add files to the theme provided as default for ScientificCMS and this
+way adopt the theme for site specific design. 
+
+All files and subdirectories all copied asis to the applications ~/themes 
+directory in its document (context) root.
+
+It is the responsibility of developer / system integrator to ensure all files
+are copied to the right location and the theme works with the modification. No
+functionality or consistency check is perfordmed!
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/devel/themes/master/dummy b/ccm-sci-bundle/bundles/devel/themes/master/dummy
new file mode 100644
index 000000000..beec54a4d
--- /dev/null
+++ b/ccm-sci-bundle/bundles/devel/themes/master/dummy
@@ -0,0 +1 @@
+Just a dummy file for test purpose during development.
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/aap/nav/placeholder.info b/ccm-sci-bundle/bundles/devel/themes/placeholder.info
similarity index 100%
rename from ccm-sci-bundle/bundles/local/aap/nav/placeholder.info
rename to ccm-sci-bundle/bundles/devel/themes/placeholder.info
diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/AUTHORS b/ccm-sci-bundle/bundles/local/iaw-dev/AUTHORS
new file mode 100644
index 000000000..e69de29bb
diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/ChangeLog b/ccm-sci-bundle/bundles/local/iaw-dev/ChangeLog
new file mode 100644
index 000000000..786623bdb
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/iaw-dev/ChangeLog
@@ -0,0 +1,9 @@
+* 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/iaw-dev/NEWS b/ccm-sci-bundle/bundles/local/iaw-dev/NEWS
new file mode 100644
index 000000000..e69de29bb
diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/README b/ccm-sci-bundle/bundles/local/iaw-dev/README
new file mode 100644
index 000000000..e69de29bb
diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/bundle.in b/ccm-sci-bundle/bundles/local/iaw-dev/bundle.in
new file mode 100644
index 000000000..093aac421
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/iaw-dev/bundle.in
@@ -0,0 +1,4 @@
+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/iaw/cfg/integration.properties b/ccm-sci-bundle/bundles/local/iaw-dev/cfg/integration.properties
similarity index 100%
rename from ccm-sci-bundle/bundles/local/iaw/cfg/integration.properties
rename to ccm-sci-bundle/bundles/local/iaw-dev/cfg/integration.properties
diff --git a/ccm-sci-bundle/bundles/local/iaw/cfg/project.xml b/ccm-sci-bundle/bundles/local/iaw-dev/cfg/project.xml
similarity index 100%
rename from ccm-sci-bundle/bundles/local/iaw/cfg/project.xml
rename to ccm-sci-bundle/bundles/local/iaw-dev/cfg/project.xml
diff --git a/ccm-sci-bundle/bundles/local/iaw-dev/cfg/web.xml-sci b/ccm-sci-bundle/bundles/local/iaw-dev/cfg/web.xml-sci
new file mode 100644
index 000000000..390ca7722
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/iaw-dev/cfg/web.xml-sci
@@ -0,0 +1,540 @@
+<?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-ldn-navigation</param-value>
+    </init-param>
+    <init-param>
+      <param-name>file-resolver</param-name>
+      <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value>
+    </init-param>
+  </servlet>
+
+  <servlet>
+    <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-ldn-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>
diff --git a/ccm-sci-bundle/bundles/local/iaw-std/AUTHORS b/ccm-sci-bundle/bundles/local/iaw-std/AUTHORS
new file mode 100644
index 000000000..e69de29bb
diff --git a/ccm-sci-bundle/bundles/local/iaw-std/ChangeLog b/ccm-sci-bundle/bundles/local/iaw-std/ChangeLog
new file mode 100644
index 000000000..786623bdb
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/iaw-std/ChangeLog
@@ -0,0 +1,9 @@
+* 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/iaw-std/NEWS b/ccm-sci-bundle/bundles/local/iaw-std/NEWS
new file mode 100644
index 000000000..e69de29bb
diff --git a/ccm-sci-bundle/bundles/local/iaw-std/README b/ccm-sci-bundle/bundles/local/iaw-std/README
new file mode 100644
index 000000000..e69de29bb
diff --git a/ccm-sci-bundle/bundles/local/iaw-std/bundle.in b/ccm-sci-bundle/bundles/local/iaw-std/bundle.in
new file mode 100644
index 000000000..093aac421
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/iaw-std/bundle.in
@@ -0,0 +1,4 @@
+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/iaw-std/cfg/integration.properties b/ccm-sci-bundle/bundles/local/iaw-std/cfg/integration.properties
new file mode 100644
index 000000000..85795d65f
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/iaw-std/cfg/integration.properties
@@ -0,0 +1,137 @@
+# 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-ldn-navigation application
+com.arsdigita.london.navigation.category_menu_show_grand_children=false
+com.arsdigita.london.navigation.default_cat_root_path=/navigation/
+com.arsdigita.london.navigation.default_template=/packages/navigation/templates/zes-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/iaw-std/cfg/project.xml b/ccm-sci-bundle/bundles/local/iaw-std/cfg/project.xml
new file mode 100644
index 000000000..c53d2a9cf
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/iaw-std/cfg/project.xml
@@ -0,0 +1,164 @@
+<?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-portalworkspace"/>
+        <ccm:application name="ccm-themedirector"/>
+
+<!--   LDN extension  -->
+        <ccm:application name="ccm-ldn-navigation"/>
+        <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/iaw-std/cfg/web.xml-sci b/ccm-sci-bundle/bundles/local/iaw-std/cfg/web.xml-sci
new file mode 100644
index 000000000..390ca7722
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/iaw-std/cfg/web.xml-sci
@@ -0,0 +1,540 @@
+<?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-ldn-navigation</param-value>
+    </init-param>
+    <init-param>
+      <param-name>file-resolver</param-name>
+      <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value>
+    </init-param>
+  </servlet>
+
+  <servlet>
+    <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-ldn-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>
diff --git a/ccm-sci-bundle/bundles/local/iaw-std/res/bundle/categories/iaw-nav-domain-1.00.xml b/ccm-sci-bundle/bundles/local/iaw-std/res/bundle/categories/iaw-nav-domain-1.00.xml
new file mode 100644
index 000000000..3123c67d8
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/iaw-std/res/bundle/categories/iaw-nav-domain-1.00.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Document   : domain-nav-iaw-1.00.xml
+    Created on : 3. Sept. 2009, 10:00
+    Author     : pb
+    Description:
+        Definition of the terms (categories) in the SHP Navigation Menue.
+        In hierarchy-nav-shp the structure of the tree will be defined.
+-->
+
+<terms:domain xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" 
+              about="http://www.aplaws.org.uk/standards/nav/1.03/termslist.xml" 
+              key="IAW-NAV" 
+              title="IAW Navigation List" 
+              version="1.00" released="2009-08-31">
+
+  <terms:term id="1000" name="Forschungsfelder / Leitthemen" inAtoZ="false"/>
+    <terms:term id="1200" name="Governance" inAtoZ="false"/>
+      <terms:term id="1220" name="Wirtschaft" inAtoZ="false"/>
+      <terms:term id="1240" name="Arbeit" inAtoZ="false"/>
+      <terms:term id="1260" name="Stadt / Region" inAtoZ="false"/>
+    <terms:term id="1400" name="Maritime Strukturen" inAtoZ="false"/>
+      <terms:term id="1420" name="Schiffbau" inAtoZ="false"/>
+      <terms:term id="1440" name="Meerespolitik" inAtoZ="false"/>
+  
+  <terms:term id="3000" name="Forschungseinheiten" inAtoZ="false"/>
+    <terms:term id="3200" name="FeA" inAtoZ="false"/>
+    <terms:term id="3400" name="FeWiF" inAtoZ="false"/>
+    <terms:term id="3600" name="FeS" inAtoZ="false"/>
+    <terms:term id="3800" name="FeQua" inAtoZ="false"/>
+  
+  <terms:term id="5000" name="Projekte" inAtoZ="false"/>
+    
+  <terms:term id="7000" name="Veröffentlichungen" inAtoZ="false"/>
+    <terms:term id="7200" name="Publikationen" inAtoZ="false"/>
+    <terms:term id="7400" name="Schriftenreihe" inAtoZ="false"/>
+    <terms:term id="7600" name="Arbeits- und Forschungsberichte" inAtoZ="false"/>
+    <terms:term id="7800" name="Jahresberichte" inAtoZ="false"/>
+    <terms:term id="8000" name="Sonstige Veröffentlichungen" inAtoZ="false"/>
+
+  <terms:term id="9000" name="Veranstaltungen" inAtoZ="false"/>
+    <terms:term id="9200" name="Kolloquium" inAtoZ="false"/>
+
+  <terms:term id="11000" name="Das Institut" inAtoZ="false"/>
+    <terms:term id="11200" name="Kontakt" inAtoZ="false"/>
+    <terms:term id="11400" name="Geschichte" inAtoZ="false"/>
+    <terms:term id="11600" name="Mitglieder" inAtoZ="false"/>
+    <terms:term id="11800" name="Organisation" inAtoZ="false"/>
+    <terms:term id="12000" name="Verwaltung" inAtoZ="false"/>
+    <terms:term id="12200" name="IT Bereich" inAtoZ="false"/>
+    <terms:term id="12400" name="Netzwerke" inAtoZ="false"/>
+    <terms:term id="12600" name="DEG" inAtoZ="false"/>
+
+</terms:domain>
+
diff --git a/ccm-sci-bundle/bundles/local/iaw-std/res/bundle/categories/iaw-nav-hierarchy-1.00.xml b/ccm-sci-bundle/bundles/local/iaw-std/res/bundle/categories/iaw-nav-hierarchy-1.00.xml
new file mode 100644
index 000000000..441260d0b
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/iaw-std/res/bundle/categories/iaw-nav-hierarchy-1.00.xml
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Document   : hierarchy-nav-iaw-1.00.xml
+    Created on : 3. Sept. 2009, 10:30
+    Author     : pb
+    Description:
+        Purpose of the document follows.
+-->
+
+<terms:hierarchy xmlns:terms="http://xmlns.redhat.com/london/terms/1.0">
+  <terms:domain resource="http://www.aplaws.org.uk/standards/nav/1.03/termslist.xml"/>
+
+  <!-- set root terms  -->
+  <terms:term id="1000"/>
+  <terms:term id="3000"/>
+  <terms:term id="5000"/>
+  <terms:term id="7000"/>
+  <terms:term id="9000"/>
+  <terms:term id="11000"/>
+  
+  <!-- id=1000 narrower terms, first level  -->  
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1200"/>
+    </terms:destination>
+  </terms:orderedPair>
+    <!--  narrower terms, second level  -->
+    <terms:orderedPair>
+      <terms:source>
+        <terms:term id="1200"/>
+      </terms:source>
+      <terms:destination isDefault="true" isPreferred="true">
+        <terms:term id="1220"/>
+      </terms:destination>
+    </terms:orderedPair>
+    <terms:orderedPair>
+      <terms:source>
+        <terms:term id="1200"/>
+      </terms:source>
+      <terms:destination isDefault="true" isPreferred="true">
+        <terms:term id="1240"/>
+      </terms:destination>
+    </terms:orderedPair>
+    <terms:orderedPair>
+      <terms:source>
+        <terms:term id="1200"/>
+      </terms:source>
+      <terms:destination isDefault="true" isPreferred="true">
+        <terms:term id="1260"/>
+      </terms:destination>
+    </terms:orderedPair>
+
+  <!-- narrower terms, first level  -->  
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1400"/>
+    </terms:destination>
+  </terms:orderedPair>
+    <!--  narrower terms, second level  -->
+    <terms:orderedPair>
+      <terms:source>
+        <terms:term id="1400"/>
+      </terms:source>
+      <terms:destination isDefault="true" isPreferred="true">
+        <terms:term id="1420"/>
+      </terms:destination>
+    </terms:orderedPair>
+    <terms:orderedPair>
+      <terms:source>
+        <terms:term id="1400"/>
+      </terms:source>
+      <terms:destination isDefault="true" isPreferred="true">
+        <terms:term id="1440"/>
+      </terms:destination>
+    </terms:orderedPair>
+
+  <!-- id=3000 narrower terms, first level  -->  
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3200"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3400"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3600"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3800"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+
+  <!-- id=7000 narrower terms, first level  -->  
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="7000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="7200"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="7000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="7400"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="7000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="7600"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="7000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="7800"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="7000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="8000"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="7000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="7200"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+
+  <!-- id=9000 narrower terms, first level  -->  
+   <terms:orderedPair>
+    <terms:source>
+      <terms:term id="9000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="9200"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+
+  <!-- id=11000 narrower terms, first level  -->  
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="11000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="11200"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="11000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="11400"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="11000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="11600"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="11000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="11800"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="11000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="12000"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="11000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="12200"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="11000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="12400"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="11000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="12600"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+ 
+  </terms:hierarchy>
diff --git a/ccm-sci-bundle/bundles/local/iaw/cat/placeholder.info b/ccm-sci-bundle/bundles/local/iaw-std/res/placeholder.info
similarity index 100%
rename from ccm-sci-bundle/bundles/local/iaw/cat/placeholder.info
rename to ccm-sci-bundle/bundles/local/iaw-std/res/placeholder.info
diff --git a/ccm-sci-bundle/bundles/local/iaw-std/templates/ccm-ldn-navigation/navigation/iaw-archive.jsp b/ccm-sci-bundle/bundles/local/iaw-std/templates/ccm-ldn-navigation/navigation/iaw-archive.jsp
new file mode 100644
index 000000000..ff2ba858c
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/iaw-std/templates/ccm-ldn-navigation/navigation/iaw-archive.jsp
@@ -0,0 +1,83 @@
+<%-- 
+    Document   : iaw-archive
+    Created on : 20.03.2011, 22:57:33
+    Author     : pb
+--%>
+
+<jsp:root
+  xmlns:jsp="http://java.sun.com/JSP/Page"
+  xmlns:define="/WEB-INF/bebop-define.tld"
+  xmlns:show="/WEB-INF/bebop-show.tld"
+  version="1.2">
+
+  <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+  <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+
+  <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+    }
+  </jsp:scriptlet>
+
+  <define:page name="defaultItemPage" application="navigation"
+    title="Navigation" cache="true">
+
+    <define:component name="greetingItem"
+      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
+    <define:component name="categoryPath"
+      classname="com.arsdigita.london.navigation.ui.category.Path"/>
+    <define:component name="categoryMenu"
+      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+    <define:component name="itemList"
+      classname="com.arsdigita.london.navigation.ui.object.ComplexObjectList"/>
+    <jsp:scriptlet>
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Event");
+
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setSQLFilter("(endDate &lt;= :today) or (endDate is null and startDate &lt;= :today)");
+
+      // Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings
+      // abstract. Deshalb muß man java.util.GregorianCalendar verwenden. Dann kann man mit der add-Methode verschiedene Felder manipulieren.
+      // Aber Achtung - die add-Method liefert void zurück. Daher kann man das nicht alles in einer Zeile machen. Also Variablen anlegen.
+      // Komplizierter geht's wohl nicht mehr.
+      java.util.GregorianCalendar now = new java.util.GregorianCalendar();
+      java.util.Date today = (new java.util.GregorianCalendar(now.get(java.util.GregorianCalendar.YEAR),
+                                                              now.get(java.util.GregorianCalendar.MONTH),
+                                                              now.get(java.util.GregorianCalendar.DATE))).getTime();
+      // Im Event-CT ist das Datum als SQL-Type Date eingetragen, die Uhrzeit aber als SQL-Typ timestamptz. Leider wird von ccm im letzten
+      // das Datum nicht gesetzt, so daß der Timestamp immer eine Uhrzeit am 1.1.1970 angibt. Das ist ziemlich bescheuert und macht hier
+      // diesen kompliezierten Vergleich notwendig. Sonst könnte man einfach mit dem aktuellen Timestamp vergleichen.
+      java.util.Date time  = (new java.util.GregorianCalendar(70,0,1, // this is 01.01.1970 - start of UNIX timestamp
+                                                              now.get(java.util.GregorianCalendar.HOUR_OF_DAY),
+                                                              now.get(java.util.GregorianCalendar.MINUTE),
+                                                              now.get(java.util.GregorianCalendar.SECOND))).getTime();
+
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setParameter("today", today);
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setParameter("time", time);
+
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setDescendCategories(true);
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("startDate");
+
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(30);
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("title");
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("lead");
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("eventDate");
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("launchDate");
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("startDate");
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("endDate");
+    </jsp:scriptlet>
+    <define:component name="assignedTerms"
+         classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+  </define:page>
+  <show:all/>
+</jsp:root>
diff --git a/ccm-sci-bundle/bundles/local/iaw-std/templates/ccm-ldn-navigation/navigation/iaw-events.jsp b/ccm-sci-bundle/bundles/local/iaw-std/templates/ccm-ldn-navigation/navigation/iaw-events.jsp
new file mode 100644
index 000000000..821ba9367
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/iaw-std/templates/ccm-ldn-navigation/navigation/iaw-events.jsp
@@ -0,0 +1,83 @@
+<%-- 
+    Document   : iaw-events
+    Created on : 20.03.2011, 22:59:41
+    Author     : pb
+--%>
+
+<jsp:root
+  xmlns:jsp="http://java.sun.com/JSP/Page"
+  xmlns:define="/WEB-INF/bebop-define.tld"
+  xmlns:show="/WEB-INF/bebop-show.tld"
+  version="1.2">
+
+  <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+  <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+
+  <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+    }
+  </jsp:scriptlet>
+
+  <define:page name="defaultItemPage" application="navigation"
+    title="Navigation" cache="true">
+
+    <define:component name="greetingItem"
+      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
+    <define:component name="categoryPath"
+      classname="com.arsdigita.london.navigation.ui.category.Path"/>
+    <define:component name="categoryMenu"
+      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+    <define:component name="itemList"
+      classname="com.arsdigita.london.navigation.ui.object.ComplexObjectList"/>
+    <jsp:scriptlet>
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Event");
+
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setSQLFilter("(endDate &gt;= :today and (endTime &gt; :time or endTime is null)) or (endDate is null and startDate &gt;= :today)");
+
+      // Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings
+      // abstract. Deshalb muß man java.util.GregorianCalendar verwenden. Dann kann man mit der add-Methode verschiedene Felder manipulieren.
+      // Aber Achtung - die add-Method liefert void zurück. Daher kann man das nicht alles in einer Zeile machen. Also Variablen anlegen.
+      // Komplizierter geht's wohl nicht mehr.
+      java.util.GregorianCalendar now = new java.util.GregorianCalendar();
+      java.util.Date today = (new java.util.GregorianCalendar(now.get(java.util.GregorianCalendar.YEAR),
+                                                              now.get(java.util.GregorianCalendar.MONTH),
+                                                              now.get(java.util.GregorianCalendar.DATE))).getTime();
+      // Im Event-CT ist das Datum als SQL-Type Date eingetragen, die Uhrzeit aber als SQL-Typ timestamptz. Leider wird von ccm im letzten
+      // das Datum nicht gesetzt, so daß der Timestamp immer eine Uhrzeit am 1.1.1970 angibt. Das ist ziemlich bescheuert und macht hier
+      // diesen kompliezierten Vergleich notwendig. Sonst könnte man einfach mit dem aktuellen Timestamp vergleichen.
+      java.util.Date time  = (new java.util.GregorianCalendar(70,0,1, // this is 01.01.1970 - start of UNIX timestamp
+                                                              now.get(java.util.GregorianCalendar.HOUR_OF_DAY),
+                                                              now.get(java.util.GregorianCalendar.MINUTE),
+                                                              now.get(java.util.GregorianCalendar.SECOND))).getTime();
+
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setParameter("today", today);
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setParameter("time", time);
+
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setDescendCategories(true);
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("startDate");
+
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(30);
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("title");
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("lead");
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("eventDate");
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("launchDate");
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("startDate");
+      ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().addAttribute("endDate");
+    </jsp:scriptlet>
+    <define:component name="assignedTerms"
+         classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+  </define:page>
+  <show:all/>
+</jsp:root>
diff --git a/ccm-sci-bundle/bundles/local/iaw/nav/placeholder.info b/ccm-sci-bundle/bundles/local/iaw-std/templates/placeholder.info
similarity index 100%
rename from ccm-sci-bundle/bundles/local/iaw/nav/placeholder.info
rename to ccm-sci-bundle/bundles/local/iaw-std/templates/placeholder.info
diff --git a/ccm-sci-bundle/bundles/local/iaw-std/themes/README b/ccm-sci-bundle/bundles/local/iaw-std/themes/README
new file mode 100644
index 000000000..13248d9bb
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/iaw-std/themes/README
@@ -0,0 +1,13 @@
+Bundle subdir themes
+
+Purpose:
+This subdir may optionally contain theme files which either replace part of the
+theme or add files to the theme provided as default for ScientificCMS and this
+way adopt the theme for site specific design. 
+
+All files and subdirectories all copied asis to the applications ~/themes 
+directory in its document (context) root.
+
+It is the responsibility of developer / system integrator to ensure all files
+are copied to the right location and the theme works with the modification. No
+functionality or consistency check is perfordmed!
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/iaw-std/themes/master/dummy b/ccm-sci-bundle/bundles/local/iaw-std/themes/master/dummy
new file mode 100644
index 000000000..beec54a4d
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/iaw-std/themes/master/dummy
@@ -0,0 +1 @@
+Just a dummy file for test purpose during development.
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/zes-dev/AUTHORS b/ccm-sci-bundle/bundles/local/zes-dev/AUTHORS
new file mode 100644
index 000000000..e69de29bb
diff --git a/ccm-sci-bundle/bundles/local/zes-dev/ChangeLog b/ccm-sci-bundle/bundles/local/zes-dev/ChangeLog
new file mode 100644
index 000000000..786623bdb
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-dev/ChangeLog
@@ -0,0 +1,9 @@
+* 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/zes-dev/NEWS b/ccm-sci-bundle/bundles/local/zes-dev/NEWS
new file mode 100644
index 000000000..e69de29bb
diff --git a/ccm-sci-bundle/bundles/local/zes-dev/README b/ccm-sci-bundle/bundles/local/zes-dev/README
new file mode 100644
index 000000000..e69de29bb
diff --git a/ccm-sci-bundle/bundles/local/zes-dev/bundle.in b/ccm-sci-bundle/bundles/local/zes-dev/bundle.in
new file mode 100644
index 000000000..abe9f2faa
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-dev/bundle.in
@@ -0,0 +1,4 @@
+BUNDLE_NAME=aplaws-plus-zes-devel
+BUNDLE_PRETTY_NAME="APLAWS+ ZeS Devel Bundle"
+VERSION=1.1.4devel
+RELEASE=1
diff --git a/ccm-sci-bundle/bundles/local/zes-dev/cfg/applications.cfg b/ccm-sci-bundle/bundles/local/zes-dev/cfg/applications.cfg
new file mode 100644
index 000000000..b8bf6afda
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-dev/cfg/applications.cfg
@@ -0,0 +1,58 @@
+# ZeS devel application.cfg
+#
+# Das devel bundle enthält die Modul Zusammensetzung der aktuellen
+# Entwicklungsversion und somit der *kommenden* ZeS Produktiv-Version
+#
+#
+# Main apps
+ccm-core
+ccm-cms
+
+# Content assets
+ccm-cms-assets-fileattachment
+ccm-cms-assets-imagestep
+ccm-cms-assets-notes
+ccm-cms-assets-relatedlink
+
+# Content types
+ccm-cms-types-address
+ccm-cms-types-article
+ccm-cms-types-bookmark
+ccm-cms-types-contact
+ccm-cms-types-event
+ccm-cms-types-filestorageitem
+ccm-cms-types-formitem
+ccm-cms-types-formsectionitem
+ccm-cms-types-mparticle
+ccm-cms-types-newsitem
+ccm-cms-types-person
+ccm-cms-types-siteproxy
+#  --  xmlfeed wird moeglicherweise ebenfalls nicht gebraucht
+ccm-cms-types-xmlfeed
+
+# Applications
+# ------------
+ccm-forum
+ccm-portalworkspace
+ccm-simplesurvey
+ccm-themedirector
+ccm-user-preferences
+
+# ldn extensions
+# --------------
+ccm-ldn-navigation
+ccm-ldn-rss
+ccm-ldn-search
+ccm-ldn-shortcuts
+ccm-ldn-subsite
+ccm-ldn-terms
+ccm-ldn-util
+
+# sci extensions
+# --------------
+ccm-cms-dabinimporter
+ccm-sci-publications
+ccm-sci-types-organization
+# integration layer
+ccm-zes-aplaws
+
diff --git a/ccm-sci-bundle/bundles/local/zes-dev/cfg/integration.properties b/ccm-sci-bundle/bundles/local/zes-dev/cfg/integration.properties
new file mode 100644
index 000000000..79cd57b7e
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-dev/cfg/integration.properties
@@ -0,0 +1,151 @@
+# ZeS 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
+
+# MOVED to ui.Config
+#waf.pagemap.root=navigation/
+#waf.pagemap.workspace=navigation/
+#waf.pagemap.login_redirect=content/content-center-redirect.jsp
+
+; Searches for localized style sheet (among others) 
+waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
+waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-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
+
+
+# ?? Where are these used?
+com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
+
+com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
+
+
+# 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-ldn-navigation application
+com.arsdigita.london.navigation.category_menu_show_grand_children=false
+com.arsdigita.london.navigation.default_cat_root_path=/navigation/
+com.arsdigita.london.navigation.default_template=/packages/navigation/templates/zes-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@zes.uni-bremen.de
+waf.admin.name.given=ZeS
+waf.admin.name.family=Administrator
+waf.admin.password=nge2015
+waf.admin.password.question=12345
+waf.admin.password.answer=6
+
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/zes?user\=zes&password\=zes47web&stringtype\=unspecified
+; waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/zes-testupd?user\=zes&password\=zes47web
+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/zes-dev/cfg/project.xml b/ccm-sci-bundle/bundles/local/zes-dev/cfg/project.xml
new file mode 100644
index 000000000..91f7927b7
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-dev/cfg/project.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--    project.xml -IAW- 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-iaw" 
+              prettyName="APLAWS plus" 
+                 version="1-1-4" 
+                 release="r1107" 
+                  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-imagestep"/>
+        <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-bookmark"/>
+<!--    <ccm:application name="ccm-cms-types-contact"/>              -->
+<!--    <ccm:application name="ccm-cms-types-esdservice"/>           -->
+        <ccm:application name="ccm-cms-types-event"/>
+<!--    <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-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-person"/>         -->
+<!--    <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"/>                      -->
+<!--    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-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"/>
+
+
+<!--  IAW extension  -->
+<!--  - - - - - - -  -->
+<!--    <ccm:application name="ccm-cms-dabinimporter" />
+        <ccm:application name="ccm-sci-types-organization"/>
+        <ccm:application name="ccm-sci-publications"/>
+-->
+        <ccm:application name="ccm-iaw-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/ccm-sci-bundle/bundles/local/zes-dev/cfg/web.xml b/ccm-sci-bundle/bundles/local/zes-dev/cfg/web.xml
new file mode 100644
index 000000000..aafa3183a
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-dev/cfg/web.xml
@@ -0,0 +1,558 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app         xmlns="http://java.sun.com/xml/ns/j2ee"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+               version="2.4">
+
+  <display-name>CCM ZeS</display-name> 
+  <description>Content and Collaboration Management</description>
+
+  <!-- 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-ldn-atoz  -  servlet definitions BEGIN
+       NOT USED with ZeS   
+  <servlet>
+    <servlet-name>atoz-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-ldn-atoz</param-value>
+    </init-param>
+  </servlet>
+       module ccm-ldn-atoz  -  servlet definitions END  -->
+
+  <!-- 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-ldn-navigation</param-value>
+    </init-param>
+    <init-param>
+      <param-name>file-resolver</param-name>
+      <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value>
+    </init-param>
+  </servlet>
+
+  <servlet>
+    <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-ldn-atoz  -  servlet mappings BEGIN  
+       NOT USED HERE
+  <servlet-mapping>
+    <servlet-name>atoz-files</servlet-name>
+    <url-pattern>/ccm-ldn-atoz/files/*</url-pattern>
+  </servlet-mapping>
+       module ccm-ldn-atoz  -  servlet mappings END  -->
+
+  <!-- module ccm-forum  -  servlet mappings BEGIN  -->
+  <servlet-mapping>
+    <servlet-name>forum-main</servlet-name>
+    <url-pattern>/forum-main/main/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-forum  -  servlet mappings END    -->
+
+  <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-ldn-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>
diff --git a/ccm-sci-bundle/bundles/local/zes-std/AUTHORS b/ccm-sci-bundle/bundles/local/zes-std/AUTHORS
new file mode 100644
index 000000000..e69de29bb
diff --git a/ccm-sci-bundle/bundles/local/zes-std/ChangeLog b/ccm-sci-bundle/bundles/local/zes-std/ChangeLog
new file mode 100644
index 000000000..786623bdb
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/ChangeLog
@@ -0,0 +1,9 @@
+* 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/zes-std/NEWS b/ccm-sci-bundle/bundles/local/zes-std/NEWS
new file mode 100644
index 000000000..e69de29bb
diff --git a/ccm-sci-bundle/bundles/local/zes-std/README b/ccm-sci-bundle/bundles/local/zes-std/README
new file mode 100644
index 000000000..e69de29bb
diff --git a/ccm-sci-bundle/bundles/local/zes-std/bundle.in b/ccm-sci-bundle/bundles/local/zes-std/bundle.in
new file mode 100644
index 000000000..794a88093
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/bundle.in
@@ -0,0 +1,4 @@
+BUNDLE_NAME=aplaws-plus-ZeS
+BUNDLE_PRETTY_NAME="APLAWS+ ZeS Standard Bundle"
+VERSION=1.1.4
+RELEASE=1
diff --git a/ccm-sci-bundle/bundles/local/zes-std/cfg/integration.properties b/ccm-sci-bundle/bundles/local/zes-std/cfg/integration.properties
new file mode 100644
index 000000000..ae649fd49
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/cfg/integration.properties
@@ -0,0 +1,149 @@
+# ZeS standard 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 doesn't work.
+; waf.kernel.primary_user_identifier=screen_name
+waf.kernel.supported_languages=de,en
+
+; security.properties: 
+waf.auto_registration_on=false
+
+# MOVED to ui.Config
+#waf.pagemap.root=navigation/
+#waf.pagemap.workspace=navigation/
+#waf.pagemap.login_redirect=content/content-center-redirect.jsp
+
+; Searches for localized style sheet (among others) 
+waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
+waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-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=webmaster@zes.uni-bremen.de
+
+; 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.item_search.default_tab=search
+
+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
+
+
+# ?? Where are these used?
+com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
+
+com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
+
+
+# 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-ldn-navigation application
+com.arsdigita.london.navigation.category_menu_show_grand_children=false
+com.arsdigita.london.navigation.default_cat_root_path=/navigation/
+com.arsdigita.london.navigation.default_template=/packages/navigation/templates/zes-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@zes.uni-bremen.de
+waf.admin.name.given=ZeS
+waf.admin.name.family=Administrator
+waf.admin.password=nge2015
+waf.admin.password.question=12345
+waf.admin.password.answer=6
+
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/zes-test?user\=zes&password\=zes47web
+# waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/zes-testupd?user\=zes&password\=zes47web
+# waf.runtime.jdbc_url=jdbc\:postgresql\://134.102.3.27/zes?user\=zes&password\=zes47web
+waf.runtime.jdbc_pool_size=30
+
+waf.web.server=localhost\:8080
+# waf.web.server=www.zes.uni-bremen.de\:80
+# waf.web.host=www.zes.uni-bremen.de\:80
+# waf.web.site_name=www.zes.uni-bremen.de
diff --git a/ccm-sci-bundle/bundles/local/zes-std/cfg/project.xml b/ccm-sci-bundle/bundles/local/zes-std/cfg/project.xml
new file mode 100644
index 000000000..84cfe3f94
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/cfg/project.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--    project.xml -ZeS- containing only those modules used for ZeS    -->
+
+<ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
+               xmlns:ccm="http://ccm.redhat.com/ccm-project" 
+              ccmVersion="6.1" 
+                    name="aplaws-zes" 
+              prettyName="APLAWS plus" 
+                 version="1-1-5" 
+                 release="r1136" 
+                  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-imagestep"/>
+        <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-article"/>
+        <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-filestorageitem"/>
+        <ccm:application name="ccm-cms-types-formitem"/>
+        <ccm:application name="ccm-cms-types-formsectionitem"/>
+        <ccm:application name="ccm-cms-types-mparticle"/>
+        <ccm:application name="ccm-cms-types-newsitem"/>
+        <ccm:application name="ccm-cms-types-person"/>
+        <ccm:application name="ccm-cms-types-siteproxy"/>               
+        <ccm:application name="ccm-cms-types-xmlfeed"/>               
+
+<!--  Applications   -->
+<!--  - - - - -  -   -->
+        <ccm:application name="ccm-forum"/>                
+        <ccm:application name="ccm-portalworkspace"/>                
+        <ccm:application name="ccm-simplesurvey"/>                
+        <ccm:application name="ccm-themedirector"/>                
+        <ccm:application name="ccm-user-preferences"/>
+
+<!--  LDN extension  -->
+<!--  - - - - - - -  -->
+        <ccm:application name="ccm-ldn-navigation"/>
+        <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-util"/>
+
+
+<!--  ZeS extension  (for new version 1.1.4)   -->
+<!--  - - - - - - - - - - - - - - - - - - -    -->
+        <ccm:application name="ccm-sci-types-organization"/>
+        <ccm:application name="ccm-sci-types-organizationwithpublications"/>
+        <ccm:application name="ccm-sci-publications"/>
+        <ccm:application name="ccm-cms-dabinimporter" />
+<!--         <ccm:application name="ccm-cms-publicpersonalprofile"/>     -->
+
+        <ccm:application name="ccm-zes-aplaws"/>
+
+
+
+<!-- tools will be downloaded from trunk, but does not
+     contain java code to be compiled!
+        <ccm:application name="tools"/>           -->
+
+
+  </ccm:build>
+
+<!--  probable addons    --> 
+
+<!--   Content Types   -->
+<!--   - - - - - - -    -->
+<!--    <ccm:application name="ccm-cms-types-agenda"/>               -->
+<!--    <ccm:application name="ccm-cms-types-esdservice"/>           -->
+<!--    <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-motditem"/>             -->
+<!--    <ccm:application name="ccm-cms-types-organization"/>         -->
+<!--    <ccm:application name="ccm-cms-types-person"/>         -->
+<!--    <ccm:application name="ccm-cms-types-pressrelease"/>         -->
+<!--    <ccm:application name="ccm-cms-types-service"/>              -->
+<!--    <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-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-importer"/>                   -->
+
+
+</ccm:project>
diff --git a/ccm-sci-bundle/bundles/local/zes-std/cfg/web.xml b/ccm-sci-bundle/bundles/local/zes-std/cfg/web.xml
new file mode 100644
index 000000000..aafa3183a
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/cfg/web.xml
@@ -0,0 +1,558 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app         xmlns="http://java.sun.com/xml/ns/j2ee"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+               version="2.4">
+
+  <display-name>CCM ZeS</display-name> 
+  <description>Content and Collaboration Management</description>
+
+  <!-- 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-ldn-atoz  -  servlet definitions BEGIN
+       NOT USED with ZeS   
+  <servlet>
+    <servlet-name>atoz-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-ldn-atoz</param-value>
+    </init-param>
+  </servlet>
+       module ccm-ldn-atoz  -  servlet definitions END  -->
+
+  <!-- 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-ldn-navigation</param-value>
+    </init-param>
+    <init-param>
+      <param-name>file-resolver</param-name>
+      <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value>
+    </init-param>
+  </servlet>
+
+  <servlet>
+    <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-ldn-atoz  -  servlet mappings BEGIN  
+       NOT USED HERE
+  <servlet-mapping>
+    <servlet-name>atoz-files</servlet-name>
+    <url-pattern>/ccm-ldn-atoz/files/*</url-pattern>
+  </servlet-mapping>
+       module ccm-ldn-atoz  -  servlet mappings END  -->
+
+  <!-- module ccm-forum  -  servlet mappings BEGIN  -->
+  <servlet-mapping>
+    <servlet-name>forum-main</servlet-name>
+    <url-pattern>/forum-main/main/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-forum  -  servlet mappings END    -->
+
+  <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-ldn-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>
diff --git a/ccm-sci-bundle/bundles/local/zes-std/res/bundle/categories/zes-nav-domain-1.00.xml b/ccm-sci-bundle/bundles/local/zes-std/res/bundle/categories/zes-nav-domain-1.00.xml
new file mode 100644
index 000000000..f568d3278
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/res/bundle/categories/zes-nav-domain-1.00.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Document   : domain-nav-zes-1.00.xml
+    Created on : 8. Aug. 2007, 10:00
+    Author     : pb
+    Description:
+        Definition of the terms (categories) in the SHP Navigation Menue.
+        In hierarchy-nav-shp the structure of the tree will be defined.
+-->
+
+<terms:domain xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" 
+              about="http://www.aplaws.org.uk/standards/nav/1.03/termslist.xml" 
+              key="ZES-NAV" 
+              title="ZeS Navigation List" 
+              version="1.00" released="2007-08-10">
+
+  <terms:term id="1000" name="Institut" inAtoZ="false"/>
+    <terms:term id="1200" name="Abteilungen" inAtoZ="false"/>
+      <terms:term id="1220" name="Abteilung Theorie und Verfassung des Wohlfahrsstaates" inAtoZ="false"/>
+      <terms:term id="1240" name="Abteilung Institutionen und Geschichte des Wohlfahrsstaates" inAtoZ="false"/>
+      <terms:term id="1260" name="Wirtschaftswissenschaftliche Abteilung" inAtoZ="false"/>
+      <terms:term id="1280" name="Abteilung Arbeit und Gesundheit" inAtoZ="false"/>
+      <terms:term id="1300" name="Geschlechterpolitik im Wohlfahrtsstaat" inAtoZ="false"/>
+    <terms:term id="1400" name="Mitglieder" inAtoZ="false"/>
+    <terms:term id="1600" name="Bibliothek" inAtoZ="false"/>
+    <terms:term id="1800" name="Ankündigungen" inAtoZ="false"/>
+  
+  <terms:term id="3000" name="Forschung" inAtoZ="false"/>
+    <terms:term id="3200" name="Projekte" inAtoZ="false"/>
+    <terms:term id="3400" name="Veröffentlichungen" inAtoZ="false"/>
+      <terms:term id="3420" name="Publikationen" inAtoZ="false"/>
+      <terms:term id="3440" name="Arbeitspapiere" inAtoZ="false"/>
+      <terms:term id="3460" name="Schriftenreihe" inAtoZ="false"/>
+      <terms:term id="3480" name="ZeS Report" inAtoZ="false"/>
+      <terms:term id="3500" name="Jahresberichte" inAtoZ="false"/>
+    <terms:term id="3600" name="Gesundheitspolitisches Kolloquium" inAtoZ="false"/>
+    <terms:term id="3800" name="Jour Fix" inAtoZ="false"/>
+    <terms:term id="4000" name="Tagungen" inAtoZ="false"/>
+  
+  <terms:term id="5000" name="Lehre und Studium" inAtoZ="false"/>
+    <terms:term id="5200" name="Masterstudiengang Sozialpolitik" inAtoZ="false"/>
+    <terms:term id="5400" name="Weitere Lehre" inAtoZ="false"/>
+    
+  <terms:term id="9002" name="Archiv" inAtoZ="false"/>
+  <terms:term id="9200" name="Informative Links" inAtoZ="false"/>
+
+</terms:domain>
+
diff --git a/ccm-sci-bundle/bundles/local/zes-std/res/bundle/categories/zes-nav-hierarchy-1.00.xml b/ccm-sci-bundle/bundles/local/zes-std/res/bundle/categories/zes-nav-hierarchy-1.00.xml
new file mode 100644
index 000000000..bd3872ec7
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/res/bundle/categories/zes-nav-hierarchy-1.00.xml
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Document   : hierarchy-nav-zes-1.00.xml
+    Created on : 8. Aug. 2007, 10:30
+    Author     : pb
+    Description:
+        Purpose of the document follows.
+-->
+
+<terms:hierarchy xmlns:terms="http://xmlns.redhat.com/london/terms/1.0">
+  <terms:domain resource="http://www.aplaws.org.uk/standards/nav/1.03/termslist.xml"/>
+  <!-- set root terms  -->
+  <terms:term id="1000"/>
+  <terms:term id="3000"/>
+  <terms:term id="5000"/>
+  
+  <terms:orderedPair>
+    <!-- narrower terms, first level  -->  
+    <terms:source>
+      <terms:term id="1000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1200"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <!--  narrower terms, second level  -->
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1200"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1220"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1200"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1240"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1200"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1260"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1200"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1280"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1200"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1300"/>
+    </terms:destination>
+  </terms:orderedPair>
+<!--  narrower terms, second level END  -->
+  
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1400"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1600"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1800"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="9002"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="9200"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3200"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3400"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <!--  narrower terms, second level  -->
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3400"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3420"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3400"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3440"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3400"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3460"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3400"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3480"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3400"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3500"/>
+    </terms:destination>
+  </terms:orderedPair>
+<!--  narrower terms, second level END  -->
+  
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3600"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="3800"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="3000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="4000"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="5000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="5200"/>
+    </terms:destination>
+  </terms:orderedPair>
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="5000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="5200"/>
+    </terms:destination>
+  </terms:orderedPair>
+  
+  </terms:hierarchy>
diff --git a/ccm-sci-bundle/bundles/local/zes-std/res/placeholder.info b/ccm-sci-bundle/bundles/local/zes-std/res/placeholder.info
new file mode 100644
index 000000000..5ae76207c
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/res/placeholder.info
@@ -0,0 +1,3 @@
+Subdirectory  <cat> may optionally contain one or more local site specific 
+import xml files for Terms domain categories. 
+
diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartment-index.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartment-index.jsp
new file mode 100644
index 000000000..335e93ba7
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartment-index.jsp
@@ -0,0 +1,67 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+       xmlns:define="/WEB-INF/bebop-define.tld" 
+         xmlns:show="/WEB-INF/bebop-show.tld"
+	    version="1.2">
+
+  <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+  <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+
+  <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+    }
+  </jsp:scriptlet>
+
+  <define:page name="defaultItemPage" application="navigation"
+    title="Navigation" cache="false">
+
+    <define:component name="greetingItem"
+      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
+    <define:component name="sectionXML"
+      classname="com.arsdigita.cms.contenttypes.ui.SciDepartmentWithPublicationsPanel"/>
+    <jsp:scriptlet>
+        com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.london.navigation.ui.GreetingItem) greetingItem).getObject();
+        ((com.arsdigita.cms.contenttypes.ui.SciDepartmentPanel) sectionXML).setContentItem(item);
+    </jsp:scriptlet>
+    <define:component name="categoryPath"
+      classname="com.arsdigita.london.navigation.ui.category.Path"/>
+    <define:component name="categoryMenu"
+      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+    <define:component name="itemList"
+      classname="com.arsdigita.london.navigation.ui.object.SimpleObjectList"/>
+    <jsp:scriptlet>
+      ((com.arsdigita.cms.contenttypes.ui.SciDepartmentPanel)sectionXML).setPageSize(30);
+
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
+
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);      
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
+      
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30);
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "definition");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "summary");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "lead");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "description");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "eventDate");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "startDate" );
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "endDate");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "newsDate");
+    </jsp:scriptlet>
+
+    <define:component name="assignedTerms"
+         classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+  </define:page>
+  <show:all/>
+</jsp:root>
+
diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentActiveMembers.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentActiveMembers.jsp
new file mode 100644
index 000000000..6e81f3f34
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentActiveMembers.jsp
@@ -0,0 +1,56 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet>
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/departmentDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons");        
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("formerMember != true");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("associatedMember != true");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        </jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentAssociatedMembers.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentAssociatedMembers.jsp
new file mode 100644
index 000000000..890957e58
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentAssociatedMembers.jsp
@@ -0,0 +1,57 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet>
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/departmentDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("formerMember != true");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("associatedMember = true");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
+
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        </jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentDescription.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentDescription.jsp
new file mode 100644
index 000000000..2e1d5a139
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentDescription.jsp
@@ -0,0 +1,50 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet>
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        </jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentFinishedProjects.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentFinishedProjects.jsp
new file mode 100644
index 000000000..b6c5815fa
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentFinishedProjects.jsp
@@ -0,0 +1,60 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet><![CDATA[
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/departmentDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/projects");
+
+        java.util.Calendar today = new java.util.GregorianCalendar();
+        String todayDate = String.format("%d-%2d-%2d", today.get(java.util.Calendar.YEAR),
+                                                today.get(java.util.Calendar.MONTH) + 1,
+                                                today.get(java.util.Calendar.DAY_OF_MONTH));
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("projectend <= '" + todayDate + "'");
+
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        ]]></jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentFormerMembers.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentFormerMembers.jsp
new file mode 100644
index 000000000..706a76a3a
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentFormerMembers.jsp
@@ -0,0 +1,56 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet>
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/departmentDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("formerMember = true");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
+
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        </jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentMembers.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentMembers.jsp
new file mode 100644
index 000000000..87af629b7
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentMembers.jsp
@@ -0,0 +1,55 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet>
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/departmentDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
+
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        </jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentOngoingProjects.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentOngoingProjects.jsp
new file mode 100644
index 000000000..e910d132d
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentOngoingProjects.jsp
@@ -0,0 +1,60 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet><![CDATA[
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/departmentDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/projects");
+
+        java.util.Calendar today = new java.util.GregorianCalendar();
+        String todayDate = String.format("%d-%2d-%2d", today.get(java.util.Calendar.YEAR),
+                                                today.get(java.util.Calendar.MONTH) + 1,
+                                                today.get(java.util.Calendar.DAY_OF_MONTH));
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("projectend > '" + todayDate + "'");
+
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        ]]></jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentProjects.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentProjects.jsp
new file mode 100644
index 000000000..15b32d4c1
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentProjects.jsp
@@ -0,0 +1,54 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet>
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/departmentDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/projects");
+
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        </jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentSubDepartments.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentSubDepartments.jsp
new file mode 100644
index 000000000..f4ee43330
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciDepartmentSubDepartments.jsp
@@ -0,0 +1,54 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet>
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciDepartment",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/departmentDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/subDepartments");
+
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        </jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciMember-index.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciMember-index.jsp
new file mode 100644
index 000000000..5fb8f9004
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciMember-index.jsp
@@ -0,0 +1,70 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld" 
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+    }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="false">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
+        <define:component name="sectionXML"
+                          classname="com.arsdigita.cms.contenttypes.ui.SciMemberDemoPanel"/>
+
+        <jsp:scriptlet>
+        com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.london.navigation.ui.GreetingItem) greetingItem).getObject();
+        ((com.arsdigita.cms.contenttypes.ui.SciMemberDemoPanel) sectionXML).setContentItem(item);       
+        </jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+        <define:component name="itemList"
+                          classname="com.arsdigita.london.navigation.ui.object.SimpleObjectList"/>
+
+        <jsp:scriptlet>
+      ((com.arsdigita.cms.contenttypes.ui.SciMemberDemoPanel)sectionXML).setPageSize(20);
+
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
+
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);      
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
+      
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30);
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "definition");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "summary");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "lead");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "description");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "eventDate");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "startDate" );
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "endDate");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "newsDate");
+        </jsp:scriptlet>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+    <show:all/>
+    
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganization-index.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganization-index.jsp
new file mode 100644
index 000000000..5aee1477f
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganization-index.jsp
@@ -0,0 +1,67 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+       xmlns:define="/WEB-INF/bebop-define.tld" 
+         xmlns:show="/WEB-INF/bebop-show.tld"
+	    version="1.2">
+
+  <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+  <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+
+  <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+    }
+  </jsp:scriptlet>
+
+  <define:page name="defaultItemPage" application="navigation"
+    title="Navigation" cache="false">
+
+    <define:component name="greetingItem"
+      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
+    <define:component name="sectionXML"
+      classname="com.arsdigita.cms.contenttypes.ui.SciOrganizationWithPublicationsPanel"/>
+    <jsp:scriptlet>
+        com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.london.navigation.ui.GreetingItem) greetingItem).getObject();
+        ((com.arsdigita.cms.contenttypes.ui.SciOrganizationPanel) sectionXML).setContentItem(item);
+    </jsp:scriptlet>
+    <define:component name="categoryPath"
+      classname="com.arsdigita.london.navigation.ui.category.Path"/>
+    <define:component name="categoryMenu"
+      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+    <define:component name="itemList"
+      classname="com.arsdigita.london.navigation.ui.object.SimpleObjectList"/>
+    <jsp:scriptlet>
+      ((com.arsdigita.cms.contenttypes.ui.SciOrganizationPanel)sectionXML).setPageSize(30);
+
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
+
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);      
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
+      
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30);
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "definition");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "summary");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "lead");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "description");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "eventDate");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "startDate" );
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "endDate");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "newsDate");
+    </jsp:scriptlet>
+
+    <define:component name="assignedTerms"
+         classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+  </define:page>
+  <show:all/>
+</jsp:root>
+
diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationActiveMembers.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationActiveMembers.jsp
new file mode 100644
index 000000000..f94befbc7
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationActiveMembers.jsp
@@ -0,0 +1,58 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet>
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/persons");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("formerMember != true");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("associatedMember != true");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
+
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        </jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationAssociatedMembers.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationAssociatedMembers.jsp
new file mode 100644
index 000000000..6041bad0d
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationAssociatedMembers.jsp
@@ -0,0 +1,58 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet>
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/persons");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("formerMember != true");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("associatedMember = true");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
+
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        </jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationDepartments.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationDepartments.jsp
new file mode 100644
index 000000000..7ff218392
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationDepartments.jsp
@@ -0,0 +1,54 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet>
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments");        
+
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        </jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationDescription.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationDescription.jsp
new file mode 100644
index 000000000..9fcaecf02
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationDescription.jsp
@@ -0,0 +1,50 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet>
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();        
+        </jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationFinishedProjects.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationFinishedProjects.jsp
new file mode 100644
index 000000000..c31ed85e1
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationFinishedProjects.jsp
@@ -0,0 +1,61 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet><![CDATA[
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/projects");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/projects");
+
+        java.util.Calendar today = new java.util.GregorianCalendar();
+        String todayDate = String.format("%d-%2d-%2d", today.get(java.util.Calendar.YEAR),
+                                                today.get(java.util.Calendar.MONTH) + 1,
+                                                today.get(java.util.Calendar.DAY_OF_MONTH));
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("projectend <= '" + todayDate + "'");
+
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        ]]></jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationFormerMembers.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationFormerMembers.jsp
new file mode 100644
index 000000000..3e702b584
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationFormerMembers.jsp
@@ -0,0 +1,57 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet>
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/persons");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("formerMember = true");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
+
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        </jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationMembers.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationMembers.jsp
new file mode 100644
index 000000000..0289f84c1
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationMembers.jsp
@@ -0,0 +1,56 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet>
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/persons");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/persons");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setOrder("surname asc, givenname asc");
+
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        </jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationOngoingProjects.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationOngoingProjects.jsp
new file mode 100644
index 000000000..5b2f64a9d
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationOngoingProjects.jsp
@@ -0,0 +1,61 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet><![CDATA[
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/projects");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/projects");
+        
+        java.util.Calendar today = new java.util.GregorianCalendar();
+        String todayDate = String.format("%d-%2d-%2d", today.get(java.util.Calendar.YEAR),
+                                                today.get(java.util.Calendar.MONTH) + 1,
+                                                today.get(java.util.Calendar.DAY_OF_MONTH));
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).addFilter("projectend > '" + todayDate + "'");
+
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        ]]></jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationProjects.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationProjects.jsp
new file mode 100644
index 000000000..286fb0f0a
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciOrganizationProjects.jsp
@@ -0,0 +1,56 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:define="/WEB-INF/bebop-define.tld"
+          xmlns:show="/WEB-INF/bebop-show.tld"
+          version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.NavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.cms.dispatcher.SimpleXMLGenerator"/>
+
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+      }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="true">
+
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.CustomizableGreetingItem"/>
+        <jsp:scriptlet>
+            ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).loadTraversalAdapter("com.arsdigita.cms.contenttypes.SciOrganization",
+                             SimpleXMLGenerator.ADAPTER_CONTEXT);
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAttributeProperty("/object/organizationDescription");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().clearAssociationProperties();
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/projects");
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).getTraversalAdapter().addAssociationProperty("/object/departments/projects");
+
+
+        ((com.arsdigita.london.navigation.ui.CustomizableGreetingItem) greetingItem).setPageSize(20);
+        </jsp:scriptlet>
+
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+
+    <show:all/>
+
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciProjectList.jsp b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciProjectList.jsp
new file mode 100644
index 000000000..ccb76568a
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/SciProjectList.jsp
@@ -0,0 +1,67 @@
+<jsp:root
+    xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:define="/WEB-INF/bebop-define.tld"
+    xmlns:show="/WEB-INF/bebop-show.tld"
+    version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.ui.object.CustomizableObjectList"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.ui.object.CompareFilter"/>
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+    }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="false">
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+        <define:component name="itemList"
+                          classname="com.arsdigita.london.navigation.ui.object.CustomizableObjectList"/>
+
+      <jsp:scriptlet>
+      CustomizableObjectList objList = (CustomizableObjectList) itemList;
+      objList.setDefinition(new CMSDataCollectionDefinition());
+      objList.setRenderer(new CMSDataCollectionRenderer());
+      objList.setCustomName("SciProjectList");
+      objList.getDefinition().setObjectType("com.arsdigita.cms.contenttypes.SciProject");
+      objList.getDefinition().setDescendCategories(false);
+      objList.addTextFilter("title", "title");
+
+      java.util.GregorianCalendar now = new java.util.GregorianCalendar();
+      String today = String.format("%d-%02d-%02d", now.get(java.util.GregorianCalendar.YEAR),
+                                                   now.get(java.util.GregorianCalendar.MONTH) + 1,
+                                                   now.get(java.util.GregorianCalendar.DATE));
+
+      objList.addCompareFilter("projectend", "projectstatus", true, true, false)
+        .addOption("ongoing", CompareFilter.Operators.GTEQ, today, true)
+        .addOption("finished", CompareFilter.Operators.LT, today, false);
+      objList.addSortField("title", "title asc");      
+      objList.getDefinition().addOrder(objList.getOrder(request.getParameter("sort")));
+
+      objList.getRenderer().setPageSize(20);
+      objList.getRenderer().setSpecializeObjects(true);
+      objList.getRenderer().setSpecializeObjectsContext("sciProjectList");
+
+      </jsp:scriptlet>
+
+      <define:component name="assignedTerms"
+                        classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+    </define:page>
+    <show:all/>
+
+</jsp:root>
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/placeholder.info b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/placeholder.info
new file mode 100644
index 000000000..38db9a8ae
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/templates/ccm-ldn-navigation/navigation/placeholder.info
@@ -0,0 +1,12 @@
+Subdirectory  <nav> may optionally contain navigation item templates for
+navigation index pages which either overwrite or ammend those templates
+which are default for ccm-sci-bundle and stored in 
+   /web/templates/ccm-navigation/navigation
+
+Templates of the same name in this subdirectory just overwrite the
+default files. Templates of different names are stored in addition
+to the default template files. In the later case a developer must
+provide a customised template.txt file replacing the default file
+   /src/WEB-INF/navigation/sci-templates.txt
+This file must be specified in parameter 
+   com.arsdigita.london.navigation.templates_file
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/zes-std/templates/placeholder.info b/ccm-sci-bundle/bundles/local/zes-std/templates/placeholder.info
new file mode 100644
index 000000000..38db9a8ae
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/templates/placeholder.info
@@ -0,0 +1,12 @@
+Subdirectory  <nav> may optionally contain navigation item templates for
+navigation index pages which either overwrite or ammend those templates
+which are default for ccm-sci-bundle and stored in 
+   /web/templates/ccm-navigation/navigation
+
+Templates of the same name in this subdirectory just overwrite the
+default files. Templates of different names are stored in addition
+to the default template files. In the later case a developer must
+provide a customised template.txt file replacing the default file
+   /src/WEB-INF/navigation/sci-templates.txt
+This file must be specified in parameter 
+   com.arsdigita.london.navigation.templates_file
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/zes-std/themes/README b/ccm-sci-bundle/bundles/local/zes-std/themes/README
new file mode 100644
index 000000000..13248d9bb
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/themes/README
@@ -0,0 +1,13 @@
+Bundle subdir themes
+
+Purpose:
+This subdir may optionally contain theme files which either replace part of the
+theme or add files to the theme provided as default for ScientificCMS and this
+way adopt the theme for site specific design. 
+
+All files and subdirectories all copied asis to the applications ~/themes 
+directory in its document (context) root.
+
+It is the responsibility of developer / system integrator to ensure all files
+are copied to the right location and the theme works with the modification. No
+functionality or consistency check is perfordmed!
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/zes-std/themes/master/dummy b/ccm-sci-bundle/bundles/local/zes-std/themes/master/dummy
new file mode 100644
index 000000000..beec54a4d
--- /dev/null
+++ b/ccm-sci-bundle/bundles/local/zes-std/themes/master/dummy
@@ -0,0 +1 @@
+Just a dummy file for test purpose during development.
\ No newline at end of file