diff --git a/ccm-core/src/com/arsdigita/bebop/BebopConfig.java b/ccm-core/src/com/arsdigita/bebop/BebopConfig.java index b9d07ee4c..00349b146 100755 --- a/ccm-core/src/com/arsdigita/bebop/BebopConfig.java +++ b/ccm-core/src/com/arsdigita/bebop/BebopConfig.java @@ -80,7 +80,6 @@ public final class BebopConfig extends AbstractConfig { /** List of supported DHTML editors, first one is default (Xinha) */ m_dhtmlEditor = new EnumerationParameter("waf.bebop.dhtml_editor", Parameter.REQUIRED,BebopConstants.BEBOP_XINHAEDITOR); -// Parameter.REQUIRED,BebopConstants.BEBOP_DHTMLEDITOR); m_dhtmlEditor.put("Xinha", BebopConstants.BEBOP_XINHAEDITOR); m_dhtmlEditor.put("FCKeditor", BebopConstants.BEBOP_FCKEDITOR); // HTMLArea for backwards compatibility with old XSL. to be removed soon! diff --git a/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg b/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg index cc4ead0b1..84ddc687f 100644 --- a/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg +++ b/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg @@ -1,3 +1,4 @@ +# ZeS devel application.cfg # Main apps ccm-core ccm-cms @@ -14,18 +15,11 @@ ccm-cms-types-address ccm-cms-types-article ccm-cms-types-bookmark ccm-cms-types-contact -# -- ccm-cms-types-esdservice ccm-cms-types-event -# -- faqitem koennte bei zes auch entfallen -# 2008-06-07 auskommentiert, ist in Produktionssystem -# nicht enthalten und nicht anwählbar. # -- ccm-cms-types-faqitem ccm-cms-types-filestorageitem ccm-cms-types-formitem ccm-cms-types-formsectionitem -# -- glossaryitem koennte bei zes auch entfallen -# 2008-06-07 auskommentiert, ist in Produktionssystem -# nicht enthalten und nicht anwählbar. # -- ccm-cms-types-glossaryitem # -- ccm-cms-types-htmlform # -- ccm-cms-types-inlinesite @@ -34,6 +28,7 @@ ccm-cms-types-formsectionitem # -- ccm-cms-types-member # -- ccm-cms-types-minutes # -- ccm-cms-types-motditem + ccm-cms-types-mparticle ccm-cms-types-newsitem # -- ccm-cms-types-organization @@ -65,6 +60,7 @@ ccm-user-preferences # -- ccm-ldn-exporter # -- ccm-ldn-freeform # -- ccm-ldn-importer + ccm-ldn-navigation ccm-ldn-portal ccm-ldn-rss diff --git a/ccm-zes-aplaws/bundles/devel/cfg/integration.properties b/ccm-zes-aplaws/bundles/devel/cfg/integration.properties index 905dad38b..4b093b235 100644 --- a/ccm-zes-aplaws/bundles/devel/cfg/integration.properties +++ b/ccm-zes-aplaws/bundles/devel/cfg/integration.properties @@ -1,9 +1,12 @@ +# ZeS devel bundle integration.properties +# waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage +# ; dhtml editor to use (system wide) -waf.bebop.dhtml_editor=FCKeditor +; 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 ; @@ -11,35 +14,39 @@ 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 -core.ui.pagemap.root_page_url=navigation/ -core.ui.pagemap.workspace_url=navigation/ -core.ui.pagemap.user_redirect_url=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 + ; 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_item_template_path=/default/aplaws-item.jsp 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 -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_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= @@ -56,64 +63,77 @@ com.arsdigita.cms.use_section_categories=false com.arsdigita.cms.use_streamlined_creation=true -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 +# 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 -; atoz currently not in use -; com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker -; com.arsdigita.london.navigation.category_menu_show_grand_children_min=1 -; com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive -; com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1 -; com.arsdigita.london.navigation.category_menu_show_grand_children_max=65536 +; ccm-ldn-navigation application com.arsdigita.london.navigation.category_menu_show_grand_children=false -; com.arsdigita.london.navigation.category_menu_show_nephews=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-subsite application com.arsdigita.london.theme.default_theme_context= com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-theme.web.mf com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws-generic -com.arsdigita.london.theme.file_extensions=bmp gif jpeg jpg png css js png xsl xml +com.arsdigita.london.theme.file_extensions=bmp css gif jpeg jpg js png xsl xml + + +; ============================================================================================= +; 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_pool_size=30 + +waf.web.server=localhost\:8080 ; ============================================================================================= ; devel specific configurations - -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_pool_size=80 - -waf.web.server=localhost\:8080 - -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.debug=true waf.bebop.fancy_xsl_errors=true diff --git a/ccm-zes-aplaws/bundles/standard/cfg/applications.cfg b/ccm-zes-aplaws/bundles/standard/cfg/applications.cfg index 4c24ba273..a0888478b 100644 --- a/ccm-zes-aplaws/bundles/standard/cfg/applications.cfg +++ b/ccm-zes-aplaws/bundles/standard/cfg/applications.cfg @@ -1,3 +1,4 @@ +# ZeS standard application.cfg # Main apps ccm-core ccm-cms @@ -14,18 +15,11 @@ ccm-cms-types-address ccm-cms-types-article ccm-cms-types-bookmark ccm-cms-types-contact -# -- ccm-cms-types-esdservice ccm-cms-types-event -# -- faqitem koennte bei zes auch entfallen -# 2008-06-07 auskommentiert, ist in Produktionssystem -# nicht enthalten und nicht anwählbar. # -- ccm-cms-types-faqitem ccm-cms-types-filestorageitem ccm-cms-types-formitem ccm-cms-types-formsectionitem -# -- glossaryitem koennte bei zes auch entfallen -# 2008-06-07 auskommentiert, ist in Produktionssystem -# nicht enthalten und nicht anwählbar. # -- ccm-cms-types-glossaryitem # -- ccm-cms-types-htmlform # -- ccm-cms-types-inlinesite @@ -38,6 +32,7 @@ ccm-cms-types-formsectionitem ccm-cms-types-mparticle ccm-cms-types-newsitem # -- ccm-cms-types-organization +ccm-cms-types-person # -- ccm-cms-types-pressrelease # -- ccm-cms-types-researchnetwork # -- ccm-cms-types-service @@ -67,6 +62,7 @@ ccm-user-preferences ccm-ldn-exporter # -- ccm-ldn-freeform ccm-ldn-importer + ccm-ldn-navigation ccm-ldn-portal ccm-ldn-rss @@ -79,8 +75,8 @@ ccm-ldn-util # sci extensions # -------------- +ccm-cms-dabinimporter ccm-sci-publications - - +ccm-sci-types-organization # integration layer ccm-zes-aplaws diff --git a/ccm-zes-aplaws/bundles/standard/cfg/integration.properties b/ccm-zes-aplaws/bundles/standard/cfg/integration.properties index 232f5c5ef..5855a36a5 100644 --- a/ccm-zes-aplaws/bundles/standard/cfg/integration.properties +++ b/ccm-zes-aplaws/bundles/standard/cfg/integration.properties @@ -1,9 +1,12 @@ +# ZeS standard bundle integration.properties +# waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage +# ; dhtml editor to use (system wide) -;waf.bebop.dhtml_editor=FCKeditor +; 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 ; @@ -11,6 +14,7 @@ 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 @@ -18,26 +22,30 @@ waf.auto_registration_on=false #waf.pagemap.root=navigation/ #waf.pagemap.workspace=navigation/ #waf.pagemap.login_redirect=content/content-center-redirect.jsp -core.ui.pagemap.root_page_url=navigation/ -core.ui.pagemap.workspace_url=navigation/ -core.ui.pagemap.user_redirect_url=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 + ; 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_item_template_path=/default/aplaws-item.jsp 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 ;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= @@ -55,62 +63,71 @@ com.arsdigita.cms.use_section_categories=false com.arsdigita.cms.use_streamlined_creation=true -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 +# 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 -; atoz currently not in use -; com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker -; com.arsdigita.london.navigation.category_menu_show_grand_children_min=1 -; com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive -; com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1 -; com.arsdigita.london.navigation.category_menu_show_grand_children_max=65536 +; ccm-ldn-navigation application com.arsdigita.london.navigation.category_menu_show_grand_children=false -; com.arsdigita.london.navigation.category_menu_show_nephews=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-subsite application com.arsdigita.london.theme.default_theme_context= com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-theme.web.mf com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws-generic -com.arsdigita.london.theme.file_extensions=bmp gif jpeg jpg png css js png xsl xml +com.arsdigita.london.theme.file_extensions=bmp css gif jpeg jpg js png xsl xml ; ============================================================================================= -; devel specific configurations -waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/zes?user\=zes&password\=zes -waf.runtime.jdbc_pool_size=80 - -waf.web.server=localhost\:8080 +; runtime specific configurations waf.admin.email=webmaster@zes.uni-bremen.de -waf.admin.name.given=ZeS +waf.admin.name.given=ZeS waf.admin.name.family=Administrator waf.admin.password=nge2015 -waf.admin.password.question=12345 +waf.admin.password.question=12345 waf.admin.password.answer=6 -;waf.debug=true -;waf.bebop.fancy_xsl_errors=true +waf.runtime.jdbc_url=jdbc\:postgresql\://134.102.3.27/zes?user\=zes&password\=zes +waf.runtime.jdbc_pool_size=60 +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