Menu
▾
▴
[Aplaws-commit] r2443 - in contrib/camden/ccm-lbc-aplaws: . bundles/intranet bundles/intranet/cfg pdl/uk/gov/camden/aplaws/intranet src src/uk/gov/camden/aplaws/intranet web web/templates web/templates/ccm-navigation web/templates/ccm-navigation/navigation
Author: pboy Date: 2012-12-26 01:18:05 +0000 (Wed, 26 Dec 2012) New Revision: 2443 Added: contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/applications-1-0-4.cfg contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/integration-1-0-4.properties contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/project.xml contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/web-1-0-4.xml contrib/camden/ccm-lbc-aplaws/src/ccm-lbc-aplaws.config contrib/camden/ccm-lbc-aplaws/src/ccm-lbc-aplaws.load contrib/camden/ccm-lbc-aplaws/web/templates/ contrib/camden/ccm-lbc-aplaws/web/templates/ccm-navigation/ contrib/camden/ccm-lbc-aplaws/web/templates/ccm-navigation/navigation/ Removed: contrib/camden/ccm-lbc-aplaws/bundles/intranet/AUTHORS contrib/camden/ccm-lbc-aplaws/bundles/intranet/NEWS contrib/camden/ccm-lbc-aplaws/bundles/intranet/bundle.in contrib/camden/ccm-lbc-aplaws/bundles/intranet/ccm-bundle-camden-essentials.spec contrib/camden/ccm-lbc-aplaws/bundles/intranet/ccm-bundle-camden-essentials.spec.in contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/Makefile.am contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/applications.cfg contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/integration.properties contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/web.xml contrib/camden/ccm-lbc-aplaws/bundles/intranet/configure.in contrib/camden/ccm-lbc-aplaws/src/ccm-ldn-camden-aplaws.config contrib/camden/ccm-lbc-aplaws/src/ccm-ldn-camden-aplaws.load contrib/camden/ccm-lbc-aplaws/web/packages/ contrib/camden/ccm-lbc-aplaws/web/templates/ccm-navigation/templates/ contrib/camden/ccm-lbc-aplaws/web/templates/navigation/ Modified: contrib/camden/ccm-lbc-aplaws/application.xml contrib/camden/ccm-lbc-aplaws/pdl/uk/gov/camden/aplaws/intranet/FilteredItemListPortlet.pdl contrib/camden/ccm-lbc-aplaws/src/uk/gov/camden/aplaws/intranet/Initializer.java contrib/camden/ccm-lbc-aplaws/src/uk/gov/camden/aplaws/intranet/IntranetResourceBundle.java contrib/camden/ccm-lbc-aplaws/web/templates/ccm-navigation/navigation/intranet-default.jsp contrib/camden/ccm-lbc-aplaws/web/templates/ccm-navigation/navigation/intranet-diary.jsp contrib/camden/ccm-lbc-aplaws/web/templates/ccm-navigation/navigation/intranet-doclib.jsp contrib/camden/ccm-lbc-aplaws/web/templates/ccm-navigation/navigation/intranet-ict-diary.jsp contrib/camden/ccm-lbc-aplaws/web/templates/ccm-navigation/navigation/intranet-room.jsp Log: First basic adaptation completed. Module compiles, compiles, intranet bundle loads, system starts. Modified: contrib/camden/ccm-lbc-aplaws/application.xml =================================================================== --- contrib/camden/ccm-lbc-aplaws/application.xml 2012-12-22 14:13:36 UTC (rev 2442) +++ contrib/camden/ccm-lbc-aplaws/application.xml 2012-12-26 01:18:05 UTC (rev 2443) @@ -1,18 +1,21 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" - name="ccm-ldn-camden-intranet" - prettyName="ccm-ldn-camden-intranet" - version="1.0.1" - release="6" + name="ccm-lbc-aplaws" + prettyName="Camden APLAWS" + version="6.6.1" + release="1" webapp="ROOT"> <ccm:dependencies> + <ccm:requires name="ccm-core" version="6.6.0" relation="ge"/> + <ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/> <ccm:requires name="ccm-cms-types-mparticle" version="6.3.0" relation="ge"/> <ccm:requires name="ccm-cms-types-event" version="6.3.0" relation="ge"/> <ccm:requires name="ccm-cms-assets-fileattachment" version="6.3.1" relation="ge"/> - <ccm:requires name="ccm-ldn-navigation" version="6.3.0" relation="ge"/> + <ccm:requires name="ccm-navigation" version="6.3.0" relation="ge"/> <ccm:requires name="ccm-ldn-dublin" version="6.3.1" relation="ge"/> + <ccm:requires name="ccm-ldn-aplaws" version="6.6.0" relation="ge"/> </ccm:dependencies> <ccm:directories> @@ -27,7 +30,25 @@ </ccm:contacts> <ccm:description> - Camden Intranet customization + Service module which tailors the aplaws software to the London Borough of + Camden WEB sites. + + It depends on the general APLAWS service module ccm-ldn-aplaws and reuses + its code, specifically for loading navigation categories, various APLAWS + classes and custom jsp's. + + It provides for it's own + - custom specific customization parameters (cf. the bundles) for Camden + intranet und public site + - the Camden theme + - additional funktionality, e.g. Camden specific portlets. + - provides Camden specific text for messages (Camden resource bundles, + e.g. IntranetResources.properties) + + APLAWS is a collaboration and content management system which is based upon + the Red Hat Web Application Framework, which is a platform for writing + database-backed web applications in Java. + </ccm:description> </ccm:application> Deleted: contrib/camden/ccm-lbc-aplaws/bundles/intranet/AUTHORS =================================================================== Deleted: contrib/camden/ccm-lbc-aplaws/bundles/intranet/NEWS =================================================================== Deleted: contrib/camden/ccm-lbc-aplaws/bundles/intranet/bundle.in =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/intranet/bundle.in 2012-12-22 14:13:36 UTC (rev 2442) +++ contrib/camden/ccm-lbc-aplaws/bundles/intranet/bundle.in 2012-12-26 01:18:05 UTC (rev 2443) @@ -1,4 +0,0 @@ -BUNDLE_NAME=camden-essentials -BUNDLE_PRETTY_NAME="Camden essentials bundle" -VERSION=1.0.0 -RELEASE=3 Deleted: contrib/camden/ccm-lbc-aplaws/bundles/intranet/ccm-bundle-camden-essentials.spec =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/intranet/ccm-bundle-camden-essentials.spec 2012-12-22 14:13:36 UTC (rev 2442) +++ contrib/camden/ccm-lbc-aplaws/bundles/intranet/ccm-bundle-camden-essentials.spec 2012-12-26 01:18:05 UTC (rev 2443) @@ -1,41 +0,0 @@ -Summary: Camden essentials bundle -Name: ccm-bundle-camden-essentials -Version: 1.0.0 -Release: 3 -URL: http://www.aplaws.org.uk -Source0: %{name}-%{version}.tar.gz -License: LGPL -Group: Applications/Internet/CCM -BuildRoot: %{_tmppath}/%{name}-root -Requires: ccm-tools-bundle -Requires: ccm-core ccm-cms ccm-ldn-theme ccm-ldn-terms ccm-ldn-navigation ccm-ldn-portal ccm-ldn-util ccm-ldn-subsite ccm-ldn-atoz ccm-forum ccm-ldn-rss ccm-ldn-aplaws ccm-formbuilder-pdf ccm-ldn-search ccm-ldn-shortcuts ccm-ldn-xmlfeed ccm-ldn-importer ccm-ldn-camden-eforms ccm-ldn-dublin ccm-ldn-camden-intranet ccm-ldn-content-check ccm-cms-assets-fileattachment ccm-cms-assets-relatedlink ccm-cms-types-agenda ccm-cms-types-article ccm-cms-types-event ccm-cms-types-filestorageitem ccm-cms-types-formitem ccm-cms-types-formsectionitem ccm-cms-types-htmlform ccm-cms-types-inlinesite ccm-cms-types-job ccm-cms-types-legalnotice ccm-cms-types-minutes ccm-cms-types-newsitem ccm-cms-types-pressrelease ccm-cms-types-service ccm-cms-types-siteproxy ccm-cms-types-mparticle -BuildArch: noarch -Prefix: /usr - -%description -The Camden essentials bundle provides a mechanism to install -the pre-integrated set of APLAWS+ application. - -%prep -%setup -q - -%build -./configure --prefix=/usr -make - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root) -/usr/share/ccm-tools/bundles/camden-essentials/applications.cfg -/usr/share/ccm-tools/bundles/camden-essentials/integration.properties -/usr/share/ccm-tools/bundles/camden-essentials/web.xml - -%changelog -* Thu May 11 2006 Alan Pevec <ap...@re...> -- Initial build. Deleted: contrib/camden/ccm-lbc-aplaws/bundles/intranet/ccm-bundle-camden-essentials.spec.in =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/intranet/ccm-bundle-camden-essentials.spec.in 2012-12-22 14:13:36 UTC (rev 2442) +++ contrib/camden/ccm-lbc-aplaws/bundles/intranet/ccm-bundle-camden-essentials.spec.in 2012-12-26 01:18:05 UTC (rev 2443) @@ -1,41 +0,0 @@ -Summary: @BUNDLE_PRETTY_NAME@ -Name: @PACKAGE@ -Version: @VERSION@ -Release: @RELEASE@ -URL: http://www.aplaws.org.uk -Source0: %{name}-%{version}.tar.gz -License: LGPL -Group: Applications/Internet/CCM -BuildRoot: %{_tmppath}/%{name}-root -Requires: ccm-tools-bundle -Requires: @REQUIRES_LIST@ -BuildArch: noarch -Prefix: /usr - -%description -The @BUNDLE_PRETTY_NAME@ provides a mechanism to install -the pre-integrated set of APLAWS+ application. - -%prep -%setup -q - -%build -./configure --prefix=/usr -make - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root) -/usr/share/ccm-tools/bundles/@BUNDLE_NAME@/applications.cfg -/usr/share/ccm-tools/bundles/@BUNDLE_NAME@/integration.properties -/usr/share/ccm-tools/bundles/@BUNDLE_NAME@/web.xml - -%changelog -* Thu May 11 2006 Alan Pevec <ap...@re...> -- Initial build. Deleted: contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/Makefile.am =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/Makefile.am 2012-12-22 14:13:36 UTC (rev 2442) +++ contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/Makefile.am 2012-12-26 01:18:05 UTC (rev 2443) @@ -1,7 +0,0 @@ -AUTOMAKE_OPTIONS = foreign no-dependencies 1.4 - -cfgdir = $(datadir)/ccm-tools/bundles/camden-essentials -cfg_DATA = web.xml applications.cfg integration.properties - -EXTRA_DIST = $(cfg_DATA) - Copied: contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/applications-1-0-4.cfg (from rev 2439, contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/applications.cfg) =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/applications-1-0-4.cfg (rev 0) +++ contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/applications-1-0-4.cfg 2012-12-26 01:18:05 UTC (rev 2443) @@ -0,0 +1,43 @@ +ccm-core +ccm-cms +ccm-ldn-theme +ccm-ldn-terms +ccm-ldn-navigation +ccm-ldn-portal +ccm-ldn-util +ccm-ldn-subsite +ccm-ldn-atoz +ccm-forum +ccm-ldn-rss +ccm-ldn-aplaws + +ccm-formbuilder-pdf +ccm-ldn-search +ccm-ldn-shortcuts +ccm-ldn-xmlfeed +ccm-ldn-importer + +ccm-ldn-camden-eforms +ccm-ldn-dublin +ccm-ldn-camden-intranet +ccm-ldn-content-check + +ccm-cms-assets-fileattachment +ccm-cms-assets-relatedlink +ccm-cms-types-agenda +ccm-cms-types-article +ccm-cms-types-event +ccm-cms-types-filestorageitem +ccm-cms-types-formitem +ccm-cms-types-formsectionitem +ccm-cms-types-htmlform +ccm-cms-types-inlinesite +ccm-cms-types-job +ccm-cms-types-legalnotice +ccm-cms-types-minutes +ccm-cms-types-newsitem +ccm-cms-types-pressrelease +ccm-cms-types-service +ccm-cms-types-siteproxy +ccm-cms-types-mparticle + Deleted: contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/applications.cfg =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/applications.cfg 2012-12-22 14:13:36 UTC (rev 2442) +++ contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/applications.cfg 2012-12-26 01:18:05 UTC (rev 2443) @@ -1,43 +0,0 @@ -ccm-core -ccm-cms -ccm-ldn-theme -ccm-ldn-terms -ccm-ldn-navigation -ccm-ldn-portal -ccm-ldn-util -ccm-ldn-subsite -ccm-ldn-atoz -ccm-forum -ccm-ldn-rss -ccm-ldn-aplaws - -ccm-formbuilder-pdf -ccm-ldn-search -ccm-ldn-shortcuts -ccm-ldn-xmlfeed -ccm-ldn-importer - -ccm-ldn-camden-eforms -ccm-ldn-dublin -ccm-ldn-camden-intranet -ccm-ldn-content-check - -ccm-cms-assets-fileattachment -ccm-cms-assets-relatedlink -ccm-cms-types-agenda -ccm-cms-types-article -ccm-cms-types-event -ccm-cms-types-filestorageitem -ccm-cms-types-formitem -ccm-cms-types-formsectionitem -ccm-cms-types-htmlform -ccm-cms-types-inlinesite -ccm-cms-types-job -ccm-cms-types-legalnotice -ccm-cms-types-minutes -ccm-cms-types-newsitem -ccm-cms-types-pressrelease -ccm-cms-types-service -ccm-cms-types-siteproxy -ccm-cms-types-mparticle - Copied: contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/integration-1-0-4.properties (from rev 2439, contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/integration.properties) =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/integration-1-0-4.properties (rev 0) +++ contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/integration-1-0-4.properties 2012-12-26 01:18:05 UTC (rev 2443) @@ -0,0 +1,179 @@ +waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver +waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-stylesheet-paths.txt +waf.kernel.data_permission_check_enabled=false +waf.dispatcher.default_expiry=3600 +waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage +waf.pagemap.root=portal/ +waf.pagemap.workspace=portal/ +waf.pagemap.login_redirect=content/content-center-redirect.jsp + +com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp +com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp +com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver +com.arsdigita.cms.disable_item_pfs=true +com.arsdigita.cms.use_section_categories=false +com.arsdigita.cms.use_streamlined_creation=true +com.arsdigita.cms.hide_admin_tabs=true +com.arsdigita.cms.hide_timezone=true +com.arsdigita.cms.hide_launch_date=true +com.arsdigita.cms.dhtml_editor_config=HTMLArea.Config.CMSStyled,/assets/htmlarea/config/Styled.js +com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS +com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker +com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true +com.arsdigita.cms.contenttypes.mparticle.template=resource:///WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp +com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=resource:///WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp +com.arsdigita.cms.hide_udct_ui=true +com.arsdigita.cms.hide_folder_index_checkbox=true + +com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker +com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker + +com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws +com.arsdigita.london.theme.default_theme_context= +com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-aplaws.web.mf +com.arsdigita.london.search.show_sponsored_links=true + +com.arsdigita.london.cms.dublin.audience_domain=LGAL + +com.arsdigita.aplaws.override_anav_from_lgcl_mappings=false +com.arsdigita.cms.contentassets.file_edit_form=uk.gov.camden.aplaws.intranet.FileMetadataForm +com.arsdigita.cms.contentassets.ui.RelatedLinkPropertyForm.hideAdditionalResourceFields=false +com.arsdigita.cms.default_content_section=content ; no longer used /exists +com.arsdigita.cms.default_item_resolver_class=com.arsdigita.cms.dispatcher.MultilingualItemResolver ; default value +com.arsdigita.cms.default_notification_time=0 ; DEFAULT value +com.arsdigita.cms.default_task_alerts=Approval\:enable_ALL\:disable_LASTAUTHOR,Deploy\:finish_LASTAUTHOR +com.arsdigita.cms.delete_workflow_after_publication=true ; DEFAULT value +com.arsdigita.cms.hide_templates_tab=false +com.arsdigita.cms.item_adapters=resource\:WEB-INF/resources/cms-item-adapters.xml ; DEFAULT +com.arsdigita.cms.languages=en ; Parameter moved to core-kernel +com.arsdigita.cms.notify_author_on_lifecycle=true ; DEFAULT +com.arsdigita.cms.publish_lifecycle_listener_class=com.arsdigita.cms.lifecycle.PublishLifecycleListener ; DEFAULT +# Parmeter moved to package cms.publishToFile, (cad.cms.pft.listener_class), DEFAULT value anyway +com.arsdigita.cms.publish_to_file_class=com.arsdigita.cms.publishToFile.PublishToFile + +com.arsdigita.cms.save_text_cleans_word_tags=false ; DEFAULT +com.arsdigita.cms.search.disableFileAssetExtraction=false ; DEFAULT +com.arsdigita.cms.soon_expired_timespan_days=7 +com.arsdigita.cms.soon_expired_timespan_months=0 +# Location changed to /template/ccm-cms/content-section +com.arsdigita.cms.template_root_path=/packages/content-section/templates + +# Formbuilder-pdf moved to ROOT app, value changed accordingly. DEFAULT value anyway +com.arsdigita.formbuilder.pdf.xsl_file=webapps/ccm-formbuilder-pdf/xsl/main.xsl + +com.arsdigita.forum.admin_can_edit_posts=true ; DEFAULT +com.arsdigita.forum.author_can_edit_posts=true ; DEFAULT +com.arsdigita.forum.traversal_adapters=resource\:WEB-INF/resources/forum-adapters.xml ; DEFAULT + +# DEFAULT value anyway +com.arsdigita.london.atoz.traversal_adapters=resource\:WEB-INF/resources/atoz-adapters.xml +com.arsdigita.london.atoz.use_subsite_specific_navigation_category=false ; DEFAULT anyway + +com.arsdigita.london.cms.dublin.related_items_subject_domain=LGCL ; DEFAULT +com.arsdigita.london.cms.dublin.use_ccn_portal_default=false ; DEFAULT + +com.arsdigita.london.navigation.category_menu_show_grand_children=false ; OK +com.arsdigita.london.navigation.category_menu_show_nephews=false ; OK +com.arsdigita.london.navigation.default_cat_root_path=/navigation/ ; OK +com.arsdigita.london.navigation.default_content_section_url=/content/ ; REMOVED +com.arsdigita.london.navigation.default_nav_model=com.arsdigita.london.navigation.ApplicationNavigationModel ; DEFAULT +com.arsdigita.london.navigation.default_template=/packages/navigation/templates/intranet-default.jsp ; Moved, OK +com.arsdigita.london.navigation.generate_item_url=true ; DEFAULT +com.arsdigita.london.navigation.index_page_cache_lifetime=3600 ; DEFAULT +com.arsdigita.london.navigation.related_items_context=subject ; DEFAULT +com.arsdigita.london.navigation.related_items_factory=com.arsdigita.london.navigation.RelatedItemsQueryFactoryImpl ; DEFAULT +com.arsdigita.london.navigation.traversal_adapters=resource\:WEB-INF/resources/navigation-adapters.xml ; DEFAULT + +com.arsdigita.london.portal.admin_only_portlet_types= ; DEFAULT +com.arsdigita.london.portal.default_layout=30%,40%,30% ; DEFAULT +com.arsdigita.london.portal.excluded_portlet_types= ; DEFAULT +com.arsdigita.london.portal.traversal_adapters=resource\:WEB-INF/resources/portal-adapters.xml ; Modified, OK + +com.arsdigita.london.rss.categoryKey=RSS ; Moved, DEFAULT + +com.arsdigita.london.search.num_threads=10 ; DEFAULT +com.arsdigita.london.search.simple_restrict_to= ; DEFAULT empty +com.arsdigita.london.search.spider.delay=600 ; DEFAULT +com.arsdigita.london.search.spider.frequency=0 ; DEFAULT +com.arsdigita.london.search.spider.max_depth=2 ; DEFAULT +com.arsdigita.london.search.timeout=4000 ; DEFAULT + +com.arsdigita.london.subsite.front_page_application=com.arsdigita.london.portal.Workspace ; modified, DEFAULT +com.arsdigita.london.subsite.front_page_parent_url=/portal/ ; DEFAULT +com.arsdigita.london.subsite.traversal_adapters=resource\:WEB-INF/resources/subsite-adapters.xml ; DEFAULT + +com.arsdigita.london.terms.default_domain=LGCL ; DEFAULT +com.arsdigita.london.terms.traversal_adapters=resource\:WEB-INF/resources/terms-adapters.xml ; DEFAULT + +com.arsdigita.london.theme.file_extensions=jpeg jpg gif xsl css js png bmp ; Modified, OK +com.arsdigita.london.theme.theme_dev_file_watch_poll_delay=300 ; Modified OK +com.arsdigita.london.theme.theme_dev_file_watch_startup_delay=120 ; DEFAULT +com.arsdigita.london.theme.theme_pub_file_watch_poll_delay=300 ; Modified OK +com.arsdigita.london.theme.theme_pub_file_watch_startup_delay=120 ; DEFAULT +com.arsdigita.portal.create_user_workspaces=true ; DEFAULT + +waf.bebop.fancy_xsl_errors=true ; OK +waf.bebop.presentation_manager=com.arsdigita.bebop.page.PageTransformer ; DEFAULT +waf.bebop.tidy_config_file=com/arsdigita/bebop/parameters/tidy.properties ; DEFAULT +waf.debug=false ; DEFAULT +waf.dispatcher.is_caching_active=true ; DEFAULT +waf.dispatcher.static_url_prefix=/STATICII/ ; DEFAULT +waf.formbuilder.actions_help_url= ; DEFAULT +waf.formbuilder.controls_help_url= ; DEFAULT +waf.kernel.primary_user_identifier=email ; DEFAULT +waf.kernel.remember_login=true ; DEFAULT +waf.kernel.secure_login=false ; DEFAULT +; waf.login_config resembles DEFAULTS, but deaves off RegisterSSO, 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.lucene.analyzer=org.apache.lucene.analysis.standard.StandardAnalyzer ; DEFAULT +waf.lucene.interval=120 ; DEFAULT +waf.lucene.location=/var/ccm-devel/web/redhat/intratest/data/lucene ; moved OK + +waf.mail.debug=false ; DEFAULT +waf.mail.default_from=web...@ca... ; OK + +waf.pagemap.change=register/change-password ; DEFAULT, no longer user config +waf.pagemap.cookies=register/explain-persistent-cookies ; DEFAULT, no longer user config +waf.pagemap.expired=register/login-expired ; DEFAULT, no longer user config +waf.pagemap.login=register/ ; DEFAULT +waf.pagemap.logout=register/logout ; DEFAULT, no longer user config +waf.pagemap.newuser=register/new-user ; DEFAULT, no longer user config +waf.pagemap.permission=permissions/ ; DEFAULT, no longer user config +waf.pagemap.perm_single=permissions/one ; DEFAULT, no longer user config +waf.pagemap.recover=register/recover-password ; DEFAULT, no longer user config + +waf.profiler.enabled=false ; DEFAULT + +waf.runtime.jdbc_ping_interval=30000 ; DEFAULT +waf.runtime.jdbc_pool_size=100 ; OK +waf.runtime.jdbc_resultset_windowsize=1 ; DEFAULT +waf.runtime.query_cache_size=2000 ; DEFAULT +waf.runtime.thread_tagging=true ; DEFAULT + +waf.search.indexer=lucene +waf.search.intermedia.raw_content_weight=1 ; DEFAULT +waf.search.intermedia.xml_content_weight=1 ; DEFAULT +waf.search.lazy_updates=true ; DEFAULT + +waf.versioning.debug_ui_enabled=false ; DEFAULT + +waf.web.application_file_resolver=com.arsdigita.web.DefaultApplicationFileResolver ; DEFAULT +waf.web.cache_policy=none ; OK +waf.web.deactivate_cache_host_notifications=true ; OK +waf.web.default_scheme=http ; OK +waf.web.dispatcher_context_path= ; DEFAULT +waf.web.dispatcher_servlet_path=/ccm ; DEFAULT +waf.web.dynamic_host_provider=com.arsdigita.util.servlet.HttpHost.SubsiteDynamicHostProvider ; OK + +# XXX edit hostname +waf.web.host=esv-crs-intraappXX.lbcamden.net\:8080 ; OK +waf.web.server=camden-essentials.lbcamden.net\:80 ; OK +waf.web.site_name=Camden essentials ; OK + +waf.workflow.simple.alerts_enabled=true ; OK +waf.workflow.simple.alerts_sender=ess...@ca... ; OK + +com.arsdigita.cms.unpublished_not_found=false ; OK +com.arsdigita.cms.check_bcc=ess...@ca... ; TODO Check Deleted: contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/integration.properties =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/integration.properties 2012-12-22 14:13:36 UTC (rev 2442) +++ contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/integration.properties 2012-12-26 01:18:05 UTC (rev 2443) @@ -1,149 +0,0 @@ -waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver -waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-stylesheet-paths.txt -waf.kernel.data_permission_check_enabled=false -waf.dispatcher.default_expiry=3600 -waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage -waf.pagemap.root=portal/ -waf.pagemap.workspace=portal/ -waf.pagemap.login_redirect=content/content-center-redirect.jsp - -com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp -com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp -com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver -com.arsdigita.cms.disable_item_pfs=true -com.arsdigita.cms.use_section_categories=false -com.arsdigita.cms.use_streamlined_creation=true -com.arsdigita.cms.hide_admin_tabs=true -com.arsdigita.cms.hide_timezone=true -com.arsdigita.cms.hide_launch_date=true -com.arsdigita.cms.dhtml_editor_config=HTMLArea.Config.CMSStyled,/assets/htmlarea/config/Styled.js -com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS -com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker -com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true -com.arsdigita.cms.contenttypes.mparticle.template=resource:///WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp -com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=resource:///WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp -com.arsdigita.cms.hide_udct_ui=true -com.arsdigita.cms.hide_folder_index_checkbox=true - -com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker -com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker - -com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws -com.arsdigita.london.theme.default_theme_context= -com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-aplaws.web.mf -com.arsdigita.london.search.show_sponsored_links=true - -com.arsdigita.london.cms.dublin.audience_domain=LGAL - -com.arsdigita.aplaws.override_anav_from_lgcl_mappings=false -com.arsdigita.cms.contentassets.file_edit_form=uk.gov.camden.aplaws.intranet.FileMetadataForm -com.arsdigita.cms.contentassets.ui.RelatedLinkPropertyForm.hideAdditionalResourceFields=false -com.arsdigita.cms.default_content_section=content -com.arsdigita.cms.default_item_resolver_class=com.arsdigita.cms.dispatcher.MultilingualItemResolver -com.arsdigita.cms.default_notification_time=0 -com.arsdigita.cms.default_task_alerts=Approval\:enable_ALL\:disable_LASTAUTHOR,Deploy\:finish_LASTAUTHOR -com.arsdigita.cms.delete_workflow_after_publication=true -com.arsdigita.cms.hide_templates_tab=false -com.arsdigita.cms.item_adapters=resource\:WEB-INF/resources/cms-item-adapters.xml -com.arsdigita.cms.languages=en -com.arsdigita.cms.notify_author_on_lifecycle=true -com.arsdigita.cms.publish_lifecycle_listener_class=com.arsdigita.cms.lifecycle.PublishLifecycleListener -com.arsdigita.cms.publish_to_file_class=com.arsdigita.cms.publishToFile.PublishToFile -com.arsdigita.cms.save_text_cleans_word_tags=false -com.arsdigita.cms.search.disableFileAssetExtraction=false -com.arsdigita.cms.soon_expired_timespan_days=7 -com.arsdigita.cms.soon_expired_timespan_months=0 -com.arsdigita.cms.template_root_path=/packages/content-section/templates -com.arsdigita.formbuilder.pdf.xsl_file=webapps/ccm-formbuilder-pdf/xsl/main.xsl -com.arsdigita.forum.admin_can_edit_posts=true -com.arsdigita.forum.author_can_edit_posts=true -com.arsdigita.forum.traversal_adapters=resource\:WEB-INF/resources/forum-adapters.xml -com.arsdigita.london.atoz.traversal_adapters=resource\:WEB-INF/resources/atoz-adapters.xml -com.arsdigita.london.atoz.use_subsite_specific_navigation_category=false -com.arsdigita.london.cms.dublin.related_items_subject_domain=LGCL -com.arsdigita.london.cms.dublin.use_ccn_portal_default=false -com.arsdigita.london.navigation.category_menu_show_grand_children=false -com.arsdigita.london.navigation.category_menu_show_nephews=false -com.arsdigita.london.navigation.default_cat_root_path=/navigation/ -com.arsdigita.london.navigation.default_content_section_url=/content/ -com.arsdigita.london.navigation.default_nav_model=com.arsdigita.london.navigation.ApplicationNavigationModel -com.arsdigita.london.navigation.default_template=/packages/navigation/templates/intranet-default.jsp -com.arsdigita.london.navigation.generate_item_url=true -com.arsdigita.london.navigation.index_page_cache_lifetime=3600 -com.arsdigita.london.navigation.related_items_context=subject -com.arsdigita.london.navigation.related_items_factory=com.arsdigita.london.navigation.RelatedItemsQueryFactoryImpl -com.arsdigita.london.navigation.traversal_adapters=resource\:WEB-INF/resources/navigation-adapters.xml -com.arsdigita.london.portal.admin_only_portlet_types= -com.arsdigita.london.portal.default_layout=30%,40%,30% -com.arsdigita.london.portal.excluded_portlet_types= -com.arsdigita.london.portal.traversal_adapters=resource\:WEB-INF/resources/portal-adapters.xml -com.arsdigita.london.rss.categoryKey=RSS -com.arsdigita.london.search.num_threads=10 -com.arsdigita.london.search.simple_restrict_to= -com.arsdigita.london.search.spider.delay=600 -com.arsdigita.london.search.spider.frequency=0 -com.arsdigita.london.search.spider.max_depth=2 -com.arsdigita.london.search.timeout=4000 -com.arsdigita.london.subsite.front_page_application=com.arsdigita.london.portal.Workspace -com.arsdigita.london.subsite.front_page_parent_url=/portal/ -com.arsdigita.london.subsite.traversal_adapters=resource\:WEB-INF/resources/subsite-adapters.xml -com.arsdigita.london.terms.default_domain=LGCL -com.arsdigita.london.terms.traversal_adapters=resource\:WEB-INF/resources/terms-adapters.xml -com.arsdigita.london.theme.file_extensions=jpeg jpg gif xsl css js png bmp -com.arsdigita.london.theme.theme_dev_file_watch_poll_delay=300 -com.arsdigita.london.theme.theme_dev_file_watch_startup_delay=120 -com.arsdigita.london.theme.theme_pub_file_watch_poll_delay=300 -com.arsdigita.london.theme.theme_pub_file_watch_startup_delay=120 -com.arsdigita.portal.create_user_workspaces=true -waf.bebop.fancy_xsl_errors=true -waf.bebop.presentation_manager=com.arsdigita.bebop.page.PageTransformer -waf.bebop.tidy_config_file=com/arsdigita/bebop/parameters/tidy.properties -waf.debug=false -waf.dispatcher.is_caching_active=true -waf.dispatcher.static_url_prefix=/STATICII/ -waf.formbuilder.actions_help_url= -waf.formbuilder.controls_help_url= -waf.kernel.primary_user_identifier=email -waf.kernel.remember_login=true -waf.kernel.secure_login=false -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.lucene.analyzer=org.apache.lucene.analysis.standard.StandardAnalyzer -waf.lucene.interval=120 -waf.lucene.location=/var/ccm-devel/web/redhat/intratest/data/lucene -waf.mail.debug=false -waf.mail.default_from=web...@ca... -waf.pagemap.change=register/change-password -waf.pagemap.cookies=register/explain-persistent-cookies -waf.pagemap.expired=register/login-expired -waf.pagemap.login=register/ -waf.pagemap.logout=register/logout -waf.pagemap.newuser=register/new-user -waf.pagemap.permission=permissions/ -waf.pagemap.perm_single=permissions/one -waf.pagemap.recover=register/recover-password -waf.profiler.enabled=false -waf.runtime.jdbc_ping_interval=30000 -waf.runtime.jdbc_pool_size=100 -waf.runtime.jdbc_resultset_windowsize=1 -waf.runtime.query_cache_size=2000 -waf.runtime.thread_tagging=true -waf.search.indexer=lucene -waf.search.intermedia.raw_content_weight=1 -waf.search.intermedia.xml_content_weight=1 -waf.search.lazy_updates=true -waf.versioning.debug_ui_enabled=false -waf.web.application_file_resolver=com.arsdigita.web.DefaultApplicationFileResolver -waf.web.cache_policy=none -waf.web.deactivate_cache_host_notifications=true -waf.web.default_scheme=http -waf.web.dispatcher_context_path= -waf.web.dispatcher_servlet_path=/ccm -waf.web.dynamic_host_provider=com.arsdigita.util.servlet.HttpHost.SubsiteDynamicHostProvider -# XXX edit hostname -waf.web.host=esv-crs-intraappXX.lbcamden.net\:8080 -waf.web.server=camden-essentials.lbcamden.net\:80 -waf.web.site_name=Camden essentials -waf.workflow.simple.alerts_enabled=true -waf.workflow.simple.alerts_sender=ess...@ca... -com.arsdigita.cms.unpublished_not_found=false -com.arsdigita.cms.check_bcc=ess...@ca... Added: contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/project.xml =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/project.xml (rev 0) +++ contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/project.xml 2012-12-26 01:18:05 UTC (rev 2443) @@ -0,0 +1,158 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<!-- project.xml - Camden Intranet - containing all modules of the current + aplaws repository used by Camden Intranet. --> + +<ccm:project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ccm="http://ccm.redhat.com/ccm-project" + ccmVersion="6.1" + name="aplaws" + prettyName="APLAWS plus Camden Intranet" + version="2-0-0" + release="alpha01" + webxml="web.xml" + webapp="ROOT" + xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd"> + +<ccm:databases> + <ccm:database name="postgres"/> + <ccm:database name="oracle-se"/> +</ccm:databases> + + + <ccm:build> + +<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> +<!-- APLAWS+ set of CORE packages --> +<!-- NONE can be omitted for technical reasons / internal dependencies --> +<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + +<!-- Main apps --> + <ccm:application name="ccm-core"/> + <ccm:application name="ccm-cms"/> + +<!-- Content Assets --> + +<!-- Content Types --> + <ccm:application name="ccm-cms-types-article"/> + +<!-- Applications --> + <ccm:application name="ccm-atoz"/> <!-- part of (default) theme --> + <ccm:application name="ccm-navigation"/> + <!-- ccm-portalworkspace depends on ccm-subsite - + in class ui.PortletTypeForm --> + <ccm:application name="ccm-portalworkspace"/> + <ccm:application name="ccm-portalworkspace-homepage"/> + <ccm:application name="ccm-rssfeed"/> + <ccm:application name="ccm-shortcuts"/> + <ccm:application name="ccm-subsite"/> + <ccm:application name="ccm-themedirector"/> + +<!-- LDN core extensions --> + <ccm:application name="ccm-ldn-dublin"/> + <ccm:application name="ccm-ldn-search"/> + <ccm:application name="ccm-ldn-terms"/> + <ccm:application name="ccm-ldn-util"/> + +<!-- Integration Package --> + <ccm:application name="ccm-lbc-aplaws"/> + <!-- ccm-lbc-aplaws reused code of the standard + ldn integration package and depends on it! --> + <ccm:application name="ccm-ldn-aplaws"/> + + +<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> +<!-- APLAWS+ OPTIONAL packages --> +<!-- Various combinations of these packages make up specific bundles --> +<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + +<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> +<!-- Camden Intranet Bundle --> +<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + +<!-- Intranet Bundle's Content Assets --> + <ccm:application name="ccm-cms-assets-relatedlink"/> + <ccm:application name="ccm-cms-assets-fileattachment"/> + +<!-- Intranet Bundle's Core Content Types --> + <ccm:application name="ccm-cms-types-agenda"/> + <ccm:application name="ccm-cms-types-event"/> + <ccm:application name="ccm-cms-types-filestorageitem"/> + <ccm:application name="ccm-cms-types-formitem"/> + <ccm:application name="ccm-cms-types-formsectionitem"/> + <ccm:application name="ccm-cms-types-htmlform"/> + <ccm:application name="ccm-cms-types-inlinesite"/> + <ccm:application name="ccm-cms-types-job"/> + <ccm:application name="ccm-cms-types-legalnotice"/> + <ccm:application name="ccm-cms-types-minutes"/> + <ccm:application name="ccm-cms-types-mparticle"/> + <ccm:application name="ccm-cms-types-newsitem"/> + <ccm:application name="ccm-cms-types-pressrelease"/> + <ccm:application name="ccm-cms-types-service"/> + <ccm:application name="ccm-cms-types-siteproxy"/> + <ccm:application name="ccm-cms-types-xmlfeed"/> + +<!-- Intranet Bundle's Applications --> + <ccm:application name="ccm-atoz-siteproxy"/> <!-- requires siteproxy!--> + <ccm:application name="ccm-forum"/> + <!-- Without known funcionality --> + <ccm:application name="ccm-formbuilder-pdf"/> + +<!-- Intranet Bundle's LDN extensions --> + <ccm:application name="ccm-ldn-atoz"/> + <ccm:application name="ccm-ldn-importer"/> + <ccm:application name="ccm-ldn-types-contact"/> + <ccm:application name="ccm-ldn-types-esdservice"/> + +<!-- Intranet Bundle's LBC Content Types --> + <!-- + <ccm:application name="ccm-lbc-contentcheck"/> + <ccm:application name="ccm-lbc-eforms"/> + --> + + + +<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> +<!-- APLAWS+ potential ADD-ONS packages for CamdenIntranet --> +<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + +<!-- ADD-ONs Content Assets --> + <!-- + <ccm:application name="ccm-cms-assets-imagestep"/> + <ccm:application name="ccm-cms-assets-notes"/> + --> + +<!-- ADD-ONs Bundle's Content Types --> + <!-- + <ccm:application name="ccm-cms-types-bookmark"/> + <ccm:application name="ccm-cms-types-faqitem"/> + <ccm:application name="ccm-cms-types-glossaryitem"/> + <ccm:application name="ccm-cms-types-image"/> + <ccm:application name="ccm-cms-types-organization"/> + <ccm:application name="ccm-cms-types-simpleaddress"/> + --> + + +<!-- ADD-ONs Bundle's Applications --> + <!-- + <ccm:application name="ccm-auth-http"/> + <ccm:application name="ccm-bookmarks"/> + <ccm:application name="ccm-docrepo"/> + <ccm:application name="ccm-faq"/> + <ccm:application name="ccm-forum-categorised"/> + --> + <!-- currently doesn't work for unknown reason + <ccm:application name="ccm-simplesurvey"/> --> + + +<!-- ADD-ONs Bundle's LDN extensions --> + <!-- + <ccm:application name="ccm-ldn-exporter"/> + <ccm:application name="ccm-ldn-freeform"/> + --> + <!-- Without known funcionality --> + <!-- <ccm:application name="ccm-ldn-userpreferences"/> --> + + + </ccm:build> +</ccm:project> Copied: contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/web-1-0-4.xml (from rev 2439, contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/web.xml) =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/web-1-0-4.xml (rev 0) +++ contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/web-1-0-4.xml 2012-12-26 01:18:05 UTC (rev 2443) @@ -0,0 +1,337 @@ +<!DOCTYPE web-app + PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd"> + +<web-app> + + <filter> + <filter-name>secured</filter-name> + <filter-class>com.arsdigita.web.SecureFilter</filter-class> + </filter> + + <filter> + <filter-name>profiler</filter-name> + <filter-class>com.arsdigita.profiler.ProfilerFilter</filter-class> + </filter> + + <filter> + <filter-name>shortcuts</filter-name> + <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class> + </filter> + + <filter> + <filter-name>subsite</filter-name> + <filter-class>com.arsdigita.london.subsite.SubsiteFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>secured</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <filter-mapping> + <filter-name>profiler</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <filter-mapping> + <filter-name>subsite</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <filter-mapping> + <filter-name>shortcuts</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <servlet> + <servlet-name>reg</servlet-name> + <servlet-class>com.arsdigita.web.ContextRegistrationServlet</servlet-class> + <init-param> + <param-name>uri</param-name> + <param-value>/</param-value> + </init-param> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet> + <servlet-name>legacy-dispatcher</servlet-name> + <servlet-class>com.arsdigita.sitenode.SiteNodeDispatcher</servlet-class> + <load-on-startup>3</load-on-startup> + </servlet> + + <servlet> + <servlet-name>ccm-dispatcher</servlet-name> + <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class> + <init-param> + <param-name>fallback-servlet</param-name> + <param-value>legacy-dispatcher</param-value> + </init-param> + <load-on-startup>2</load-on-startup> + </servlet> + + <servlet> + <servlet-name>legacy-adapter</servlet-name> + <servlet-class>com.arsdigita.web.LegacyAdapterServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>cache-manager</servlet-name> + <servlet-class>com.arsdigita.caching.CacheServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>db-test</servlet-name> + <servlet-class>com.arsdigita.web.monitoring.DBTestServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>versioning-log</servlet-name> + <servlet-class>com.arsdigita.versioning.VersioningServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>oid-redirect</servlet-name> + <servlet-class>com.arsdigita.web.OIDRedirectServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>resource-resolver</servlet-name> + <servlet-class>com.arsdigita.web.ResourceServlet</servlet-class> + </servlet> + + <!-- ADDITIONAL SERVLET DECLARATIONS --> + + <servlet> + <servlet-name>content-section</servlet-name> + <servlet-class>com.arsdigita.cms.ContentSectionServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>content-type-xsl</servlet-name> + <servlet-class>com.arsdigita.cms.dispatcher.ContentTypeXSLServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>content-item-xsl</servlet-name> + <servlet-class>com.arsdigita.cms.dispatcher.ContentItemXSLServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>template-xsl</servlet-name> + <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>TextOnlyServlet</servlet-name> + <display-name>Text Only Servlet</display-name> + <servlet-class> + com.arsdigita.web.InternalPrefixerServlet + </servlet-class> + <init-param> + <param-name>prefix</param-name> + <param-value>/text</param-value> + </init-param> + </servlet> + + <servlet> + <servlet-name>PrintFriendlyServlet</servlet-name> + <display-name>Printer Friendly Output Servlet</display-name> + <servlet-class> + com.arsdigita.web.InternalPrefixerServlet + </servlet-class> + <init-param> + <param-name>prefix</param-name> + <param-value>/print</param-value> + </init-param> + </servlet> + + <servlet> + <servlet-name>ThemePreviewServlet</servlet-name> + <display-name>Servlet to allow admins to preview look/feel</display-name> + <servlet-class> + com.arsdigita.london.theme.dispatcher.InternalThemePrefixerServlet + </servlet-class> + <init-param> + <param-name>prefix</param-name> + <param-value>/theme</param-value> + </init-param> + </servlet> + +<!-- XXX hack --> + + <servlet> + <servlet-name>portal-files</servlet-name> + <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class> + <init-param> + <param-name>template-path</param-name> + <param-value>/templates/ccm-ldn-portal</param-value> + </init-param> + </servlet> + + <servlet> + <servlet-name>navigation-files</servlet-name> + <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class> + <init-param> + <param-name>template-path</param-name> + <param-value>/templates/ccm-ldn-navigation</param-value> + </init-param> + <init-param> + <param-name>file-resolver</param-name> + <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value> + </init-param> + </servlet> + + <servlet> + <servlet-name>portlet-type-xsl</servlet-name> + <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>portlet-type-xsl</servlet-name> + <url-pattern>/__ccm__/servlet/portlet-type/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>reg</servlet-name> + <url-pattern>/__ccm__/null/reg/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>portal-files</servlet-name> + <url-pattern>/ccm-ldn-portal/files/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>navigation-files</servlet-name> + <url-pattern>/ccm-ldn-navigation/files/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>ThemePreviewServlet</servlet-name> + <url-pattern>/theme/*</url-pattern> + </servlet-mapping> + + <!-- /ADDITIONAL SERVLET DECLARATIONS --> + + <servlet-mapping> + <servlet-name>ccm-dispatcher</servlet-name> + <url-pattern>/ccm/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>legacy-adapter</servlet-name> + <url-pattern>/__ccm__/servlet/legacy-adapter/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>cache-manager</servlet-name> + <url-pattern>/expireCache/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>db-test</servlet-name> + <url-pattern>/dbtest</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>versioning-log</servlet-name> + <url-pattern>/versioning/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>oid-redirect</servlet-name> + <url-pattern>/redirect/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>resource-resolver</servlet-name> + <url-pattern>/resource/*</url-pattern> + </servlet-mapping> + + <!-- ADDITIONAL SERVLET MAPPINGS --> + + <servlet-mapping> + <servlet-name>content-section</servlet-name> + <url-pattern>/__ccm__/servlet/content-section/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>content-type-xsl</servlet-name> + <url-pattern>/__ccm__/servlet/content-type/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>content-item-xsl</servlet-name> + <url-pattern>/__ccm__/servlet/content-item/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>template-xsl</servlet-name> + <url-pattern>/__ccm__/servlet/template/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>TextOnlyServlet</servlet-name> + <url-pattern>/text/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>PrintFriendlyServlet</servlet-name> + <url-pattern>/print/*</url-pattern> + </servlet-mapping> + + <!-- /ADDITIONAL SERVLET MAPPINGS --> + + <error-page> + <exception-type>com.arsdigita.dispatcher.AccessDeniedException</exception-type> + <location>/error/access-denied.jsp</location> + </error-page> + + <error-page> + <exception-type>com.arsdigita.dispatcher.ObjectNotFoundException</exception-type> + <location>/error/object-not-found.jsp</location> + </error-page> + + <error-page> + <exception-type>com.arsdigita.kernel.permissions.PermissionException</exception-type> + <location>/error/permission-denied.jsp</location> + </error-page> + + <error-page> + <exception-type>com.arsdigita.persistence.DbNotAvailableException</exception-type> + <location>/error/db-not-available.jsp</location> + </error-page> + + <error-page> + <exception-type>com.arsdigita.db.DbNotAvailableException</exception-type> + <location>/error/db-not-available.jsp</location> + </error-page> + + <error-page> + <exception-type>java.lang.Exception</exception-type> + <location>/error/general.jsp</location> + </error-page> + + <error-page> + <error-code>404</error-code> + <location>/error/404.jsp</location> + </error-page> + + <error-page> + <error-code>500</error-code> + <location>/error/500.jsp</location> + </error-page> + + <!-- TAGLIBS --> + <taglib> + <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri> + <taglib-location>/WEB-INF/bebop-show.tld</taglib-location> + </taglib> + + <taglib> + <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri> + <taglib-location>/WEB-INF/bebop-define.tld</taglib-location> + </taglib> + +</web-app> Deleted: contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/web.xml =================================================================== --- contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/web.xml 2012-12-22 14:13:36 UTC (rev 2442) +++ contrib/camden/ccm-lbc-aplaws/bundles/intranet/cfg/web.xml 2012-12-26 01:18:05 UTC (rev 2443) @@ -1,337 +0,0 @@ -<!DOCTYPE web-app - PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" - "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd"> - -<web-app> - - <filter> - <filter-name>secured</filter-name> - <filter-class>com.arsdigita.web.SecureFilter</filter-class> - </filter> - - <filter> - <filter-name>profiler</filter-name> - <filter-class>com.arsdigita.profiler.ProfilerFilter</filter-class> - </filter> - - <filter> - <filter-name>shortcuts</filter-name> - <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class> - </filter> - - <filter> - <filter-name>subsite</filter-name> - <filter-class>com.arsdigita.london.subsite.SubsiteFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>secured</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <filter-mapping> - <filter-name>profiler</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <filter-mapping> - <filter-name>subsite</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <filter-mapping> - <filter-name>shortcuts</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <servlet> - <servlet-name>reg</servlet-name> - <servlet-class>com.arsdigita.web.ContextRegistrationServlet</servlet-class> - <init-param> - <param-name>uri</param-name> - <param-value>/</param-value> - </init-param> - <load-on-startup>1</load-on-startup> - </servlet> - - <servlet> - <servlet-name>legacy-dispatcher</servlet-name> - <servlet-class>com.arsdigita.sitenode.SiteNodeDispatcher</servlet-class> - <load-on-startup>3</load-on-startup> - </servlet> - - <servlet> - <servlet-name>ccm-dispatcher</servlet-name> - <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class> - <init-param> - <param-name>fallback-servlet</param-name> - <param-value>legacy-dispatcher</param-value> - </init-param> - <load-on-startup>2</load-on-startup> - </servlet> - - <servlet> - <servlet-name>legacy-adapter</servlet-name> - <servlet-class>com.arsdigita.web.LegacyAdapterServlet</servlet-class> - </servlet> - - <servlet> - <servlet-name>cache-manager</servlet-name> - <servlet-class>com.arsdigita.caching.CacheServlet</servlet-class> - </servlet> - - <servlet> - <servlet-name>db-test</servlet-name> - <servlet-class>com.arsdigita.web.monitoring.DBTestServlet</servlet-class> - </servlet> - - <servlet> - <servlet-name>versioning-log</servlet-name> - <servlet-class>com.arsdigita.versioning.VersioningServlet</servlet-class> - </servlet> - - <servlet> - <servlet-name>oid-redirect</servlet-name> - <servlet-class>com.arsdigita.web.OIDRedirectServlet</servlet-class> - </servlet> - - <servlet> - <servlet-name>resource-resolver</servlet-name> - <servlet-class>com.arsdigita.web.ResourceServlet</servlet-class> - </servlet> - - <!-- ADDITIONAL SERVLET DECLARATIONS --> - - <servlet> - <servlet-name>content-section</servlet-name> - <servlet-class>com.arsdigita.cms.ContentSectionServlet</servlet-class> - </servlet> - - <servlet> - <servlet-name>content-type-xsl</servlet-name> - <servlet-class>com.arsdigita.cms.dispatcher.ContentTypeXSLServlet</servlet-class> - </servlet> - - <servlet> - <servlet-name>content-item-xsl</servlet-name> - <servlet-class>com.arsdigita.cms.dispatcher.ContentItemXSLServlet</servlet-class> - </servlet> - - <servlet> - <servlet-name>template-xsl</servlet-name> - <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class> - </servlet> - - <servlet> - <servlet-name>TextOnlyServlet</servlet-name> - <display-name>Text Only Servlet</display-name> - <servlet-class> - com.arsdigita.web.InternalPrefixerServlet - </servlet-class> - <init-param> - <param-name>prefix</param-name> - <param-value>/text</param-value> - </init-param> - </servlet> - - <servlet> - <servlet-name>PrintFriendlyServlet</servlet-name> - <display-name>Printer Friendly Output Servlet</display-name> - <servlet-class> - com.arsdigita.web.InternalPrefixerServlet - </servlet-class> - <init-param> - <param-name>prefix</param-name> - <param-value>/print</param-value> - </init-param> - </servlet> - - <servlet> - <servlet-name>ThemePreviewServlet</servlet-name> - <display-name>Servlet to allow admins to preview look/feel</display-name> - <servlet-class> - com.arsdigita.london.theme.dispatcher.InternalThemePrefixerServlet - </servlet-class> - <init-param> - <param-name>prefix</param-name> - <param-value>/theme</param-value> - </init-param> - </servlet> - -<!-- XXX hack --> - - <servlet> - <servlet-name>portal-files</servlet-name> - <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class> - <init-param> - <param-name>template-path</param-name> - <param-value>/templates/ccm-ldn-portal</param-value> - </init-param> - </servlet> - - <servlet> - <servlet-name>navigation-files</servlet-name> - <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class> - <init-param> - <param-name>template-path</param-name> - <param-value>/templates/ccm-ldn-navigation</param-value> - </init-param> - <init-param> - <param-name>file-resolver</param-name> - <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value> - </init-param> - </servlet> - - <servlet> - <servlet-name>portlet-type-xsl</servlet-name> - <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>portlet-type-xsl</servlet-name> - <url-pattern>/__ccm__/servlet/portlet-type/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>reg</servlet-name> - <url-pattern>/__ccm__/null/reg/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>portal-files</servlet-name> - <url-pattern>/ccm-ldn-portal/files/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>navigation-files</servlet-name> - <url-pattern>/ccm-ldn-navigation/files/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>ThemePreviewServlet</servlet-name> - <url-pattern>/theme/*</url-pattern> - </servlet-mapping> - - <!-- /ADDITIONAL SERVLET DECLARATIONS --> - - <servlet-mapping> - <servlet-name>ccm-dispatcher</servlet-name> - <url-pattern>/ccm/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>legacy-adapter</servlet-name> - <url-pattern>/__ccm__/servlet/legacy-adapter/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>cache-manager</servlet-name> - <url-pattern>/expireCache/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>db-test</servlet-name> - <url-pattern>/dbtest</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>versioning-log</servlet-name> - <url-pattern>/versioning/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>oid-redirect</servlet-name> - <url-pattern>/redirect/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>resource-resolver</servlet-name> - <url-pattern>/resource/*</url-pattern> - </servlet-mapping> - - <!-- ADDITIONAL SERVLET MAPPINGS --> - - <servlet-mapping> - <servlet-name>content-section</servlet-name> - <url-pattern>/__ccm__/servlet/content-section/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>content-type-xsl</servlet-name> - <url-pattern>/__ccm__/servlet/content-type/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>content-item-xsl</servlet-name> - <url-pattern>/__ccm__/servlet/content-item/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>template-xsl</servlet-name> - <url-pattern>/__ccm__/servlet/template/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>TextOnlyServlet</servlet-name> - <url-pattern>/text/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>PrintFriendlyServlet</servlet-name> - <url-pattern>/print/*</url-pattern> - </servlet-mapping> - - <!-- /ADDITIONAL SERVLET MAPPINGS --> - - <error-page> - <exception-type>com.arsdigita.dispatcher.AccessDeniedException</exception-type> - <location>/error/access-denied.jsp</location> - </error-page> - - <error-page> - <exception-type>com.arsdigita.dispatcher.ObjectNotFoundException</exception-type> - <location>/error/object-not-found.jsp</location> - </error-page> - - <error-page> - <exception-type>com.arsdigita.kernel.permissions.PermissionException</exception-type> - <location>/error/permission-denied.jsp</location> - </error-page> - - <error-page> - <exception-type>com.arsdigita.persistence.DbNotAvailableException</exception-type> - <location>/error/db-not-available.jsp</location> - </error-page> - - <error-page> - <exception-type>com.arsdigita.db.DbNotAvailableException</exception-type> - <location>/error/db-not-available.jsp</location> - </error-page> - - <error-page> - <exception-type>java.lang.Exception</exception-type> - <location>/error/general.jsp</location> - </error-page> - - <error-page> - <error-code>404</error-code> - <location>/error/404.... [truncated message content] |
