diff --git a/ccm-lcs-bundle/bundles/base/bundle.in b/ccm-lcs-bundle/bundles/base/bundle.in index 093aac421..34169fc8d 100644 --- a/ccm-lcs-bundle/bundles/base/bundle.in +++ b/ccm-lcs-bundle/bundles/base/bundle.in @@ -1,4 +1,4 @@ -BUNDLE_NAME=aplaws-plus-zes-devel -BUNDLE_PRETTY_NAME="APLAWS+ ZeS Devel Bundle" -VERSION=1.1.2devel +BUNDLE_NAME=librecms-custom +BUNDLE_PRETTY_NAME="LibreCMS Custom Bundle" +VERSION=2.3.5devel RELEASE=1 diff --git a/ccm-lcs-bundle/bundles/base/cfg/integration.properties b/ccm-lcs-bundle/bundles/base/cfg/integration.properties index 27c09aa32..53f87df0b 100644 --- a/ccm-lcs-bundle/bundles/base/cfg/integration.properties +++ b/ccm-lcs-bundle/bundles/base/cfg/integration.properties @@ -24,7 +24,8 @@ 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=en,de +waf.kernel.supported_languages=de,en +waf.kernel.language_independent_code=de waf.kernel.language_independent_items=true # CORE KERNEL.SECURITY configuration parameters @@ -42,16 +43,13 @@ 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 check 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 +; For new installations and Foundry default theme waf.templating.stylesheet_paths=/WEB-INF/resources/librecms-stylesheet-paths.txt # CORE UI configuration parameters @@ -78,19 +76,17 @@ waf.workflow.simple.alerts_sender=webmaster@libreCMS.org # CORE XML processing configuration parameters # ############################################################################## -waf.xml.xsl_transformer=saxonhe waf.xml.activate_full_date_formatter=true - +; For new installations and Foundry default theme +waf.xml.xsl_transformer=saxonhe +; For updates and existing Mandalay based themes: +#waf.xml.xsl_transformer= # 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 - # Replace CMS category form with a terms specific widget com.arsdigita.cms.category_authoring_add_form=com.arsdigita.london.terms.ui.ItemCategoryPicker @@ -110,6 +106,7 @@ com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatch ; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS com.arsdigita.cms.disable_item_pfs=true +com.arsdigita.cms.delete_workflow_after_publication=false com.arsdigita.cms.hide_admin_tabs=true com.arsdigita.cms.hide_folder_index_checkbox=true @@ -124,30 +121,37 @@ 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 +# Do we want this? +;com.arsdigita.cms.skip_asset_steps=com.arsdigita.cms.contenttypes.MultiPartArticle:com.arsdigita.cms.contentassets.ui.ImageStep,com.arsdigita.cms.contenttypes.InlineSite:com.arsdigita.cms.contentassets.ui.ImageStep,com.arsdigita.cms.InlineSite:com.arsdigita.cms.contentassets.ui.FileAttachmentsStep + com.arsdigita.cms.unpublished_not_found=false +com.arsdigita.cms.use_language_extension=true com.arsdigita.cms.use_section_categories=false com.arsdigita.cms.use_streamlined_creation=true -com.arsdigita.cms.delete_workflow_after_publication=false + +; contenttypes.properties +com.arsdigita.cms.contenttypes.generic_contact.contact_entry_keys=email,phoneOffice,phoneMobile,phonePrivate,fax,building,office,vistitingHours # 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=2010 +com.arsdigita.cms.contenttypes.event.start_year=2015 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.start_year=2015 com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5 - # AtoZ configuration parameters # ############################################################################## com.arsdigita.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker @@ -171,7 +175,10 @@ 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/def-page.jsp +com.arsdigita.navigation.index_page_cache_lifetime=300 +; uncomment the following line and edit the file to use a custom set of templates. com.arsdigita.navigation.templates_file=bundle/navigation/lcs-templates.txt +com.arsdigita.navigation.index_page_max_items=30 # SUBSITE configuration parameters @@ -200,7 +207,7 @@ auth.http.admin_identifier=webmaster # ccm-cms-bundle integration package configuration parameter # ############################################################################## -# ccm-cms-bundle (Loader only) +# ccm-lcs-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/ @@ -225,6 +232,6 @@ waf.web.server=localhost\:8080 # ============================================================================================= # devel specific configurations -waf.debug=true -waf.bebop.fancy_xsl_errors=true +;waf.debug=true +;waf.bebop.fancy_xsl_errors=true diff --git a/ccm-sci-bundle/bundles/devel/cfg/sci-portlet.xml b/ccm-lcs-bundle/bundles/base/cfg/portlet.xml similarity index 100% rename from ccm-sci-bundle/bundles/devel/cfg/sci-portlet.xml rename to ccm-lcs-bundle/bundles/base/cfg/portlet.xml diff --git a/ccm-lcs-bundle/bundles/base/cfg/project.xml b/ccm-lcs-bundle/bundles/base/cfg/project.xml index 6d1945e14..41758014c 100644 --- a/ccm-lcs-bundle/bundles/base/cfg/project.xml +++ b/ccm-lcs-bundle/bundles/base/cfg/project.xml @@ -8,16 +8,17 @@ The unmodified (as distributed) bundle may be used to create a custom set of packages by a site administrator using ccm-hostinit command and an appropriate set of add-on packages. - ======================================================================= --> + ========================================================================== --> diff --git a/ccm-lcs-bundle/bundles/devel/cfg/libre-web.xml b/ccm-lcs-bundle/bundles/base/cfg/web.xml similarity index 99% rename from ccm-lcs-bundle/bundles/devel/cfg/libre-web.xml rename to ccm-lcs-bundle/bundles/base/cfg/web.xml index 3aebb9b17..b1966f329 100644 --- a/ccm-lcs-bundle/bundles/devel/cfg/libre-web.xml +++ b/ccm-lcs-bundle/bundles/base/cfg/web.xml @@ -11,7 +11,7 @@ complete web.xml file from an installation bundle may be used. ccm-core requires at minimum Servlet Spec 3.0 / Tomcat 7.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> LibreCMS Devel Site @@ -178,6 +178,7 @@ com.arsdigita.cms.dispatcher.TemplateXSLServlet + diff --git a/ccm-lcs-bundle/bundles/base/res/bundle/categories/placeholder.info b/ccm-lcs-bundle/bundles/base/res/bundle/categories/placeholder.info index 5ae76207c..d1a1d5cc5 100644 --- a/ccm-lcs-bundle/bundles/base/res/bundle/categories/placeholder.info +++ b/ccm-lcs-bundle/bundles/base/res/bundle/categories/placeholder.info @@ -1,3 +1,3 @@ -Subdirectory may optionally contain one or more local site specific +Subdirectory may optionally contain one or more local site specific import xml files for Terms domain categories. diff --git a/ccm-lcs-bundle/bundles/base/res/bundle/ddenums.xml b/ccm-lcs-bundle/bundles/base/res/bundle/ddenums.xml new file mode 100644 index 000000000..41beee372 --- /dev/null +++ b/ccm-lcs-bundle/bundles/base/res/bundle/ddenums.xml @@ -0,0 +1,181 @@ + + + + + Kontakt + + + Contact + + + Speaker + + + Sprecher + + + Office + + + Sekretariat + + + + + Phone (office) + + + Telefon (Büro) + + + Phone (home) + + + Telefon (Privat) + + + Phone (mobil) + + + Telefon (Mobil) + + + Fax + + + Fax + + + Email + + + E-Mail + + + Room + + + Raum + + + Homepage + + + Homepage + + + Instant Messanger + + + Instant Messanger + + + Visiting Hours + + + Sprechzeiten + + + + + Chief executive officer + + + Geschäftsführung + + + Member + + + Mitglied + + + + + Active + + + Aktiv + + + Associated + + + Assoziiert + + + Former + + + Ehemalig + + + + + Managing director + + + Geschäftsführer + + + Member + + + Mitglied + + + Administration + + + Verwaltung + + + Guest + + + Gast + + + + + Department head + + + Abteilungsleitung + + + Member + + + Mitglied + + + Office + + + Sekretariat + + + + + Project head + + + Projektleitung + + + Member + + + Mitglied + + + + + Kontakt + + + Contact + + + \ No newline at end of file diff --git a/ccm-lcs-bundle/bundles/base/res/bundle/navigation/placeholder.info b/ccm-lcs-bundle/bundles/base/res/bundle/navigation/placeholder.info new file mode 100644 index 000000000..7e83095be --- /dev/null +++ b/ccm-lcs-bundle/bundles/base/res/bundle/navigation/placeholder.info @@ -0,0 +1,4 @@ +Subdirectory may optionally contain a local site specific +text files describing additional jsp templates for navigation. +The template jsp files are stored in templates/ccm-navigation/navigation + diff --git a/ccm-lcs-bundle/bundles/base/res/placeholder.info b/ccm-lcs-bundle/bundles/base/res/placeholder.info index 5ae76207c..de33385f9 100644 --- a/ccm-lcs-bundle/bundles/base/res/placeholder.info +++ b/ccm-lcs-bundle/bundles/base/res/placeholder.info @@ -1,3 +1,6 @@ -Subdirectory may optionally contain one or more local site specific -import xml files for Terms domain categories. +Directory will be available during installation by classloader. All +content has to be placed in a subdirectory, typically bundle. It can be +addressed as /bundle/[fileName|dirName] +EXAMPLE: +com.arsdigita.navigation.templates_file=bundle/navigation/templates.txt diff --git a/ccm-lcs-bundle/bundles/base/themes/README b/ccm-lcs-bundle/bundles/base/themes/README deleted file mode 100644 index 13248d9bb..000000000 --- a/ccm-lcs-bundle/bundles/base/themes/README +++ /dev/null @@ -1,13 +0,0 @@ -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-lcs-bundle/bundles/base/themes/master/dummy b/ccm-lcs-bundle/bundles/base/themes/master/dummy index beec54a4d..71ed702e5 100644 --- a/ccm-lcs-bundle/bundles/base/themes/master/dummy +++ b/ccm-lcs-bundle/bundles/base/themes/master/dummy @@ -1 +1,4 @@ -Just a dummy file for test purpose during development. \ No newline at end of file +Just a dummy file as a placeholder. This directory may contain theme files +which are used by themedirector to download a base theme in order to further +customize a site by a site designer. If it will be used this way, +ccm-themedirector must be configured appropriately. diff --git a/ccm-lcs-bundle/bundles/base/themes/placeholder.info b/ccm-lcs-bundle/bundles/base/themes/placeholder.info index c78cf06e6..6f243caf4 100644 --- a/ccm-lcs-bundle/bundles/base/themes/placeholder.info +++ b/ccm-lcs-bundle/bundles/base/themes/placeholder.info @@ -1,12 +1,13 @@ -Subdirectory