diff --git a/ccm-bundle/bundles/standard/cfg/integration.properties b/ccm-bundle/bundles/standard/cfg/integration.properties
new file mode 100644
index 000000000..9d4aa5614
--- /dev/null
+++ b/ccm-bundle/bundles/standard/cfg/integration.properties
@@ -0,0 +1,236 @@
+# ##############################################################################
+# Libre CMS STANDARD bundle integration.properties, version 2.0.x
+# ##############################################################################
+#
+#
+# CORE BEBOP configuration parameters
+# ##############################################################################
+waf.bebop.base_page=com.arsdigita.bundle.ui.SimplePage
+#
+; dhtml editor to use (system wide)
+; Xinha is default
+; default: Xinha editor & src=/assets/xinha/XinhaLoader.js
+; To use FCKeditor configure:
+; waf.bebop.dhtml_editor=FCKeditor
+
+waf.categorization.show_internal_name=true
+
+waf.dispatcher.default_expiry=3600
+
+
+# CORE KERNEL configuration parameters
+# ##############################################################################
+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
+waf.kernel.language_independent_items=true
+
+# CORE KERNEL.SECURITY configuration parameters
+# ##############################################################################
+; waf.login_config resembles DEFAULTS, but leaves off RegisterSSO, TODO CHECK!!
+; config file is cad.kernel.security.SecurityConfig
+; waf.login_config=Request\:com.arsdigita.kernel.security.AdminLoginModule\:sufficient,Request\:com.arsdigita.kernel.security.RecoveryLoginModule\:sufficient,Request\:com.arsdigita.kernel.security.CookieLoginModule\:requisite,Register\:com.arsdigita.kernel.security.LocalLoginModule\:requisite,Register\:com.arsdigita.kernel.security.UserIDLoginModule\:requisite,Register\:com.arsdigita.kernel.security.CookieLoginModule\:optional
+waf.auto_registration_on=false
+
+# CORE MAIL configuration parameters
+# ##############################################################################
+waf.mail.default_from=webmaster@librecms.org
+
+
+# CORE SEARCH.LUCENE configuration parameters
+# ##############################################################################
+waf.search.indexer=lucene
+; Below parameter used in version 1.0.4, now outdated und not valid anymore
+; May be useful to chech the lucene serach functionality. Has to be deleted
+; after all QA testing
+; waf.lucene.location=/var/ccm-devel/web/redhat/intratest/data/lucene
+
+
+# CORE TEMPLATING configuration parameters
+# ##############################################################################
+; Searches for localized style sheet (among others)
+waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
+waf.templating.stylesheet_paths=/WEB-INF/resources/librecms-stylesheet-paths.txt
+
+# CORE UI configuration parameters
+# ##############################################################################
+core.ui.pagemap.root_page_url=/navigation/
+#core.ui.pagemap.user_redirect_url=content-center/redirect.jsp
+core.ui.pagemap.user_redirect_url=/content-center/
+core.ui.pagemap.workspace_url=/navigation/
+
+
+# CORE WEB configuration parameters
+# ##############################################################################
+# TODO: Check what exactly happens with/without this parameter set
+;waf.web.cache_policy=none
+; Default value is FALSE
+;waf.web.deactivate_cache_host_notifications=true
+;waf.web.dynamic_host_provider=com.arsdigita.util.servlet.HttpHost.SubsiteDynamicHostProvider
+
+
+# CORE WORKFLOW configuration parameters
+# ##############################################################################
+waf.workflow.simple.alerts_enabled=true
+waf.workflow.simple.alerts_sender=webmaster@libreCMS.org
+
+# CORE XML processing configuration parameters
+# ##############################################################################
+waf.xml.xsl_transformer=xalan
+waf.xml.activate_full_date_formatter=true
+
+
+
+# CMS configuration parameters
+# ##############################################################################
+com.arsdigita.cms.allow_content_create_in_section_listing=false
+
+# In order to create several content-section uncomment the line below and
+# list the desired content section names
+#com.arsdigita.cms.loader.section_names=generic,openccm,homepages
+com.arsdigita.cms.loader.section_names=info
+
+# Replace CMS category form with a terms specific widget
+com.arsdigita.cms.category_authoring_add_form=com.arsdigita.london.terms.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.subsite.dispatcher.SubsiteItemTemplateResolver
+
+; Configure dhtml editor for use in cms content-center
+; Xinha is default and does work out of the box
+; A CCM specific configuration file is used to prevent a mess with the standard
+; configuration, default is:
+; com.arsdigita.cms.dhtml_editor_config=Xinha.Config,/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_hidden_buttons=
+; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
+
+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.image_browser.thumbnail_max_width=200
+com.arsdigita.cms.image_browser.thumbnail_max_height=150
+
+com.arsdigita.cms.soon_expired_timespan_days=7
+com.arsdigita.cms.soon_expired_timespan_months=0
+
+com.arsdigita.cms.unpublished_not_found=false
+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_date_description=false
+com.arsdigita.cms.contenttypes.event.hide_event_type=true
+com.arsdigita.cms.contenttypes.event.hide_link_to_map=true
+com.arsdigita.cms.contenttypes.event.hide_main_contributor=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
+
+# AtoZ configuration parameters
+# ##############################################################################
+com.arsdigita.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+
+# FORUM application
+# ##############################################################################
+# com.arsdigita.forum.admin_can_edit_posts=true ; DEFAULT anyway
+com.arsdigita.forum.allow_quick_finish=true
+# com.arsdigita.forum.author_can_edit_posts=true ; DEFAULT anyway
+com.arsdigita.forum.disable_page_caching=true
+com.arsdigita.forum.show_new_tabs=true
+com.arsdigita.forum.use_wysiwyg_editor=true
+
+# NAVIGATION application
+# ##############################################################################
+; com.arsdigita.navigation.category_menu_show_grand_children_min=1
+; com.arsdigita.navigation.category_menu_show_grand_children=adaptive
+; com.arsdigita.navigation.category_menu_show_grand_children_limit=1
+; com.arsdigita.navigation.category_menu_show_grand_children_max=65536
+com.arsdigita.navigation.category_menu_show_grand_children=false
+; com.arsdigita.navigation.category_menu_show_nephews=false
+com.arsdigita.navigation.default_cat_root_path=/navigation/
+com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/gen-default.jsp
+com.arsdigita.navigation.templates_file=bundle/navigation/gen-templates.txt
+
+
+# SUBSITE configuration parameters
+# ##############################################################################
+com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+
+
+# THEMEDIRECTOR configuration parameters
+# ##############################################################################
+# Required to point to the package containing the theme to copy from when creating
+# a new theme! (In addition to default_theme_path. Otherwise no files are copied!
+themedirector.default_theme_manifest=ccm-bundle.web.mf
+# Required to denote the dir containing the default theme!
+themedirector.default_theme_path=themes/static/aplaws-generic
+
+# LDN-SEARCH application
+# ##############################################################################
+com.arsdigita.london.search.show_sponsored_links=true
+; Comment this out or increase the num_of_threads if you really use remote search
+com.arsdigita.london.search.num_threads=0
+
+# AUTH-HTTP application
+# ##############################################################################
+auth.http.admin_email=webmaster@aplaws.org
+auth.http.admin_identifier=webmaster
+
+# ccm-bundle integration package configuration parameter
+# ##############################################################################
+# ccm-bundle (Loader only)
+#com.arsdigita.bundle.loader.category_files=bundle/categories/sci-nav-domain-1.00.xml,bundle/categories/sci-nav-hierarchy-1.00.xml
+#com.arsdigita.bundle.loader.custom_app_instances=com.arsdigita.navigation.Navigation:scimenu:ScientificCMS Navigation Menu,com.arsdigita.navigation.Navigation:libmenu:LibreCMS Navigation Menu
+#com.arsdigita.bundle.loader.domain_mappings=STD-NAV:/navigation/,STD-NAV:/generic/,STD-NAV:/portal/
+com.arsdigita.bundle.loader.domain_mappings=STD-NAV:/navigation/,STD-NAV:/info/,STD-NAV:/portal/
+
+
+# ==============================================================================
+# runtime specific configurations
+# ==============================================================================
+
+waf.admin.email=webmaster@libreCMS.org
+waf.admin.name.given=LibreCMS
+waf.admin.name.family=Administrator
+waf.admin.password=lib2000
+waf.admin.password.question=12345
+waf.admin.password.answer=6
+
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm42web
+waf.runtime.jdbc_pool_size=60
+
+waf.web.server=localhost\:8080
+
+
+# =============================================================================================
+# devel specific configurations
+waf.debug=false
+waf.bebop.fancy_xsl_errors=false
+
diff --git a/ccm-bundle/bundles/standard/cfg/project.xml b/ccm-bundle/bundles/standard/cfg/project.xml
new file mode 100644
index 000000000..ac3d906d1
--- /dev/null
+++ b/ccm-bundle/bundles/standard/cfg/project.xml
@@ -0,0 +1,178 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-bundle/bundles/standard/cfg/web-ccm.xml b/ccm-bundle/bundles/standard/cfg/web-ccm.xml
new file mode 100644
index 000000000..fd3f469d1
--- /dev/null
+++ b/ccm-bundle/bundles/standard/cfg/web-ccm.xml
@@ -0,0 +1,591 @@
+
+
+
+ LibreCMS DEMO Site
+ Community and Content Management
+
+
+
+ log4j-conf-file
+ WEB-INF/conf/log4j.properties
+
+
+
+
+
+
+
+ shortcuts
+ com.arsdigita.shortcuts.ShortcutFilter
+
+
+
+ subsite
+ com.arsdigita.subsite.SubsiteFilter
+
+
+
+
+
+
+ subsite
+ /*
+
+
+
+ shortcuts
+ /*
+
+
+
+
+ com.arsdigita.web.CCMApplicationContextListener
+
+
+
+
+
+ reg
+ com.arsdigita.web.ContextRegistrationServlet
+
+ uri
+ /
+
+ 1
+
+
+
+ ccm-dispatcher
+ com.arsdigita.web.DispatcherServlet
+ 2
+
+
+
+ cache-manager
+ com.arsdigita.caching.CacheServlet
+
+
+
+ db-test
+ com.arsdigita.web.monitoring.DBTestServlet
+
+
+
+ versioning-log
+ com.arsdigita.versioning.VersioningServlet
+
+
+
+ login
+ com.arsdigita.ui.login.LoginServlet
+
+
+
+ webadmin
+ com.arsdigita.ui.admin.AdminServlet
+
+
+
+ webadmin-permissions
+ com.arsdigita.ui.permissions.PermissionsServlet
+
+
+
+ webdevsupport
+ com.arsdigita.webdevsupport.WebDevSupportServlet
+
+
+
+ oid-redirect
+ com.arsdigita.web.OIDRedirectServlet
+
+
+
+ resource-resolver
+ com.arsdigita.web.ResourceServlet
+
+
+
+
+
+ content-center
+ com.arsdigita.cms.ContentCenterServlet
+
+
+
+ content-section
+ com.arsdigita.cms.ContentSectionServlet
+
+
+
+ cms-service
+ com.arsdigita.cms.ServiceServlet
+
+
+
+ content-type-xsl
+ com.arsdigita.cms.dispatcher.ContentTypeXSLServlet
+
+
+
+ content-item-xsl
+ com.arsdigita.cms.dispatcher.ContentItemXSLServlet
+
+
+
+ template-xsl
+ com.arsdigita.cms.dispatcher.TemplateXSLServlet
+
+
+
+ TextOnlyServlet
+ Text Only Servlet
+
+ com.arsdigita.web.InternalPrefixerServlet
+
+
+ prefix
+ /text
+
+
+
+
+ PrintFriendlyServlet
+ Printer Friendly Output Servlet
+
+ com.arsdigita.web.InternalPrefixerServlet
+
+
+ prefix
+ /print
+
+
+
+
+
+
+
+ atoz-files
+ com.arsdigita.web.ApplicationFileServlet
+
+ template-path
+ /templates/ccm-atoz
+
+
+
+
+
+
+ forum-main
+ com.arsdigita.forum.ForumServlet
+
+
+
+
+ portalworkspace-files
+ com.arsdigita.web.ApplicationFileServlet
+
+ template-path
+ /templates/ccm-portalworkspace
+
+
+
+
+ navigation-files
+ com.arsdigita.web.ApplicationFileServlet
+
+ template-path
+ /templates/ccm-navigation
+
+
+ file-resolver
+ com.arsdigita.navigation.NavigationFileResolver
+
+
+
+
+ portlet-type-xsl
+ com.arsdigita.dispatcher.PortletTypeXSLServlet
+
+
+
+
+ rssfeed-files
+ com.arsdigita.web.ApplicationFileServlet
+
+ template-path
+ /templates/ccm-rssfeed
+
+
+ file-resolver
+ com.arsdigita.rssfeed.RSSFileResolver
+
+
+
+
+
+
+ search-files
+ com.arsdigita.web.ApplicationFileServlet
+
+ template-path
+ /templates/ccm-ldn-search
+
+
+
+
+ AxisServlet
+ Apache-Axis Servlet
+
+ org.apache.axis.transport.http.AxisServlet
+
+
+
+
+
+
+ shortcuts-files
+ com.arsdigita.web.ApplicationFileServlet
+
+ template-path
+ /templates/ccm-shortcuts
+
+
+
+
+
+ subsite-files
+ com.arsdigita.web.ApplicationFileServlet
+
+ template-path
+ /templates/ccm-subsite
+
+
+
+
+
+
+ terms-files
+ com.arsdigita.web.ApplicationFileServlet
+
+ template-path
+ /templates/ccm-ldn-terms
+
+
+
+
+
+
+ theme-files
+ com.arsdigita.web.ApplicationFileServlet
+
+ template-path
+ /templates/ccm-themedirector
+
+
+
+
+ ThemeDownload
+ com.arsdigita.themedirector.dispatcher.ThemeDownloadServlet
+
+
+
+ ThemePreviewServlet
+ Servlet to allow admins to preview look/feel
+
+ com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet
+
+
+ prefix
+ /theme
+
+
+
+
+
+
+
+
+ atoz-files
+ /ccm-atoz/files/*
+
+
+
+
+
+ forum-main
+ /forum-main/main/*
+
+
+
+
+ portlet-type-xsl
+ /themes/servlet/portlet-type/*
+
+
+
+ portalworkspace-files
+ /ccm-portalworkspace/files/*
+
+
+
+ navigation-files
+ /ccm-navigation/files/*
+
+
+
+
+ rssfeed-files
+ /ccm-rssfeed/files/*
+
+
+
+
+
+ search-files
+ /ccm-ldn-search/files/*
+
+
+
+ AxisServlet
+ /services/*
+
+
+
+
+
+ shortcuts-files
+ /ccm-shortcuts/files/*
+
+
+
+
+ subsite-files
+ /ccm-subsite/files/*
+
+
+
+
+
+ terms-files
+ /ccm-ldn-terms/files/*
+
+
+
+
+
+ theme-files
+ /theme-files/*
+
+
+
+ ThemeDownload
+ /theme-files/download/*
+
+
+
+ ThemePreviewServlet
+ /theme/*
+
+
+
+
+
+
+
+ reg
+ /themes/null/reg/*
+
+
+
+ ccm-dispatcher
+ /ccm/*
+
+
+
+ cache-manager
+ /expireCache/*
+
+
+
+ db-test
+ /dbtest
+
+
+
+ versioning-log
+ /versioning/*
+
+
+
+ login
+ /login/*
+
+
+
+ webadmin
+ /admin/*
+
+
+
+ webadmin-permissions
+ /admin-permissions/*
+
+
+
+ webdevsupport
+ /webdevsupport/*
+
+
+
+ oid-redirect
+ /redirect/*
+
+
+
+ resource-resolver
+ /resource/*
+
+
+
+
+
+ content-center
+ /templates/servlet/content-center/*
+
+
+
+ content-section
+ /templates/servlet/content-section/*
+
+
+
+ cms-service
+ /templates/servlet/cms-service/*
+
+
+
+ content-item-xsl
+ /templates/servlet/content-item/*
+
+
+
+ content-type-xsl
+ /themes/servlet/content-type/*
+
+
+
+ template-xsl
+ /themes/servlet/template/*
+
+
+
+ TextOnlyServlet
+ /text/*
+
+
+
+ PrintFriendlyServlet
+ /print/*
+
+
+
+
+
+ com.arsdigita.dispatcher.AccessDeniedException
+ /error/access-denied.jsp
+
+
+
+ com.arsdigita.dispatcher.ObjectNotFoundException
+ /error/object-not-found.jsp
+
+
+
+ com.arsdigita.kernel.permissions.PermissionException
+ /error/permission-denied.jsp
+
+
+
+ com.arsdigita.persistence.DbNotAvailableException
+ /error/db-not-available.jsp
+
+
+
+ com.arsdigita.db.DbNotAvailableException
+ /error/db-not-available.jsp
+
+
+
+ java.lang.Exception
+ /error/general.jsp
+
+
+
+ java.lang.Error
+ /error/general.jsp
+
+
+
+
+
+ /WEB-INF/bebop-show.tld
+ /WEB-INF/bebop-show.tld
+
+
+
+ /WEB-INF/bebop-define.tld
+ /WEB-INF/bebop-define.tld
+
+
+
diff --git a/ccm-bundle/bundles/standard/res/bundle/categories/gen-nav-domain-1.00.xml b/ccm-bundle/bundles/standard/res/bundle/categories/gen-nav-domain-1.00.xml
new file mode 100755
index 000000000..48c3ac5d6
--- /dev/null
+++ b/ccm-bundle/bundles/standard/res/bundle/categories/gen-nav-domain-1.00.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-bundle/bundles/standard/res/bundle/categories/gen-nav-hierarchy-1.00.xml b/ccm-bundle/bundles/standard/res/bundle/categories/gen-nav-hierarchy-1.00.xml
new file mode 100755
index 000000000..4f739a2fb
--- /dev/null
+++ b/ccm-bundle/bundles/standard/res/bundle/categories/gen-nav-hierarchy-1.00.xml
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-bundle/bundles/standard/res/bundle/categories/placeholder.info b/ccm-bundle/bundles/standard/res/bundle/categories/placeholder.info
new file mode 100644
index 000000000..5ae76207c
--- /dev/null
+++ b/ccm-bundle/bundles/standard/res/bundle/categories/placeholder.info
@@ -0,0 +1,3 @@
+Subdirectory may optionally contain one or more local site specific
+import xml files for Terms domain categories.
+
diff --git a/ccm-bundle/bundles/standard/res/bundle/categories/xample-nav-domain.xml b/ccm-bundle/bundles/standard/res/bundle/categories/xample-nav-domain.xml
new file mode 100644
index 000000000..87ee0c8c2
--- /dev/null
+++ b/ccm-bundle/bundles/standard/res/bundle/categories/xample-nav-domain.xml
@@ -0,0 +1,151 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-bundle/bundles/standard/res/bundle/categories/xample-nav-hierarchy.xml b/ccm-bundle/bundles/standard/res/bundle/categories/xample-nav-hierarchy.xml
new file mode 100644
index 000000000..ed6c7c16b
--- /dev/null
+++ b/ccm-bundle/bundles/standard/res/bundle/categories/xample-nav-hierarchy.xml
@@ -0,0 +1,1034 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-bundle/bundles/standard/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml b/ccm-bundle/bundles/standard/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
new file mode 100644
index 000000000..b983bd2d7
--- /dev/null
+++ b/ccm-bundle/bundles/standard/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
@@ -0,0 +1,160 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ccm-bundle/bundles/standard/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl b/ccm-bundle/bundles/standard/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
new file mode 100644
index 000000000..34b25d21e
--- /dev/null
+++ b/ccm-bundle/bundles/standard/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-bundle/bundles/standard/res/bundle/navigation/gen-templates.txt b/ccm-bundle/bundles/standard/res/bundle/navigation/gen-templates.txt
new file mode 100755
index 000000000..65aa29330
--- /dev/null
+++ b/ccm-bundle/bundles/standard/res/bundle/navigation/gen-templates.txt
@@ -0,0 +1,8 @@
+LibreCMS Default Items Page,Default Navigation Index Page ordering items in ascending order,/templates/ccm-navigation/navigation/gen-default.jsp
+LibreCMS Recent Items Page,List of items ordered with most recent first,/templates/ccm-navigation/navigation/gen-recent.jsp
+LibreCMS A-Z Items,List of items paginated as A-Z,/templates/ccm-navigation/navigation/gen-atoz.jsp
+LibreCMS Events Page,Events Page ordering events in decending order,/templates/ccm-navigation/navigation/gen-events.jsp
+LibreCMS Portal Page,Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-navigation/navigation/gen-portal.jsp
+LibreCMS Portal Welcome Page,Portal page meant as site welcome page,/templates/ccm-navigation/navigation/gen-portal-welcome.jsp
+LibreCMS Navigation Welcome Page,Site welcome page created by navigation root term,/templates/ccm-navigation/navigation/gen-welcome.jsp
+LibreCMS Specializing Items List,Specialising List item page,/templates/ccm-navigation/navigation/SpecializingList.jsp
\ No newline at end of file
diff --git a/ccm-bundle/bundles/standard/res/placeholder.info b/ccm-bundle/bundles/standard/res/placeholder.info
new file mode 100644
index 000000000..5ae76207c
--- /dev/null
+++ b/ccm-bundle/bundles/standard/res/placeholder.info
@@ -0,0 +1,3 @@
+Subdirectory may optionally contain one or more local site specific
+import xml files for Terms domain categories.
+
diff --git a/ccm-bundle/bundles/standard/templates/placeholder.info b/ccm-bundle/bundles/standard/templates/placeholder.info
new file mode 100644
index 000000000..c78cf06e6
--- /dev/null
+++ b/ccm-bundle/bundles/standard/templates/placeholder.info
@@ -0,0 +1,12 @@
+Subdirectory