Anpassung an Änderungen in ccm-cms und ccm-core.

git-svn-id: https://svn.libreccm.org/ccm/trunk@2048 8810af33-2d31-482b-a856-94f89814c4df

ccm-sci-bundle/bundles/base/cfg/integration.properties

@@ -1,5 +1,10 @@
-# Scientific CMS Base Bundle integration.properties
+# ##############################################################################
+# Scientific CMS Base 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)
@@ -11,7 +16,10 @@ waf.bebop.base_page=com.arsdigita.bundle.ui.SimplePage
 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.
@@ -19,40 +27,83 @@ waf.kernel.primary_user_identifier=email
 waf.kernel.supported_languages=de,en
 waf.kernel.language_independent_items=true
 
-; security.properties: 
+# 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@scientificcms.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/scientificCMS-stylesheet-paths.txt
 
-core.ui.pagemap.root_page_url=navigation/
-core.ui.pagemap.workspace_url=navigation/
-core.ui.pagemap.user_redirect_url=content-center/redirect.jsp
 
-; workflow configuration
+# CORE UI configuration parameters
+# ##############################################################################
+core.ui.pagemap.root_page_url=/portal/
+#core.ui.pagemap.user_redirect_url=content-center/redirect.jsp
+core.ui.pagemap.user_redirect_url=/content-center/
+core.ui.pagemap.workspace_url=/portal/
+# With version 2 moved from kernel/security to ui rsp ui.permissions and
+# no longer intended to be user configurable. 
+# TODO CHECK what these URLS (esp. ../one) is used for.
+# waf.pagemap.permission=permissions/                   ; DEFAULT
+# waf.pagemap.perm_single=permissions/one
+
+
+# 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=root@localhost.localdomain
 
-; Configures the xml processing
+# CORE XML processing configuration parameters
+# ##############################################################################
 waf.xml.xsl_transformer=xalan
 waf.xml.activate_full_date_formatter=true
 
-# ccm-cms parameters
+
+
+# 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,sci,libre,homepages
 
-com.arsdigita.cms.category_authoring_add_form=com.arsdigita.bundle.ui.ItemCategoryPicker
+# 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
 
-# image library thumbnail size
-com.arsdigita.cms.image_browser.thumbnail_max_width=200
-com.arsdigita.cms.image_browser.thumbnail_max_height=150
-
 ; 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
@@ -64,7 +115,6 @@ com.arsdigita.cms.image_browser.thumbnail_max_height=150
 ; com.arsdigita.cms.dhtml_editor_hidden_buttons=
 ; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
 
-com.arsdigita.cms.allow_content_create_in_section_listing=false
 com.arsdigita.cms.disable_item_pfs=true
 
 com.arsdigita.cms.hide_admin_tabs=true
@@ -74,11 +124,16 @@ 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
 
-com.arsdigita.cms.image_browser.thumbnail_max_width=200
-com.arsdigita.cms.image_browser.thumbnail_max_height=150
 
 # ccm-cms-types-event parameters
 com.arsdigita.cms.contenttypes.event.hide_cost=true
@@ -97,14 +152,21 @@ com.arsdigita.cms.contenttypes.newsitem.start_year=2000
 com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
 
 
-# Forum application
+# 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
-com.arsdigita.forum.allow_quick_finish=true
-com.arsdigita.forum.disable_page_caching=true
 
-
+# NAVIGATION application
-# ccm-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
@@ -116,36 +178,49 @@ com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/s
 com.arsdigita.navigation.templates_file=bundle/navigation/sci-templates.txt
 
 
-# ccm-search application
+# 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/mandalay
+
+# 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
-# ccm-subsite application
+# ##############################################################################
-com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
-
-
-# ccm-themedirector application
-# Required to point to the bundle 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-sci-bundle.web.mf
-# Required to denote the dir containing the default theme!
-themedirector.default_theme_path=themes/mandalay
-
-#  atoz 
-com.arsdigita.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
-
-# ccm-auth-http application
 auth.http.admin_email=webmaster@scientificcms.org
 auth.http.admin_identifier=webmaster
 
+# LDN Dublin Core configuration parameters
+# ##############################################################################
+com.arsdigita.london.cms.dublin.audience_domain=LGAL
+
+
+
+
+
+
+
+# SCI bundles integration package configuration parameters
+# ##############################################################################
 # ccm-sci-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/
 # =============================================================================================
 # runtime specific configurations
+# ==============================================================================
 
 ; waf.admin.email=
 ; waf.admin.name.given=

ccm-sci-bundle/bundles/base/cfg/web-sci.xml

@@ -92,6 +92,7 @@
     <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
     <load-on-startup>2</load-on-startup>
   </servlet>
+  
   <servlet>
     <servlet-name>cache-manager</servlet-name>
     <servlet-class>com.arsdigita.caching.CacheServlet</servlet-class>
@@ -144,7 +145,7 @@
 
   <servlet>
     <servlet-name>content-center</servlet-name>
-    <servlet-class>com.arsdigita.cms.WorkspaceServlet</servlet-class>
+    <servlet-class>com.arsdigita.cms.ContentCenterServlet</servlet-class>
   </servlet>
 
   <servlet>

ccm-sci-bundle/bundles/demo/cfg/integration.properties

@@ -1,5 +1,10 @@
+# ##############################################################################
 # Scientific CMS demo bundle integration.properties
+# ##############################################################################
 #
+#
+# CORE BEBOP configuration parameters
+# ##############################################################################
 waf.bebop.base_page=com.arsdigita.bundle.ui.SimplePage
 #
 ; dhtml editor to use (system wide)
@@ -11,7 +16,10 @@ waf.bebop.base_page=com.arsdigita.bundle.ui.SimplePage
 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.
@@ -19,40 +27,83 @@ waf.kernel.primary_user_identifier=email
 waf.kernel.supported_languages=de,en
 waf.kernel.language_independent_items=true
 
-; security.properties: 
+# 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/scientificCMS-stylesheet-paths.txt
 
-core.ui.pagemap.root_page_url=navigation/
-core.ui.pagemap.workspace_url=navigation/
-core.ui.pagemap.user_redirect_url=content-center/redirect.jsp
 
-; workflow configuration
+# CORE UI configuration parameters
+# ##############################################################################
+core.ui.pagemap.root_page_url=/portal/
+#core.ui.pagemap.user_redirect_url=content-center/redirect.jsp
+core.ui.pagemap.user_redirect_url=/content-center/
+core.ui.pagemap.workspace_url=/portal/
+# With version 2 moved from kernel/security to ui rsp ui.permissions and
+# no longer intended to be user configurable. 
+# TODO CHECK what these URLS (esp. ../one) is used for.
+# waf.pagemap.permission=permissions/                   ; DEFAULT
+# waf.pagemap.perm_single=permissions/one
+
+
+# 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=root@localhost.localdomain
 
-; Configures the xml processing
+# CORE XML processing configuration parameters
+# ##############################################################################
 waf.xml.xsl_transformer=xalan
 waf.xml.activate_full_date_formatter=true
 
-# ccm-cms parameters
+
+
+# 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=institute,homepages,publications,research
 
-com.arsdigita.cms.category_authoring_add_form=com.arsdigita.bundle.ui.ItemCategoryPicker
+# 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
 
-# image library thumbnail size
-com.arsdigita.cms.image_browser.thumbnail_max_width=200
-com.arsdigita.cms.image_browser.thumbnail_max_height=150
-
 ; 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
@@ -64,7 +115,6 @@ com.arsdigita.cms.image_browser.thumbnail_max_height=150
 ; com.arsdigita.cms.dhtml_editor_hidden_buttons=
 ; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
 
-com.arsdigita.cms.allow_content_create_in_section_listing=false
 com.arsdigita.cms.disable_item_pfs=true
 
 com.arsdigita.cms.hide_admin_tabs=true
@@ -74,11 +124,16 @@ 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
 
-com.arsdigita.cms.image_browser.thumbnail_max_width=200
-com.arsdigita.cms.image_browser.thumbnail_max_height=150
 
 # ccm-cms-types-event parameters
 com.arsdigita.cms.contenttypes.event.hide_cost=true
@@ -97,14 +152,21 @@ com.arsdigita.cms.contenttypes.newsitem.start_year=2000
 com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
 
 
-# Forum application
+# 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
-com.arsdigita.forum.allow_quick_finish=true
-com.arsdigita.forum.disable_page_caching=true
 
-
+# NAVIGATION application
-# ccm-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
@@ -116,30 +178,49 @@ com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/s
 com.arsdigita.navigation.templates_file=bundle/navigation/sci-templates.txt
 
 
-# ccm-search application
+# SUBSITE configuration parameters
-com.arsdigita.london.search.show_sponsored_links=true
+# ##############################################################################
-; Comment this out or increase the num_of_threads iv you really use remote search
-com.arsdigita.london.search.num_threads=0
-
-
-# ccm-subsite application
 com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
 
-# ccm-themedirector application
+# THEMEDIRECTOR configuration parameters
+# ##############################################################################
 # Required to point to the bundle 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-sci-bundle.web.mf
 # Required to denote the dir containing the default theme!
 themedirector.default_theme_path=themes/mandalay
 
+# 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@scientificcms.org
+auth.http.admin_identifier=webmaster
+
+# LDN Dublin Core configuration parameters
+# ##############################################################################
+com.arsdigita.london.cms.dublin.audience_domain=LGAL
+
+
+
+
+
+
+
+# SCI bundles integration package configuration parameters
+# ##############################################################################
 # ccm-sci-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:/portal/,STD-NAV:/institute/,STD-NAV:/homepages/,STD-NAV:/research/,STD-NAV:/publications/
 # =============================================================================================
 # runtime specific configurations
+# ==============================================================================
 
 waf.admin.email=webmaster@scientificCMS.org
 waf.admin.name.given=SCI

ccm-sci-bundle/bundles/demo/cfg/web-sci.xml

@@ -92,6 +92,7 @@
     <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
     <load-on-startup>2</load-on-startup>
   </servlet>
+  
   <servlet>
     <servlet-name>cache-manager</servlet-name>
     <servlet-class>com.arsdigita.caching.CacheServlet</servlet-class>
@@ -144,7 +145,7 @@
 
   <servlet>
     <servlet-name>content-center</servlet-name>
-    <servlet-class>com.arsdigita.cms.WorkspaceServlet</servlet-class>
+    <servlet-class>com.arsdigita.cms.ContentCenterServlet</servlet-class>
   </servlet>
 
   <servlet>

ccm-sci-bundle/bundles/devel/cfg/integration.properties

@@ -1,5 +1,10 @@
-# Scientific CMS devel bundle integration.properties
+# ##############################################################################
+# Scientific CMS devel 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)
@@ -11,7 +16,10 @@ waf.bebop.base_page=com.arsdigita.bundle.ui.SimplePage
 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.
@@ -19,40 +27,83 @@ waf.kernel.primary_user_identifier=email
 waf.kernel.supported_languages=de,en
 waf.kernel.language_independent_items=true
 
-; security.properties: 
+# 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@scientificcms.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/scientificCMS-stylesheet-paths.txt
 
-core.ui.pagemap.root_page_url=navigation/
-core.ui.pagemap.workspace_url=navigation/
-core.ui.pagemap.user_redirect_url=content-center/redirect.jsp
 
-; workflow configuration
+# CORE UI configuration parameters
+# ##############################################################################
+core.ui.pagemap.root_page_url=/portal/
+#core.ui.pagemap.user_redirect_url=content-center/redirect.jsp
+core.ui.pagemap.user_redirect_url=/content-center/
+core.ui.pagemap.workspace_url=/portal/
+# With version 2 moved from kernel/security to ui rsp ui.permissions and
+# no longer intended to be user configurable. 
+# TODO CHECK what these URLS (esp. ../one) is used for.
+# waf.pagemap.permission=permissions/                   ; DEFAULT
+# waf.pagemap.perm_single=permissions/one
+
+
+# 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=root@localhost.localdomain
 
-; Configures the xml processing
+# CORE XML processing configuration parameters
+# ##############################################################################
 waf.xml.xsl_transformer=xalan
 waf.xml.activate_full_date_formatter=true
 
-# ccm-cms parameters
+
+
+# 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,sci,libre,homepages
 
-com.arsdigita.cms.category_authoring_add_form=com.arsdigita.bundle.ui.ItemCategoryPicker
+# 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
 
-# image library thumbnail size
-com.arsdigita.cms.image_browser.thumbnail_max_width=200
-com.arsdigita.cms.image_browser.thumbnail_max_height=150
-
 ; 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
@@ -64,7 +115,6 @@ com.arsdigita.cms.image_browser.thumbnail_max_height=150
 ; com.arsdigita.cms.dhtml_editor_hidden_buttons=
 ; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
 
-com.arsdigita.cms.allow_content_create_in_section_listing=false
 com.arsdigita.cms.disable_item_pfs=true
 
 com.arsdigita.cms.hide_admin_tabs=true
@@ -74,11 +124,16 @@ 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
 
-com.arsdigita.cms.image_browser.thumbnail_max_width=200
-com.arsdigita.cms.image_browser.thumbnail_max_height=150
 
 # ccm-cms-types-event parameters
 com.arsdigita.cms.contenttypes.event.hide_cost=true
@@ -97,14 +152,21 @@ com.arsdigita.cms.contenttypes.newsitem.start_year=2000
 com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
 
 
-# Forum application
+# 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
-com.arsdigita.forum.allow_quick_finish=true
-com.arsdigita.forum.disable_page_caching=true
 
-
+# NAVIGATION application
-# ccm-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
@@ -116,36 +178,41 @@ com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/s
 com.arsdigita.navigation.templates_file=bundle/navigation/sci-templates.txt
 
 
-# ccm-search application
+# 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/mandalay
+
+# 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
-# ccm-subsite application
+# ##############################################################################
-com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
-
-
-# ccm-themedirector application
-# Required to point to the bundle 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-sci-bundle.web.mf
-# Required to denote the dir containing the default theme!
-themedirector.default_theme_path=themes/mandalay
-
-#  atoz 
-com.arsdigita.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
-
-# ccm-auth-http application
 auth.http.admin_email=webmaster@scientificcms.org
 auth.http.admin_identifier=webmaster
 
+
+
+# SCI bundles integration package configuration parameters
+# ##############################################################################
 # ccm-sci-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/
 # =============================================================================================
 # runtime specific configurations
+# ==============================================================================
 
 waf.admin.email=webmaster@scientificCMS.org
 waf.admin.name.given=SCI

ccm-sci-bundle/bundles/devel/cfg/web-sci.xml

@@ -92,6 +92,7 @@
     <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
     <load-on-startup>2</load-on-startup>
   </servlet>
+  
   <servlet>
     <servlet-name>cache-manager</servlet-name>
     <servlet-class>com.arsdigita.caching.CacheServlet</servlet-class>
@@ -144,7 +145,7 @@
 
   <servlet>
     <servlet-name>content-center</servlet-name>
-    <servlet-class>com.arsdigita.cms.WorkspaceServlet</servlet-class>
+    <servlet-class>com.arsdigita.cms.ContentCenterServlet</servlet-class>
   </servlet>
 
   <servlet>

ccm-sci-bundle/bundles/standard/cfg/integration.properties

@@ -1,5 +1,10 @@
-# Scientific CMS standard bundle integration.properties
+# ##############################################################################
+# Scientific 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)
@@ -11,7 +16,10 @@ waf.bebop.base_page=com.arsdigita.bundle.ui.SimplePage
 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.
@@ -19,40 +27,83 @@ waf.kernel.primary_user_identifier=email
 waf.kernel.supported_languages=de,en
 waf.kernel.language_independent_items=true
 
-; security.properties: 
+# 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@scientificcms.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/scientificCMS-stylesheet-paths.txt
 
-core.ui.pagemap.root_page_url=navigation/
-core.ui.pagemap.workspace_url=navigation/
-core.ui.pagemap.user_redirect_url=content-center/redirect.jsp
 
-; workflow configuration
+# CORE UI configuration parameters
+# ##############################################################################
+core.ui.pagemap.root_page_url=/portal/
+#core.ui.pagemap.user_redirect_url=content-center/redirect.jsp
+core.ui.pagemap.user_redirect_url=/content-center/
+core.ui.pagemap.workspace_url=/portal/
+# With version 2 moved from kernel/security to ui rsp ui.permissions and
+# no longer intended to be user configurable. 
+# TODO CHECK what these URLS (esp. ../one) is used for.
+# waf.pagemap.permission=permissions/                   ; DEFAULT
+# waf.pagemap.perm_single=permissions/one
+
+
+# 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=root@localhost.localdomain
 
-; Configures the xml processing
+# CORE XML processing configuration parameters
+# ##############################################################################
 waf.xml.xsl_transformer=xalan
 waf.xml.activate_full_date_formatter=true
 
-# ccm-cms parameters
+
+
+# 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,sci,libre,homepages
 
-com.arsdigita.cms.category_authoring_add_form=com.arsdigita.bundle.ui.ItemCategoryPicker
+# 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
 
-# image library thumbnail size
-com.arsdigita.cms.image_browser.thumbnail_max_width=200
-com.arsdigita.cms.image_browser.thumbnail_max_height=150
-
 ; 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
@@ -64,7 +115,6 @@ com.arsdigita.cms.image_browser.thumbnail_max_height=150
 ; com.arsdigita.cms.dhtml_editor_hidden_buttons=
 ; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
 
-com.arsdigita.cms.allow_content_create_in_section_listing=false
 com.arsdigita.cms.disable_item_pfs=true
 
 com.arsdigita.cms.hide_admin_tabs=true
@@ -74,11 +124,16 @@ 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
 
-com.arsdigita.cms.image_browser.thumbnail_max_width=200
-com.arsdigita.cms.image_browser.thumbnail_max_height=150
 
 # ccm-cms-types-event parameters
 com.arsdigita.cms.contenttypes.event.hide_cost=true
@@ -97,14 +152,21 @@ com.arsdigita.cms.contenttypes.newsitem.start_year=2000
 com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
 
 
-# Forum application
+# 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
-com.arsdigita.forum.allow_quick_finish=true
-com.arsdigita.forum.disable_page_caching=true
 
-
+# NAVIGATION application
-# ccm-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
@@ -116,35 +178,65 @@ com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/s
 com.arsdigita.navigation.templates_file=bundle/navigation/sci-templates.txt
 
 
-# ccm-search application
+# SUBSITE configuration parameters
-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
-
-
-# ccm-subsite application
 com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
 
-# ccm-themedirector application
+# THEMEDIRECTOR configuration parameters
-# Required to point to the bundle containing the theme to copy from when creating
+# ##############################################################################
+# 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-sci-bundle.web.mf
 # Required to denote the dir containing the default theme!
 themedirector.default_theme_path=themes/mandalay
 
-#  atoz 
+# LDN-SEARCH application
-com.arsdigita.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+# ##############################################################################
+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
 
-# ccm-auth-http application
+# AUTH-HTTP application
+# ##############################################################################
 auth.http.admin_email=webmaster@scientificcms.org
 auth.http.admin_identifier=webmaster
 
+# LDN Dublin Core configuration parameters
+# ##############################################################################
+com.arsdigita.london.cms.dublin.audience_domain=LGAL
+
+
+
+
+
+
+
+# SCI bundles integration package configuration parameters
+# ##############################################################################
 # ccm-sci-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/
 # =============================================================================================
+# runtime specific configurations
+# ==============================================================================
+
+; waf.admin.email=
+; waf.admin.name.given=
+; waf.admin.name.family=
+; waf.admin.password=
+; waf.admin.password.question=
+; waf.admin.password.answer=
+
+; waf.runtime.jdbc_url=
+; waf.runtime.jdbc_pool_size=
+
+; waf.web.server=localhost\:8080
 
 
+# =============================================================================================
+# devel specific configurations
+# waf.debug=true
+# waf.bebop.fancy_xsl_errors=true
 

ccm-sci-bundle/bundles/standard/cfg/web-sci.xml

@@ -144,7 +144,7 @@
 
   <servlet>
     <servlet-name>content-center</servlet-name>
-    <servlet-class>com.arsdigita.cms.WorkspaceServlet</servlet-class>
+    <servlet-class>com.arsdigita.cms.ContentCenterServlet</servlet-class>
   </servlet>
 
   <servlet>
@@ -208,6 +208,15 @@
   </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>
@@ -226,6 +235,21 @@
     <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
   </servlet>
  
+  <!-- module ccm-rssfeed  -  servlet declaration BEGIN   -->
+  <servlet>
+    <servlet-name>rssfeed-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-rssfeed</param-value>
+    </init-param>
+    <init-param>
+      <param-name>file-resolver</param-name>
+      <param-value>com.arsdigita.rssfeed.RSSFileResolver</param-value>
+    </init-param>
+  </servlet>
+  <!-- module ccm-rssfeed  -  servlet declaration END   -->
+
   <!-- module ccm-ldn-search  -  servlet declarations BEGIN   -->
   <servlet>
     <servlet-name>search-files</servlet-name>
@@ -310,6 +334,13 @@
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
 
+  <!-- module ccm-forum  -  servlet mappings BEGIN  -->
+  <servlet-mapping>
+    <servlet-name>forum-main</servlet-name>
+    <url-pattern>/forum-main/main/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-forum  -  servlet mappings END    -->
+
   <servlet-mapping>
     <servlet-name>portlet-type-xsl</servlet-name>
     <url-pattern>/themes/servlet/portlet-type/*</url-pattern>
@@ -325,6 +356,13 @@
     <url-pattern>/ccm-navigation/files/*</url-pattern>
   </servlet-mapping>
 
+  <!-- module ccm-rssfeed  -  servlet mappings  BEGIN   -->
+  <servlet-mapping>
+    <servlet-name>rssfeed-files</servlet-name>
+    <url-pattern>/ccm-rssfeed/files/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-rssfeed  -  servlet mappings  END   -->
+
   <!-- module ccm-ldn-search  -  servlet mappings BEGIN  -->
   <servlet-mapping>
     <servlet-name>search-files</servlet-name>