diff --git a/ccm-bundle/bundles/demo/cfg/integration.properties b/ccm-bundle/bundles/demo/cfg/integration.properties index 80f9dbc67..4ea3b3f7e 100644 --- a/ccm-bundle/bundles/demo/cfg/integration.properties +++ b/ccm-bundle/bundles/demo/cfg/integration.properties @@ -1,5 +1,10 @@ -# Libre CMS demo bundle integration.properties +# ############################################################################## +# Libre CMS demo 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,28 +27,77 @@ 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/librecms-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 +# 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 -; workflow configuration + +# 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 -; Configures the xml processing +# CORE XML processing configuration parameters +# ############################################################################## waf.xml.xsl_transformer=xalan waf.xml.activate_full_date_formatter=true -# ccm-cms parameters -com.arsdigita.cms.category_authoring_add_form=com.arsdigita.bundle.ui.ItemCategoryPicker + +# 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 com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp @@ -66,6 +123,13 @@ 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 @@ -93,8 +157,21 @@ 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 -# ccm-navigation application +# 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 @@ -106,13 +183,8 @@ com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/g com.arsdigita.navigation.templates_file=bundle/navigation/gen-templates.txt -# ccm-search application -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 +# SUBSITE configuration parameters +# ############################################################################## com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker @@ -123,16 +195,35 @@ 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 -# ccm-bundle (Loader only) +# AUTH-HTTP application +# ############################################################################## +auth.http.admin_email=webmaster@aplaws.org +auth.http.admin_identifier=webmaster + +# LDN Dublin Core configuration parameters +# ############################################################################## +com.arsdigita.london.cms.dublin.audience_domain=LGAL + +# ccm-bundle integration package configuration parameter +# ############################################################################## +# 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@libreCMS.org -waf.admin.name.given=SCI +waf.admin.name.given=LibreCMS waf.admin.name.family=Administrator waf.admin.password=lib2000 waf.admin.password.question=12345 diff --git a/ccm-bundle/bundles/demo/cfg/web-ccm.xml b/ccm-bundle/bundles/demo/cfg/web-ccm.xml index 4758a5e00..fd3f469d1 100644 --- a/ccm-bundle/bundles/demo/cfg/web-ccm.xml +++ b/ccm-bundle/bundles/demo/cfg/web-ccm.xml @@ -92,6 +92,7 @@ com.arsdigita.web.DispatcherServlet 2 + cache-manager com.arsdigita.caching.CacheServlet @@ -144,7 +145,7 @@ content-center - com.arsdigita.cms.WorkspaceServlet + com.arsdigita.cms.ContentCenterServlet @@ -200,6 +201,16 @@ MODULES SERVLET DECLARATIONS SECTION - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + + + atoz-files + com.arsdigita.web.ApplicationFileServlet + + template-path + /templates/ccm-atoz + + + @@ -333,6 +344,12 @@ MODULES SERVLET MAPPINGS SECTION - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + + + atoz-files + /ccm-atoz/files/* + + diff --git a/ccm-bundle/bundles/devel/cfg/integration.properties b/ccm-bundle/bundles/devel/cfg/integration.properties index dfd1882ef..3e3bd7718 100644 --- a/ccm-bundle/bundles/devel/cfg/integration.properties +++ b/ccm-bundle/bundles/devel/cfg/integration.properties @@ -1,5 +1,10 @@ -# Libre CMS based on OpenCCM devel bundle integration.properties +# ############################################################################## +# Libre CMS based on OpenCCM 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,28 +27,77 @@ waf.kernel.primary_user_identifier=email waf.kernel.supported_languages=en,de 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/librecms-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 +# 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 -; workflow configuration + +# 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@localhost.localdomain +waf.workflow.simple.alerts_sender=webmaster@libreCMS.org -; Configures the xml processing +# CORE XML processing configuration parameters +# ############################################################################## waf.xml.xsl_transformer=xalan waf.xml.activate_full_date_formatter=true -# ccm-cms parameters -com.arsdigita.cms.category_authoring_add_form=com.arsdigita.bundle.ui.ItemCategoryPicker + +# 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 com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp @@ -57,7 +114,6 @@ com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatch ; 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 @@ -67,6 +123,13 @@ 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 @@ -94,8 +157,21 @@ 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 -# ccm-navigation application +# 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 @@ -107,13 +183,8 @@ com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/g com.arsdigita.navigation.templates_file=bundle/navigation/gen-templates.txt -# ccm-search application -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 +# SUBSITE configuration parameters +# ############################################################################## com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker @@ -124,16 +195,34 @@ 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 -# ccm-bundle (Loader only) +# AUTH-HTTP application +# ############################################################################## +auth.http.admin_email=webmaster@aplaws.org +auth.http.admin_identifier=webmaster + +# LDN Dublin Core configuration parameters +# ############################################################################## +com.arsdigita.london.cms.dublin.audience_domain=LGAL + +# ccm-bundle integration package configuration parameter +# ############################################################################## +# 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@openccm.org -waf.admin.name.given=OpenCCM +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 diff --git a/ccm-bundle/bundles/devel/cfg/web-ccm.xml b/ccm-bundle/bundles/devel/cfg/web-ccm.xml index e3887700d..44bc11423 100644 --- a/ccm-bundle/bundles/devel/cfg/web-ccm.xml +++ b/ccm-bundle/bundles/devel/cfg/web-ccm.xml @@ -92,6 +92,7 @@ com.arsdigita.web.DispatcherServlet 2 + cache-manager com.arsdigita.caching.CacheServlet @@ -144,7 +145,7 @@ content-center - com.arsdigita.cms.WorkspaceServlet + com.arsdigita.cms.ContentCenterServlet @@ -200,6 +201,16 @@ MODULES SERVLET DECLARATIONS SECTION - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + + + atoz-files + com.arsdigita.web.ApplicationFileServlet + + template-path + /templates/ccm-atoz + + + @@ -333,6 +344,12 @@ MODULES SERVLET MAPPINGS SECTION - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + + + atoz-files + /ccm-atoz/files/* + + diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/dispatcher/MultilingualDocumentResolver.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/dispatcher/MultilingualDocumentResolver.java index 00fce509e..7271963b8 100755 --- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/dispatcher/MultilingualDocumentResolver.java +++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/dispatcher/MultilingualDocumentResolver.java @@ -32,7 +32,7 @@ import com.arsdigita.cms.ContentBundle; import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.Folder; -import com.arsdigita.cms.Workspace; +import com.arsdigita.cms.ContentCenter; import com.arsdigita.cms.dispatcher.AbstractItemResolver; import com.arsdigita.cms.dispatcher.CMSDispatcher; import com.arsdigita.cms.dispatcher.CMSPage; @@ -68,7 +68,7 @@ public class MultilingualDocumentResolver extends AbstractItemResolver private static MasterPage s_masterP = null; private static final String ADMIN_PREFIX = "admin"; - private static final String WORKSPACE_PREFIX = Workspace.getURL(); + private static final String WORKSPACE_PREFIX = ContentCenter.getURL(); /** * The string identifying an item's ID in the query string of a diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/CreateDocLinkPane.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/CreateDocLinkPane.java index 82a584ccc..8b3edd076 100755 --- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/CreateDocLinkPane.java +++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/CreateDocLinkPane.java @@ -14,32 +14,9 @@ * Created on Dec 18, 2003 * */ - package com.arsdigita.cms.docmgr.ui; -import java.math.BigDecimal; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.Iterator; -import org.apache.log4j.Logger; -import com.arsdigita.bebop.ColumnPanel; -import com.arsdigita.bebop.Component; -import com.arsdigita.bebop.Container; -import com.arsdigita.bebop.Form; -import com.arsdigita.bebop.FormData; -import com.arsdigita.bebop.FormProcessException; -import com.arsdigita.bebop.GridPanel; -import com.arsdigita.bebop.Label; -import com.arsdigita.bebop.ModalContainer; -import com.arsdigita.bebop.Page; -import com.arsdigita.bebop.PageState; -import com.arsdigita.bebop.PaginationModelBuilder; -import com.arsdigita.bebop.Paginator; -import com.arsdigita.bebop.RequestLocal; -import com.arsdigita.bebop.SegmentedPanel; -import com.arsdigita.bebop.SimpleContainer; -import com.arsdigita.bebop.Tree; +import com.arsdigita.bebop.*; import com.arsdigita.bebop.event.FormInitListener; import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormSectionEvent; @@ -59,9 +36,8 @@ import com.arsdigita.cms.ContentBundle; import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.ContentSectionCollection; import com.arsdigita.cms.docmgr.DocFolder; -import com.arsdigita.cms.docmgr.DocMgr; import com.arsdigita.cms.docmgr.DocLink; -import com.arsdigita.cms.docmgr.Initializer; +import com.arsdigita.cms.docmgr.DocMgr; import com.arsdigita.cms.docmgr.search.SearchResults; import com.arsdigita.cms.docmgr.search.SearchUtils; import com.arsdigita.dispatcher.ObjectNotFoundException; @@ -69,403 +45,426 @@ import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.kernel.Kernel; import com.arsdigita.kernel.KernelExcursion; -import com.arsdigita.kernel.KernelHelper; import com.arsdigita.kernel.User; import com.arsdigita.kernel.permissions.PermissionService; import com.arsdigita.util.StringUtils; import com.arsdigita.util.UncheckedWrapperException; +import java.math.BigDecimal; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import org.apache.log4j.Logger; /** + * A UI Container class used to create instances of DocLink object + * type. + * + * Contains a simple Search Form to search Documents by name. A table to display + * the results the of the search. ActionLinks in the action column of + * CreateDocLinkSearchTable are responsible to actually create the + * Links to the Document represented in the corresponding row of the table. * - * A UI Container class used to create instances of DocLink object type. - * - * Contains a simple Search Form to search Documents by name. - * A table to display the results the of the search. - * ActionLinks in the action column of CreateDocLinkSearchTable - * are responsible to actually create the Links to the Document represented - * in the corresponding row of the table. - * * @author Shashin Shinde - * - * $Id: //apps/docmgr-cms/dev/src/com/arsdigita/cms/docmgr/ui/CreateDocLinkPane.java#2 $ + * + * $Id: + * //apps/docmgr-cms/dev/src/com/arsdigita/cms/docmgr/ui/CreateDocLinkPane.java#2 + * $ * */ +public class CreateDocLinkPane extends SimpleContainer + implements DMConstants { -public class CreateDocLinkPane extends SimpleContainer - implements DMConstants { + private static final Logger s_log = Logger.getLogger( + CreateDocLinkPane.class.getName()); - private static final Logger s_log = Logger.getLogger(CreateDocLinkPane.class.getName()); - - public static final String PARAM_EDIT_DOCLINK_ID = "editDoclinkID"; - private static final String SEARCH_DOCUMENT = "searchDocument"; - private static final String TITLE = "title"; - private static final String DESCRIPTION = "description"; - private static final String EXTERNAL_URL = "url"; - private static final String CATEGORIES = "file-edit-cats"; + public static final String PARAM_EDIT_DOCLINK_ID = "editDoclinkID"; + private static final String SEARCH_DOCUMENT = "searchDocument"; + private static final String TITLE = "title"; + private static final String DESCRIPTION = "description"; + private static final String EXTERNAL_URL = "url"; + private static final String CATEGORIES = "file-edit-cats"; + private final BigDecimalParameter m_doclinkIDParam = + new BigDecimalParameter(PARAM_EDIT_DOCLINK_ID); + private final TrimmedStringParameter m_searchDocsParam = + new TrimmedStringParameter(SEARCH_DOCUMENT); + private Label m_emptyLabel; + private Label m_errorMessages; + private Tree m_tree; + private Paginator m_paginator; - private final BigDecimalParameter m_doclinkIDParam = new BigDecimalParameter(PARAM_EDIT_DOCLINK_ID); - private final TrimmedStringParameter m_searchDocsParam = new TrimmedStringParameter(SEARCH_DOCUMENT); - private Label m_emptyLabel; - private Label m_errorMessages; - private Tree m_tree; - private Paginator m_paginator; + /** + * Constructor. + * + * @param parent to which this Table is added.Used to return after creating + * the link and cleaning up the Table selection. + * @param tree.Tree object to get the currently selected parent Folder under + * which to create the link. + * @param form.Search Form to get the terms to search for. + */ + public CreateDocLinkPane(Component parent, Tree tree) { + m_tree = tree; + //Main Container. + //ColumnPanel m_mainContainer = new ColumnPanel(ColumnPanel.VERTICAL, true); + ColumnPanel m_mainContainer = new ColumnPanel(1); - /** - * Constructor. - * @param parent to which this Table is added.Used to return after creating - * the link and cleaning up the Table selection. - * @param tree.Tree object to get the currently selected parent Folder under - * which to create the link. - * @param form.Search Form to get the terms to search for. - */ - public CreateDocLinkPane(Component parent,Tree tree){ - m_tree = tree; - //Main Container. - //ColumnPanel m_mainContainer = new ColumnPanel(ColumnPanel.VERTICAL, true); - ColumnPanel m_mainContainer = new ColumnPanel(1); + add(new Label(" ")); + add(new Label(" ")); - add(new Label(" ")); - add(new Label(" ")); + add(new Label(new GlobalizedMessage("ui.link.create.explanation", BUNDLE_NAME)), + ColumnPanel.LEFT); - add( new Label - (new GlobalizedMessage("ui.link.create.explanation", BUNDLE_NAME)), - ColumnPanel.LEFT); + URLEntryForm m_entryForm = new URLEntryForm(new GridPanel(2), parent); - URLEntryForm m_entryForm = new URLEntryForm(new GridPanel(2), parent); + m_mainContainer.add(m_entryForm); + m_mainContainer.add(new Label(" ")); + m_mainContainer.add(new Label(" ")); - m_mainContainer.add(m_entryForm); - m_mainContainer.add(new Label(" ")); - m_mainContainer.add(new Label(" ")); - - //Add form at the top. - SearchForm topSearchForm = new DocumentSearchForm(new GridPanel(2)); - m_mainContainer.add(topSearchForm); - m_mainContainer.add(new Label("     ",false)); + //Add form at the top. + SearchForm topSearchForm = new DocumentSearchForm(new GridPanel(2)); + m_mainContainer.add(topSearchForm); + m_mainContainer.add(new Label("     ", false)); - //Bottom SegmentedPanel - SegmentedPanel bottom = new SegmentedPanel(); - bottom.setClassAttr("main"); + //Bottom SegmentedPanel + SegmentedPanel bottom = new SegmentedPanel(); + bottom.setClassAttr("main"); - //Header for the Bottom panel which displays the results. - ModalContainer m_segmentHeader = new ModalContainer(); - m_emptyLabel = new Label("Search Results"); - m_segmentHeader.add(m_emptyLabel); - m_segmentHeader.setDefaultComponent(m_emptyLabel); + //Header for the Bottom panel which displays the results. + ModalContainer m_segmentHeader = new ModalContainer(); + m_emptyLabel = new Label("Search Results"); + m_segmentHeader.add(m_emptyLabel); + m_segmentHeader.setDefaultComponent(m_emptyLabel); - //Search Results Component. - final CreateDocLinkSearchTable m_search = new CreateDocLinkSearchTable(this,parent,tree,topSearchForm); + //Search Results Component. + final CreateDocLinkSearchTable m_search = + new CreateDocLinkSearchTable(this, parent, tree, topSearchForm); - m_entryForm.addInitListener( new FormInitListener() { - public void init(FormSectionEvent e) throws FormProcessException { - m_search.clearSelection(e.getPageState()); - e.getPageState().setValue(m_searchDocsParam, null); - } - } ); + m_entryForm.addInitListener(new FormInitListener() { - m_paginator = new Paginator( - (PaginationModelBuilder)m_search.getModelBuilder(), - CreateDocLinkSearchTable.PAGE_SIZE); - bottom.addSegment(m_segmentHeader,m_paginator); - m_paginator.setHiddenIfSinglePage(false); - m_mainContainer.add(bottom); - m_errorMessages = new Label(""); - m_errorMessages.setColor(Color.red); - m_mainContainer.add(m_errorMessages); + public void init(FormSectionEvent e) throws FormProcessException { + m_search.clearSelection(e.getPageState()); + e.getPageState().setValue(m_searchDocsParam, null); + } + }); - //Add Search Results table - m_mainContainer.add(m_search); - add(m_mainContainer); - } + m_paginator = new Paginator( + (PaginationModelBuilder) m_search.getModelBuilder(), + CreateDocLinkSearchTable.PAGE_SIZE); + bottom.addSegment(m_segmentHeader, m_paginator); + m_paginator.setHiddenIfSinglePage(false); + m_mainContainer.add(bottom); + m_errorMessages = new Label(""); + m_errorMessages.setColor(Color.red); + m_mainContainer.add(m_errorMessages); - /* Register state parameters */ - public void register(Page p) { - super.register(p); - p.addGlobalStateParam(m_doclinkIDParam); - p.addGlobalStateParam(m_searchDocsParam); - } - - Label getErrorLable(){ - return m_errorMessages; - } + //Add Search Results table + m_mainContainer.add(m_search); + add(m_mainContainer); + } - public BigDecimalParameter getEditDoclinkIDParam() { - return m_doclinkIDParam; - } - + /* + * Register state parameters + */ + public void register(Page p) { + super.register(p); + p.addGlobalStateParam(m_doclinkIDParam); + p.addGlobalStateParam(m_searchDocsParam); + } - private class URLEntryForm extends Form - implements FormInitListener, FormValidationListener, FormProcessListener { + Label getErrorLable() { + return m_errorMessages; + } + + public BigDecimalParameter getEditDoclinkIDParam() { + return m_doclinkIDParam; + } + + private class URLEntryForm extends Form + implements FormInitListener, + FormValidationListener, + FormProcessListener { // public static final String PARAM_DOC_LINK_ID = "doclinkID"; - private Submit m_submit; - - TrimmedStringParameter m_title; - TrimmedStringParameter m_description; - URLParameter m_URL; - ArrayParameter m_cats; - Component m_parent; + private Submit m_submit; + TrimmedStringParameter m_title; + TrimmedStringParameter m_description; + URLParameter m_URL; + ArrayParameter m_cats; + Component m_parent; // BigDecimalParameter m_doclinkID = new BigDecimalParameter(PARAM_DOC_LINK_ID); - - public URLEntryForm(Container panel, Component parent) { - super("urlEntry",panel); - setMethod(Form.POST); - m_parent = parent; - m_title = new TrimmedStringParameter(TITLE); - m_description = new TrimmedStringParameter(DESCRIPTION); - m_URL = new URLParameter(EXTERNAL_URL); - add(new Label("Title:")); - TextField title = new TextField(m_title); + public URLEntryForm(Container panel, Component parent) { + super("urlEntry", panel); + setMethod(Form.POST); + m_parent = parent; + m_title = new TrimmedStringParameter(TITLE); + m_description = new TrimmedStringParameter(DESCRIPTION); + m_URL = new URLParameter(EXTERNAL_URL); + + add(new Label("Title:")); + TextField title = new TextField(m_title); // title.addValidationListener(new NotEmptyValidationListener()); - add(title); - add(new Label("Description (optional):")); + add(title); + add(new Label("Description (optional):")); // TextField desc = new TextField(m_description); // desc.setSize(70); - TextArea desc = new TextArea(m_description); - desc.setRows(10); - desc.setCols(40); - add(desc); - add(new Label("URL (must begin with \"http://\" or \"https://\"):")); - TextField url = new TextField(m_URL); - url.setSize(70); + TextArea desc = new TextArea(m_description); + desc.setRows(10); + desc.setCols(40); + add(desc); + add(new Label("URL (must begin with \"http://\" or \"https://\"):")); + TextField url = new TextField(m_URL); + url.setSize(70); // url.addValidationListener(new NotEmptyValidationListener()); // url.addValidationListener(new URLValidationListener()); - add(url); - add(new Label(FILE_CATEGORIES)); - m_cats = new ArrayParameter(CATEGORIES); - MultipleSelect catSelect = new MultipleSelect(CATEGORIES); - catSelect.setSize(20); - try { - catSelect.addPrintListener(new CategoriesPrintListener(getContentSection(), getEditDoclinkIDParam())); - } - catch (java.util.TooManyListenersException tmex) { - throw new UncheckedWrapperException(tmex.getMessage()); - } - add(catSelect); - m_submit = new Submit("submitButton", "Save Link"); - add(m_submit, GridPanel.RIGHT); - add(new Submit("cancelButton", "Cancel")); + add(url); + add(new Label(FILE_CATEGORIES)); + m_cats = new ArrayParameter(CATEGORIES); + MultipleSelect catSelect = new MultipleSelect(CATEGORIES); + catSelect.setSize(20); + try { + catSelect.addPrintListener(new CategoriesPrintListener( + getContentSection(), + getEditDoclinkIDParam())); + } catch (java.util.TooManyListenersException tmex) { + throw new UncheckedWrapperException(tmex.getMessage()); + } + add(catSelect); + m_submit = new Submit("submitButton", "Save Link"); + add(m_submit, GridPanel.RIGHT); + add(new Submit("cancelButton", "Cancel")); // add(new Hidden(m_doclinkID)); - addInitListener(this); - addValidationListener(this); - addProcessListener(this); - } + addInitListener(this); + addValidationListener(this); + addProcessListener(this); + } - private ContentSection getContentSection() { - ContentSectionCollection csc = ContentSection.getAllSections(); - csc.addEqualsFilter("label", DocMgr.getConfig().getContentSection()); - if (!csc.next()) { - csc.close(); - return null; - } - ContentSection cs = csc.getContentSection(); - csc.close(); - return cs; - } + private ContentSection getContentSection() { + ContentSectionCollection csc = ContentSection.getAllSections(); + csc.addEqualsFilter("label", DocMgr.getConfig().getContentSection()); + if (!csc.next()) { + csc.close(); + return null; + } + ContentSection cs = csc.getContentSection(); + csc.close(); + return cs; + } - public void init(FormSectionEvent e) { - PageState state = e.getPageState(); - BigDecimal id = (BigDecimal) state.getValue(m_doclinkIDParam); - if (id != null) { - DocLink doclink = new DocLink(id); - FormData fd = e.getFormData(); -// fd.put(PARAM_DOC_LINK_ID, id); - if (doclink.isExternal()) { - fd.put(TITLE, doclink.getTitle()); - fd.put(DESCRIPTION, doclink.getDescription()); - fd.put(EXTERNAL_URL, doclink.getExternalURL()); - - ArrayList assignedCats = new ArrayList(); - - CategoryCollection cats = doclink.getCategoryCollection(); - Category cat; - if (cats.next()) { - cat = cats.getCategory(); - String catID = cat.getID().toString(); - assignedCats.add(catID); - } - fd.put(CATEGORIES, assignedCats.toArray()); - } - } - } - - public void validate(FormSectionEvent e) throws FormProcessException { - PageState state = e.getPageState(); - if(m_submit.isSelected(state)) { - FormData fd = e.getFormData(); - - String title = (String) fd.get(TITLE); - if (title == null || title.trim().length() == 0) { - fd.addError(TITLE, "This parameter is required"); - } - //validate length of title - if (title != null && title.length() > 1000) { - fd.addError(TITLE, "This parameter is too long. It must be fewer than 1000 characters."); - } - - String url = (String) fd.get(EXTERNAL_URL); - if (url == null || url.trim().length() == 0) { - fd.addError(EXTERNAL_URL, "This parameter is required"); - } - if (url != null && url.length() > 4000) { - fd.addError(EXTERNAL_URL, "This parameter is too long. It must be fewer than 4000 characters."); - } - try { - new URL(url); - } catch (MalformedURLException ex) { - fd.addError(EXTERNAL_URL, "Please enter a URL"); - } - - //validate length of description - String desc = (String) fd.get(DESCRIPTION); - if (desc != null && desc.length() > 4000) { - fd.addError(DESCRIPTION, "This parameter is too long. It must be fewer than 4000 characters."); - } - } - } - - /**Just a dummy run to cache the results in RequestLocal object.*/ - public void process(FormSectionEvent e) { - PageState state = e.getPageState(); - FormData fd = e.getFormData(); - if(m_submit.isSelected(state)) { - - final DocFolder parent = getSelectedFolder(state); - - ContentBundle bundle; - - //Reached here indicates we can now proceed with Link Creation. - DocLink link; + public void init(FormSectionEvent e) { + PageState state = e.getPageState(); BigDecimal id = (BigDecimal) state.getValue(m_doclinkIDParam); if (id != null) { - link = new DocLink(id); - bundle = link.getContentBundle(); - } - else { - link = new DocLink(); - link.setName((String) fd.get(TITLE)); - - //FIXME: when our client decides upon what permissions to adopt , change this one - //and permissions code accordingly. - link.setRepository(DocFolder.getRepository(parent)); - link.setLanguage("en"); + DocLink doclink = new DocLink(id); + FormData fd = e.getFormData(); +// fd.put(PARAM_DOC_LINK_ID, id); + if (doclink.isExternal()) { + fd.put(TITLE, doclink.getTitle()); + fd.put(DESCRIPTION, doclink.getDescription()); + fd.put(EXTERNAL_URL, doclink.getExternalURL()); - bundle = new ContentBundle(link); - bundle.setParent(parent); - bundle.setContentSection(parent.getContentSection()); - bundle.save(); + ArrayList assignedCats = new ArrayList(); - final ContentBundle bundleFinal = bundle; - - new KernelExcursion() { - protected void excurse() { - setParty(Kernel.getSystemParty()); - PermissionService.setContext(bundleFinal, parent); + CategoryCollection cats = doclink.getCategoryCollection(); + Category cat; + if (cats.next()) { + cat = cats.getCategory(); + String catID = cat.getID().toString(); + assignedCats.add(catID); + } + fd.put(CATEGORIES, assignedCats.toArray()); } - }.run(); } - link.setName((String) fd.get(TITLE)); - link.setTitle((String) fd.get(TITLE)); - link.setDescription((String) fd.get(DESCRIPTION)); - link.setExternalURL((String) fd.get(EXTERNAL_URL)); - link.setCategories((String[]) fd.get(CATEGORIES)); - //((Table) e.getSource()).clearSelection(state); - } + } + + public void validate(FormSectionEvent e) throws FormProcessException { + PageState state = e.getPageState(); + if (m_submit.isSelected(state)) { + FormData fd = e.getFormData(); + + String title = (String) fd.get(TITLE); + if (title == null || title.trim().length() == 0) { + fd.addError(TITLE, "This parameter is required"); + } + //validate length of title + if (title != null && title.length() > 1000) { + fd.addError(TITLE, "This parameter is too long. It must be fewer than 1000 characters."); + } + + String url = (String) fd.get(EXTERNAL_URL); + if (url == null || url.trim().length() == 0) { + fd.addError(EXTERNAL_URL, "This parameter is required"); + } + if (url != null && url.length() > 4000) { + fd.addError(EXTERNAL_URL, "This parameter is too long. It must be fewer than 4000 characters."); + } + try { + new URL(url); + } catch (MalformedURLException ex) { + fd.addError(EXTERNAL_URL, "Please enter a URL"); + } + + //validate length of description + String desc = (String) fd.get(DESCRIPTION); + if (desc != null && desc.length() > 4000) { + fd.addError(DESCRIPTION, "This parameter is too long. It must be fewer than 4000 characters."); + } + } + } + + /** + * Just a dummy run to cache the results in RequestLocal object. + */ + public void process(FormSectionEvent e) { + PageState state = e.getPageState(); + FormData fd = e.getFormData(); + if (m_submit.isSelected(state)) { + + final DocFolder parent = getSelectedFolder(state); + + ContentBundle bundle; + + //Reached here indicates we can now proceed with Link Creation. + DocLink link; + BigDecimal id = (BigDecimal) state.getValue(m_doclinkIDParam); + if (id != null) { + link = new DocLink(id); + bundle = link.getContentBundle(); + } else { + link = new DocLink(); + link.setName((String) fd.get(TITLE)); + + //FIXME: when our client decides upon what permissions + // to adopt , change this one + //and permissions code accordingly. + link.setRepository(DocFolder.getRepository(parent)); + link.setLanguage("en"); + + bundle = new ContentBundle(link); + bundle.setParent(parent); + bundle.setContentSection(parent.getContentSection()); + bundle.save(); + + final ContentBundle bundleFinal = bundle; + + new KernelExcursion() { + + protected void excurse() { + setParty(Kernel.getSystemParty()); + PermissionService.setContext(bundleFinal, parent); + } + }.run(); + } + link.setName((String) fd.get(TITLE)); + link.setTitle((String) fd.get(TITLE)); + link.setDescription((String) fd.get(DESCRIPTION)); + link.setExternalURL((String) fd.get(EXTERNAL_URL)); + link.setCategories((String[]) fd.get(CATEGORIES)); + //((Table) e.getSource()).clearSelection(state); + } ((BrowsePane) m_parent).displayFolderContentPanel(state); - } - } + } + } + /** + * A Form to Search Documents by name.Has one simple + * TextField and a submit button. + * + * It caches the SearchResults object in the m_coin RequestLocal object. + * + */ + private class DocumentSearchForm extends Form + implements SearchForm, + FormValidationListener, + FormProcessListener, + FormInitListener { + private Submit m_submit; + private RequestLocal m_validated; + private RequestLocal m_coln; - /** - * A Form to Search Documents by name.Has one simple TextField - * and a submit button. - * - * It caches the SearchResults object in the m_coin RequestLocal object. - * - */ - private class DocumentSearchForm extends Form implements SearchForm, - FormValidationListener,FormProcessListener,FormInitListener { + public DocumentSearchForm(Container panel) { + super("docSearch", panel); + setMethod(Form.GET); + add(new Label("Search text:")); + TextField searchText = new TextField(SEARCH_DOCUMENT); + add(searchText); + m_submit = new Submit("search", "Search"); + add(m_submit); + addValidationListener(this); + addProcessListener(this); + addInitListener(this); - private Submit m_submit; - private RequestLocal m_validated; - private RequestLocal m_coln; + m_coln = new RequestLocal(); + m_validated = new RequestLocal(); + } - public DocumentSearchForm(Container panel) { - super("docSearch",panel); - setMethod(Form.GET); - add(new Label("Search text:")); - TextField searchText = new TextField(SEARCH_DOCUMENT); - add(searchText); - m_submit = new Submit("search", "Search"); - add(m_submit); - addValidationListener(this); - addProcessListener(this); - addInitListener(this); + public void init(FormSectionEvent e) throws FormProcessException { + e.getFormData().setParameter(SEARCH_DOCUMENT, null); + } - m_coln = new RequestLocal(); - m_validated = new RequestLocal(); - } + public void validate(FormSectionEvent e) throws FormProcessException { + PageState ps = e.getPageState(); - public void init(FormSectionEvent e) throws FormProcessException { - e.getFormData().setParameter(SEARCH_DOCUMENT, null); - } - public void validate(FormSectionEvent e) throws FormProcessException { - PageState ps = e.getPageState(); - - String docsSearch = (String) ps.getValue(m_searchDocsParam); + String docsSearch = (String) ps.getValue(m_searchDocsParam); - if (StringUtils.emptyString(docsSearch)){ - m_emptyLabel.setVisible(ps,true); - m_validated.set(ps, new Boolean(false)); - throw new FormProcessException("At least one search parameter must be specified"); - } - m_validated.set(ps, new Boolean(true)); - //Reset the paginator for new search. - m_paginator.reset(ps); - } + if (StringUtils.emptyString(docsSearch)) { + m_emptyLabel.setVisible(ps, true); + m_validated.set(ps, new Boolean(false)); + throw new FormProcessException( + "At least one search parameter must be specified"); + } + m_validated.set(ps, new Boolean(true)); + //Reset the paginator for new search. + m_paginator.reset(ps); + } - /**Just a dummy run to cache the results in RequestLocal object.*/ - public void process(FormSectionEvent e) { - PageState state = e.getPageState(); - if(m_submit.isSelected(state) && - ((Boolean) m_validated.get(state)).booleanValue()) { - SearchResults results = getSearchHits(state); - if(results != null && - results.getTotalSize() > 0) { - s_log.debug("results"); - } else { - s_log.debug("no results"); - } - } - } + /** + * Just a dummy run to cache the results in RequestLocal object. + */ + public void process(FormSectionEvent e) { + PageState state = e.getPageState(); + if (m_submit.isSelected(state) + && ((Boolean) m_validated.get(state)).booleanValue()) { + SearchResults results = getSearchHits(state); + if (results != null + && results.getTotalSize() > 0) { + s_log.debug("results"); + } else { + s_log.debug("no results"); + } + } + } - /**Cache the results in the upper class's RequestLocal object.*/ - public SearchResults getSearchHits( PageState state ) { - SearchResults searchResults = (SearchResults) m_coln.get(state); - String terms = (String) state.getValue(m_searchDocsParam); - s_log.debug("terms is "+terms); - if (searchResults == null && ! StringUtils.emptyString(terms)){ - User user = KernelHelper.getCurrentUser(state.getRequest()); - searchResults = SearchUtils.getSimpleSearch(terms,user); - m_coln.set(state, searchResults); - } - return searchResults; - } + /** + * Cache the results in the upper class's RequestLocal object. + */ + public SearchResults getSearchHits(PageState state) { + SearchResults searchResults = (SearchResults) m_coln.get(state); + String terms = (String) state.getValue(m_searchDocsParam); + s_log.debug("terms is " + terms); + if (searchResults == null && !StringUtils.emptyString(terms)) { + User user = (User) Kernel.getContext().getParty(); + searchResults = SearchUtils.getSimpleSearch(terms, user); + m_coln.set(state, searchResults); + } + return searchResults; + } - public boolean isVisible(PageState state) { - return true; - } + @Override + public boolean isVisible(PageState state) { + return true; + } - public long getSearchResultCount(PageState state) { - return m_coln.get(state) == null ? 0 : - ((SearchResults)m_coln.get(state)).getTotalSize(); - } + public long getSearchResultCount(PageState state) { + return m_coln.get(state) == null ? 0 + : ((SearchResults) m_coln.get(state)).getTotalSize(); + } + } - } - - /**Helper method to return the currently Selected Parent Folder in the tree */ - private DocFolder getSelectedFolder(PageState state){ + /** + * Helper method to return the currently Selected Parent Folder in the tree + */ + private DocFolder getSelectedFolder(PageState state) { DocFolder p = null; String selKey = (String) m_tree.getSelectedKey(state); @@ -477,10 +476,10 @@ public class CreateDocLinkPane extends SimpleContainer p = new DocFolder(folderID); } catch (DataObjectNotFoundException nf) { throw new ObjectNotFoundException( - (String) FOLDER_PARENTNOTFOUND_ERROR.localize(state.getRequest())); + (String) FOLDER_PARENTNOTFOUND_ERROR.localize(state + .getRequest())); } } return p; } - } diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/SearchPane.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/SearchPane.java index cbda3ba8c..9a1141aad 100755 --- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/SearchPane.java +++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/SearchPane.java @@ -15,60 +15,18 @@ package com.arsdigita.cms.docmgr.ui; -import com.arsdigita.bebop.BoxPanel; -import com.arsdigita.bebop.Container; -import com.arsdigita.bebop.Form; -import com.arsdigita.bebop.FormProcessException; -import com.arsdigita.bebop.GridPanel; -import com.arsdigita.bebop.Label; -import com.arsdigita.bebop.Link; -import com.arsdigita.bebop.ModalContainer; -import com.arsdigita.bebop.Page; -import com.arsdigita.bebop.PageState; -import com.arsdigita.bebop.RequestLocal; -import com.arsdigita.bebop.SegmentedPanel; -import com.arsdigita.bebop.SimpleContainer; -import com.arsdigita.bebop.TabbedPane; -import com.arsdigita.bebop.form.Option; -import com.arsdigita.bebop.form.OptionGroup; -import com.arsdigita.bebop.form.SingleSelect; -import com.arsdigita.bebop.form.Submit; -import com.arsdigita.bebop.form.TextField; -import com.arsdigita.bebop.event.FormInitListener; -import com.arsdigita.bebop.event.FormProcessListener; -import com.arsdigita.bebop.event.FormSectionEvent; -import com.arsdigita.bebop.event.FormValidationListener; -import com.arsdigita.bebop.event.PrintEvent; -import com.arsdigita.bebop.event.PrintListener; -import com.arsdigita.bebop.parameters.ArrayParameter; -import com.arsdigita.bebop.parameters.BigDecimalParameter; -import com.arsdigita.bebop.parameters.DateParameter; -import com.arsdigita.bebop.parameters.NotEmptyValidationListener; -import com.arsdigita.bebop.parameters.ParameterModel; -import com.arsdigita.bebop.parameters.StringParameter; -import com.arsdigita.bebop.parameters.TrimmedStringParameter; -import com.arsdigita.bebop.Table; -import com.arsdigita.bebop.table.TableModelBuilder; -import com.arsdigita.bebop.tree.TreeNode; -import com.arsdigita.categorization.Category; -import com.arsdigita.categorization.CategoryTreeModelLite; -import com.arsdigita.dispatcher.DispatcherHelper; -import com.arsdigita.dispatcher.ObjectNotFoundException; +import com.arsdigita.bebop.*; +import com.arsdigita.bebop.event.*; +import com.arsdigita.bebop.form.*; +import com.arsdigita.bebop.parameters.*; +import com.arsdigita.cms.ContentSection; +import com.arsdigita.cms.ContentSectionCollection; import com.arsdigita.cms.docmgr.DocMgr; import com.arsdigita.cms.docmgr.Document; -import com.arsdigita.cms.docmgr.search.IntermediaSearcher; import com.arsdigita.cms.docmgr.search.LuceneSearcher; import com.arsdigita.cms.docmgr.search.SearchResults; import com.arsdigita.cms.docmgr.search.SearchUtils; -import com.arsdigita.cms.docmgr.ui.DMConstants; -import com.arsdigita.cms.FileAsset; -import com.arsdigita.cms.ContentBundle; -import com.arsdigita.cms.ContentSection; -import com.arsdigita.cms.ContentSectionCollection; -import com.arsdigita.domain.DataObjectNotFoundException; -import com.arsdigita.globalization.GlobalizedMessage; -import com.arsdigita.kernel.ui.DataQueryTreeNode; -import com.arsdigita.kernel.KernelHelper; +import com.arsdigita.kernel.Kernel; import com.arsdigita.kernel.User; import com.arsdigita.kernel.permissions.PermissionDescriptor; import com.arsdigita.kernel.permissions.PermissionService; @@ -79,15 +37,9 @@ import com.arsdigita.persistence.SessionManager; import com.arsdigita.util.StringUtils; import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.web.Web; -import org.apache.log4j.Logger; - -import javax.servlet.http.HttpServletResponse; -import java.io.*; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; -import java.util.Iterator; -import java.util.LinkedList; import java.util.TooManyListenersException; /** @@ -350,7 +302,7 @@ class SearchPane extends SimpleContainer implements DMConstants //if (terms != null && !"".equals(terms)) { // if form has been submitted, m_emptyLabel will not be visible - User user = KernelHelper.getCurrentUser(state.getRequest()); + User user = (User)Kernel.getContext().getParty(); coln = SearchUtils.getAdvancedSearch(terms, author, mimeType, @@ -377,32 +329,6 @@ class SearchPane extends SimpleContainer implements DMConstants } - //private class EmptySearchPrintListener implements PrintListener { - // private DocsSearchForm m_docsSearchForm; - // - // public EmptySearchPrintListener(DocsSearchForm dsf) { - // m_docsSearchForm = dsf; - // } - // - // public void prepare(PrintEvent e) { - // PageState state = e.getPageState(); - // Label t= (Label) e.getTarget(); - // - // t.setLabel(""); - // - // //String terms = (String)state.getValue(m_termsParam); - // //if (terms != null && terms.length() > 0) { - // if(m_docsSearchForm.getSearchHits(state).getTotalSize() > 0) { - // t.setLabel("Results"); - // s_log.debug("results"); - // } else { - // t.setLabel("No items matched your search"); - // s_log.debug("no results"); - // } - // //} - // } - //} - private class MimeTypesWidget extends SingleSelect { diff --git a/ccm-ldn-aplaws/bundles/base/cfg/integration.properties b/ccm-ldn-aplaws/bundles/base/cfg/integration.properties index 541b1602a..073a491c1 100755 --- a/ccm-ldn-aplaws/bundles/base/cfg/integration.properties +++ b/ccm-ldn-aplaws/bundles/base/cfg/integration.properties @@ -1,5 +1,12 @@ +# ############################################################################## # APLAWS+ Base Bundle integration.properties +# Main purpose is to ensurecompatibility among all CCM packages and to provide +# Add On packages. +# ############################################################################## # +# +# CORE BEBOP configuration parameters +# ############################################################################## waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage # ; dhtml editor to use (system wide) @@ -11,39 +18,89 @@ waf.bebop.base_page=com.arsdigita.aplaws.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 doesn't work. +; if you activate screen_name, forum loader does not work. ; waf.kernel.primary_user_identifier=screen_name waf.kernel.supported_languages=en,de,fr 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@aplaws.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/aplaws-stylesheet-paths.txt -core.ui.pagemap.root_page_url=portal/ -core.ui.pagemap.workspace_url=portal/ -core.ui.pagemap.user_redirect_url=content/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,homepages -com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.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 @@ -60,13 +117,6 @@ com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatch ; com.arsdigita.cms.dhtml_editor_hidden_buttons= ; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS -; to use deprecated HTMLarea (NOT recommended!): -; currently configuration is hardcoded, so the fest alternative works -; com.arsdigita.cms.dhtml_editor_config=HTMLArea -; com.arsdigita.cms.dhtml_editor_config=HTMLArea,/assets/htmlarea/config/Styled.js -; 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 @@ -76,12 +126,16 @@ com.arsdigita.cms.hide_templates_tab=true com.arsdigita.cms.hide_timezone=true com.arsdigita.cms.hide_udct_ui=true -com.arsdigita.cms.use_section_categories=false -com.arsdigita.cms.use_streamlined_creation=true - 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 @@ -106,10 +160,21 @@ com.arsdigita.forum.use_wysiwyg_editor=true com.arsdigita.forum.allow_quick_finish=true com.arsdigita.forum.disable_page_caching=true -; atoz -com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker +# AtoZ configuration parameters +# ############################################################################## +com.arsdigita.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker -# ccm-navigation application +# 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 @@ -117,36 +182,50 @@ com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.Roo 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=/packages/navigation/templates/default.jsp +com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/nav-default.jsp ; uncomment the following line and edit the file to use a custom set of templates. #com.arsdigita.navigation.templates_file=bundle/navigation/templates.txt -# ccm-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 +# SUBSITE configuration parameters +# ############################################################################## +com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker -# ccm-ldn-subsite application -com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker - - -# ccm-themedirector application +# 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-ldn-aplaws.web.mf # Required to denote the dir containing the default theme! themedirector.default_theme_path=themes/static/aplaws -# ccm-auth-http application -; auth.http.admin_email=webmaster@aplaws.org -; auth.http.admin_identifier=webmaster +# 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 + +# LDN Dublin Core configuration parameters +# ############################################################################## com.arsdigita.london.cms.dublin.audience_domain=LGAL -; ============================================================================================= -; runtime specific configurations +# SCI bundle 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@aplaws.org #waf.admin.name.given=Aplaws @@ -155,10 +234,10 @@ com.arsdigita.london.cms.dublin.audience_domain=LGAL #waf.admin.password.question=12345 #waf.admin.password.answer=6 -#waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm +waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm waf.runtime.jdbc_pool_size=60 -#waf.web.server=localhost\:8080 +waf.web.server=localhost\:8080 # ============================================================================================= diff --git a/ccm-ldn-aplaws/bundles/base/cfg/web.xml b/ccm-ldn-aplaws/bundles/base/cfg/web.xml index e83fcf133..ba84d532a 100755 --- a/ccm-ldn-aplaws/bundles/base/cfg/web.xml +++ b/ccm-ldn-aplaws/bundles/base/cfg/web.xml @@ -92,6 +92,7 @@ com.arsdigita.web.DispatcherServlet 2 + cache-manager com.arsdigita.caching.CacheServlet @@ -144,7 +145,7 @@ content-center - com.arsdigita.cms.WorkspaceServlet + com.arsdigita.cms.ContentCenterServlet diff --git a/ccm-ldn-aplaws/bundles/complete/cfg/integration.properties b/ccm-ldn-aplaws/bundles/complete/cfg/integration.properties index f84ad4a86..a102ae5f9 100755 --- a/ccm-ldn-aplaws/bundles/complete/cfg/integration.properties +++ b/ccm-ldn-aplaws/bundles/complete/cfg/integration.properties @@ -1,6 +1,13 @@ -# APLAWS+ Complete Bundle integration.properties +# ############################################################################## +# APLAWS+ Complete Bundle integration.properties, version 2.0.x # Complete Bundle is DEPRECATED! +# Main purpose is to ensurecompatibility among all CCM packages and to provide +# Add On packages. +# ############################################################################## # +# +# CORE BEBOP configuration parameters +# ############################################################################## waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage # ; dhtml editor to use (system wide) @@ -12,7 +19,10 @@ waf.bebop.base_page=com.arsdigita.aplaws.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. @@ -20,31 +30,78 @@ waf.kernel.primary_user_identifier=email waf.kernel.supported_languages=en,de,fr 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=webmanager@camden.gov.uk + + +# 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/aplaws-stylesheet-paths.txt -core.ui.pagemap.root_page_url=portal/ -core.ui.pagemap.workspace_url=portal/ -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,homepages -com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.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 @@ -59,15 +116,8 @@ com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatch ; 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= - -; to use deprecated HTMLarea (NOT recommended!): -; currently configuration is hardcoded, so the fest alternative works -; com.arsdigita.cms.dhtml_editor_config=HTMLArea -; com.arsdigita.cms.dhtml_editor_config=HTMLArea,/assets/htmlarea/config/Styled.js ; 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 @@ -77,11 +127,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 @@ -106,10 +161,21 @@ com.arsdigita.forum.use_wysiwyg_editor=true com.arsdigita.forum.allow_quick_finish=true com.arsdigita.forum.disable_page_caching=true -# atoz +# AtoZ configuration parameters +# ############################################################################## com.arsdigita.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker -# ccm-navigation application +# 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 @@ -122,31 +188,45 @@ com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/n #com.arsdigita.navigation.templates_file=bundle/navigation/templates.txt -# ccm-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 - - -# ccm-subsite application +# SUBSITE configuration parameters +# ############################################################################## com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker -# ccm-themedirector application +# 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-ldn-aplaws.web.mf # Required to denote the dir containing the default theme! themedirector.default_theme_path=themes/static/aplaws -# ccm-auth-http application +# 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 +# LDN Dublin Core configuration parameters +# ############################################################################## com.arsdigita.london.cms.dublin.audience_domain=LGAL -; ============================================================================================= -; runtime specific configurations +# SCI bundle 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@aplaws.org #waf.admin.name.given=Aplaws diff --git a/ccm-ldn-aplaws/bundles/complete/cfg/web.xml b/ccm-ldn-aplaws/bundles/complete/cfg/web.xml index e83fcf133..ba84d532a 100755 --- a/ccm-ldn-aplaws/bundles/complete/cfg/web.xml +++ b/ccm-ldn-aplaws/bundles/complete/cfg/web.xml @@ -92,6 +92,7 @@ com.arsdigita.web.DispatcherServlet 2 + cache-manager com.arsdigita.caching.CacheServlet @@ -144,7 +145,7 @@ content-center - com.arsdigita.cms.WorkspaceServlet + com.arsdigita.cms.ContentCenterServlet diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties b/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties index fdd98d191..8625cdd86 100755 --- a/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties +++ b/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties @@ -1,5 +1,12 @@ -# APLAWS+ devel bundle integration.properties +# ############################################################################## +# APLAWS+ devel bundle integration.properties, version 2.0.x +# Main purpose is to ensurecompatibility among all CCM packages and to provide +# Add On packages. +# ############################################################################## # +# +# CORE BEBOP configuration parameters +# ############################################################################## waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage # ; dhtml editor to use (system wide) @@ -11,7 +18,10 @@ waf.bebop.base_page=com.arsdigita.aplaws.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,31 +29,77 @@ waf.kernel.primary_user_identifier=email waf.kernel.supported_languages=en,de,fr 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@aplaws.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/aplaws-stylesheet-paths.txt -core.ui.pagemap.root_page_url=portal/ -core.ui.pagemap.workspace_url=portal/ -core.ui.pagemap.user_redirect_url=content-center/redirect.jsp +# 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 -; workflow configuration + +# 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,homepages -com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.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 @@ -60,7 +116,6 @@ com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatch ; 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 @@ -70,11 +125,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 @@ -99,10 +159,21 @@ com.arsdigita.forum.use_wysiwyg_editor=true com.arsdigita.forum.allow_quick_finish=true com.arsdigita.forum.disable_page_caching=true -# atoz +# AtoZ configuration parameters +# ############################################################################## com.arsdigita.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker -# ccm-navigation application +# 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 @@ -115,35 +186,45 @@ com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/n #com.arsdigita.navigation.templates_file=bundle/navigation/templates.txt -# ccm-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 - - -# ccm-subsite application +# SUBSITE configuration parameters +# ############################################################################## com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker -# ccm-themedirector application +# 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-ldn-aplaws.web.mf # Required to denote the dir containing the default theme! themedirector.default_theme_path=themes/static/aplaws -# ccm-auth-http application +# 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 +# LDN Dublin Core configuration parameters +# ############################################################################## com.arsdigita.london.cms.dublin.audience_domain=LGAL +# SCI bundle 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@aplaws.org waf.admin.name.given=Aplaws diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/web.xml b/ccm-ldn-aplaws/bundles/devel/cfg/web.xml index e83fcf133..ba84d532a 100755 --- a/ccm-ldn-aplaws/bundles/devel/cfg/web.xml +++ b/ccm-ldn-aplaws/bundles/devel/cfg/web.xml @@ -92,6 +92,7 @@ com.arsdigita.web.DispatcherServlet 2 + cache-manager com.arsdigita.caching.CacheServlet @@ -144,7 +145,7 @@ content-center - com.arsdigita.cms.WorkspaceServlet + com.arsdigita.cms.ContentCenterServlet diff --git a/ccm-ldn-aplaws/bundles/standard/cfg/integration.properties b/ccm-ldn-aplaws/bundles/standard/cfg/integration.properties index def435bb9..9b9470ebd 100755 --- a/ccm-ldn-aplaws/bundles/standard/cfg/integration.properties +++ b/ccm-ldn-aplaws/bundles/standard/cfg/integration.properties @@ -1,5 +1,10 @@ -# APLAWS+ Standard bundle integration.properties +# ############################################################################## +# APLAWS+ Standard bundle integration.properties, version 2.0.x +# ############################################################################## # +# +# CORE BEBOP configuration parameters +# ############################################################################## waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage # ; dhtml editor to use (system wide) @@ -11,7 +16,10 @@ waf.bebop.base_page=com.arsdigita.aplaws.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,31 +27,77 @@ waf.kernel.primary_user_identifier=email waf.kernel.supported_languages=en,de,fr 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@aplaws.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/aplaws-stylesheet-paths.txt -core.ui.pagemap.root_page_url=portal/ -core.ui.pagemap.workspace_url=portal/ -core.ui.pagemap.user_redirect_url=content-center/redirect.jsp +# 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 -; workflow configuration + +# 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,homepages -com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.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 @@ -58,14 +112,8 @@ com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatch ; to use FCKeditor: ; com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js ; com.arsdigita.cms.dhtml_editor_hidden_buttons= - -; to use deprecated HTMLarea (NOT recommended!): -; currently configuration is hardcoded, so the fest alternative works -; com.arsdigita.cms.dhtml_editor_config=HTMLArea -; com.arsdigita.cms.dhtml_editor_config=HTMLArea,/assets/htmlarea/config/Styled.js ; 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 @@ -75,11 +123,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 @@ -104,10 +157,21 @@ com.arsdigita.forum.use_wysiwyg_editor=true com.arsdigita.forum.allow_quick_finish=true com.arsdigita.forum.disable_page_caching=true -# atoz +# AtoZ configuration parameters +# ############################################################################## com.arsdigita.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker -# ccm-navigation application +# 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 @@ -120,31 +184,45 @@ com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/n #com.arsdigita.navigation.templates_file=bundle/navigation/templates.txt -# ccm-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 - - -# ccm-subsite application +# SUBSITE configuration parameters +# ############################################################################## com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker -# ccm-themedirector application +# 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-ldn-aplaws.web.mf # Required to denote the dir containing the default theme! themedirector.default_theme_path=themes/static/aplaws -# ccm-auth-http application -; auth.http.admin_email=webmaster@aplaws.org -; auth.http.admin_identifier=webmaster +# 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 + +# LDN Dublin Core configuration parameters +# ############################################################################## com.arsdigita.london.cms.dublin.audience_domain=LGAL -; ============================================================================================= -; runtime specific configurations +# SCI bundle 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@aplaws.org #waf.admin.name.given=Aplaws diff --git a/ccm-ldn-aplaws/bundles/standard/cfg/web.xml b/ccm-ldn-aplaws/bundles/standard/cfg/web.xml index e83fcf133..ba84d532a 100755 --- a/ccm-ldn-aplaws/bundles/standard/cfg/web.xml +++ b/ccm-ldn-aplaws/bundles/standard/cfg/web.xml @@ -92,6 +92,7 @@ com.arsdigita.web.DispatcherServlet 2 + cache-manager com.arsdigita.caching.CacheServlet @@ -144,7 +145,7 @@ content-center - com.arsdigita.cms.WorkspaceServlet + com.arsdigita.cms.ContentCenterServlet