diff --git a/ccm-ldn-aplaws/application.xml b/ccm-ldn-aplaws/application.xml index 2094b9a89..9229be217 100755 --- a/ccm-ldn-aplaws/application.xml +++ b/ccm-ldn-aplaws/application.xml @@ -3,18 +3,19 @@ + + + + - - - diff --git a/ccm-ldn-aplaws/bundles/devel/ChangeLog b/ccm-ldn-aplaws/bundles/devel/ChangeLog index 786623bdb..83d370761 100755 --- a/ccm-ldn-aplaws/bundles/devel/ChangeLog +++ b/ccm-ldn-aplaws/bundles/devel/ChangeLog @@ -1,3 +1,6 @@ +* Mo March 26 29012 Peter Boy +- Modified to new deployment structure ov version 2.0.0 + * Thu Sep 22 2005 Alan Pevec - Build all APLAWS+ bundles from the common set of templates. diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties b/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties index ddb6de1aa..5bab6337c 100755 --- a/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties +++ b/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties @@ -4,11 +4,11 @@ waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage # ; dhtml editor to use (system wide) ; Xinha is default -; waf.bebop.dhtml_editor=Xinha +; default: Xinha editor & src=/assets/xinha/XinhaLoader.js +; To use FCKeditor configure: ; waf.bebop.dhtml_editor=FCKeditor waf.categorization.show_internal_name=true -waf.categorization.supported_languages=de,en waf.dispatcher.default_expiry=3600 ; @@ -17,22 +17,18 @@ waf.kernel.primary_user_identifier=email ; if you activate screen_name, forum loader doesn't work. ; waf.kernel.primary_user_identifier=screen_name waf.kernel.supported_languages=de,en +waf.kernel.language_independent_items=true ; security.properties: waf.auto_registration_on=false -# MOVED to ui.Config -#waf.pagemap.root=portal/ -#waf.pagemap.workspace=portal/ -#waf.pagemap.login_redirect=content/content-center-redirect.jsp - ; Searches for localized style sheet (among others) waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-stylesheet-paths.txt core.ui.pagemap.root_page_url=portal/ core.ui.pagemap.workspace_url=portal/ -core.ui.pagemap.user_redirect_url=content/content-center-redirect.jsp +core.ui.pagemap.user_redirect_url=content-center/redirect.jsp ; workflow configuration waf.workflow.simple.alerts_enabled=true @@ -51,24 +47,17 @@ com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatcher.SubsiteItemTemplateResolver ; Configure dhtml editor for use in cms content-center -; Xinha is default and should work out of the box -;com.arsdigita.cms.dhtml_editor_config=Xinha.Config,/assets/xinha/XinhaConfig.js -; as a temporary measure a different configuration file which includes a link selection box for CCM items -; and CCM images should be specified: -com.arsdigita.cms.dhtml_editor_config=Xinha.Config,/assets/xinha/CCMcmsXinhaConfig.js +; Xinha is default and does work out of the box +; A CCM specific configuration file is used to prevent a mess with the standard +; configuration, default is: +; com.arsdigita.cms.dhtml_editor_config=Xinha.Config,/assets/xinha/CCMcmsXinhaConfig.js ; to use FCKeditor: ; com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js -; com.arsdigita.cms.dhtml_editor_config=Xinha.Config,/assets/xinha/XinhaConfig.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 @@ -99,17 +88,6 @@ com.arsdigita.cms.contenttypes.newsitem.start_year=2000 com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5 -# ?? Where are these used? -com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp - -com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp - - -# auth-http application -auth.http.admin_email=webmaster@aplaws.org -auth.http.admin_identifier=webmaster - - # Forum application com.arsdigita.forum.show_new_tabs=true com.arsdigita.forum.use_wysiwyg_editor=true @@ -127,7 +105,7 @@ 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 # ccm-ldn-search application @@ -136,17 +114,27 @@ com.arsdigita.london.search.show_sponsored_links=true com.arsdigita.london.search.num_threads=0 -# ccm-ldn-subsite application -com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker +# ccm-subsite application +com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker # ccm-themedirector application +themedirector.default_theme_context= +# themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf themedirector.default_theme_path=themes/static/aplaws +# ccm-auth-http application +auth.http.admin_email=webmaster@aplaws.org +auth.http.admin_identifier=webmaster + com.arsdigita.london.cms.dublin.audience_domain=LGAL -; ============================================================================================= -; runtime specific configurations +# 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,7 +143,7 @@ waf.admin.password=123456 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\=ccm42web waf.runtime.jdbc_pool_size=60 waf.web.server=localhost\:8080 @@ -163,6 +151,7 @@ waf.web.server=localhost\:8080 # ============================================================================================= # devel specific configurations -#com.arsdigita.aplaws.lite_load=true -#waf.debug=true -#waf.bebop.fancy_xsl_errors=true +com.arsdigita.aplaws.lite_load=true +waf.debug=true +waf.bebop.fancy_xsl_errors=true + diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/project.xml b/ccm-ldn-aplaws/bundles/devel/cfg/project.xml index 72c5f49c8..ac278f165 100755 --- a/ccm-ldn-aplaws/bundles/devel/cfg/project.xml +++ b/ccm-ldn-aplaws/bundles/devel/cfg/project.xml @@ -10,9 +10,9 @@ ccmVersion="6.1" name="aplaws" prettyName="APLAWS plus (devel)" - version="1-1-5" + version="2-0-0" release="devel" - webxml="web.xml-aplaws" + webxml="web.xml" webapp="ROOT" xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd"> @@ -24,88 +24,146 @@ - - + + + + + + - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/web.xml b/ccm-ldn-aplaws/bundles/devel/cfg/web.xml index 524915959..721c3f6d2 100755 --- a/ccm-ldn-aplaws/bundles/devel/cfg/web.xml +++ b/ccm-ldn-aplaws/bundles/devel/cfg/web.xml @@ -124,8 +124,8 @@ - webdevsupport - com.arsdigita.webdevsupport.WebDevSupportServlet + login + com.arsdigita.ui.login.LoginServlet @@ -143,6 +143,11 @@ com.arsdigita.ui.permissions.PermissionsServlet + + webdevsupport + com.arsdigita.webdevsupport.WebDevSupportServlet + + oid-redirect com.arsdigita.web.OIDRedirectServlet @@ -481,8 +486,8 @@ - webdevsupport - /webdevsupport/* + login + /login/* @@ -500,6 +505,11 @@ /admin-permissions/* + + webdevsupport + /webdevsupport/* + + oid-redirect /redirect/* diff --git a/ccm-ldn-aplaws/bundles/devel/res/bundle/categories/placeholder.info b/ccm-ldn-aplaws/bundles/devel/res/bundle/categories/placeholder.info new file mode 100644 index 000000000..5ae76207c --- /dev/null +++ b/ccm-ldn-aplaws/bundles/devel/res/bundle/categories/placeholder.info @@ -0,0 +1,3 @@ +Subdirectory may optionally contain one or more local site specific +import xml files for Terms domain categories. + diff --git a/ccm-ldn-aplaws/bundles/devel/res/bundle/categories/sci-nav-domain-1.00.xml b/ccm-ldn-aplaws/bundles/devel/res/bundle/categories/sci-nav-domain-1.00.xml new file mode 100644 index 000000000..31486e212 --- /dev/null +++ b/ccm-ldn-aplaws/bundles/devel/res/bundle/categories/sci-nav-domain-1.00.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ccm-ldn-aplaws/bundles/devel/res/bundle/categories/sci-nav-hierarchy-1.00.xml b/ccm-ldn-aplaws/bundles/devel/res/bundle/categories/sci-nav-hierarchy-1.00.xml new file mode 100644 index 000000000..cfce50400 --- /dev/null +++ b/ccm-ldn-aplaws/bundles/devel/res/bundle/categories/sci-nav-hierarchy-1.00.xml @@ -0,0 +1,229 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ccm-ldn-aplaws/bundles/devel/res/bundle/categories/xample-nav-domain.xml b/ccm-ldn-aplaws/bundles/devel/res/bundle/categories/xample-nav-domain.xml new file mode 100644 index 000000000..87ee0c8c2 --- /dev/null +++ b/ccm-ldn-aplaws/bundles/devel/res/bundle/categories/xample-nav-domain.xml @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ccm-ldn-aplaws/bundles/devel/res/bundle/categories/xample-nav-hierarchy.xml b/ccm-ldn-aplaws/bundles/devel/res/bundle/categories/xample-nav-hierarchy.xml new file mode 100644 index 000000000..ed6c7c16b --- /dev/null +++ b/ccm-ldn-aplaws/bundles/devel/res/bundle/categories/xample-nav-hierarchy.xml @@ -0,0 +1,1034 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ccm-ldn-aplaws/bundles/devel/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml b/ccm-ldn-aplaws/bundles/devel/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml new file mode 100644 index 000000000..b983bd2d7 --- /dev/null +++ b/ccm-ldn-aplaws/bundles/devel/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ccm-ldn-aplaws/bundles/devel/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl b/ccm-ldn-aplaws/bundles/devel/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl new file mode 100644 index 000000000..34b25d21e --- /dev/null +++ b/ccm-ldn-aplaws/bundles/devel/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ccm-ldn-aplaws/bundles/devel/res/bundle/navigation/sci-templates.txt b/ccm-ldn-aplaws/bundles/devel/res/bundle/navigation/sci-templates.txt new file mode 100755 index 000000000..80d8612e5 --- /dev/null +++ b/ccm-ldn-aplaws/bundles/devel/res/bundle/navigation/sci-templates.txt @@ -0,0 +1,9 @@ +ScientificCMS Default Items Page,Sci Default Navigation Index Page ordering items in ascending order,/templates/ccm-ldn-navigation/navigation/sci-default.jsp +ScientificCMS Recent Items Page,Sci List of items ordered with most recent first,/templates/ccm-ldn-navigation/navigation/sci-recent.jsp +ScientificCMS A-Z Items,Sci List of items paginated as A-Z,/templates/ccm-ldn-navigation/navigation/sci-atoz.jsp +ScientificCMS Events Page,Sci Events Page ordering events in ??? order,/templates/ccm-ldn-navigation/navigation/sci-events.jsp +ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-ldn-navigation/navigation/sci-portal.jsp +ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-ldn-navigation/navigation/sci-portal-welcome.jsp +ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-ldn-navigation/navigation/sci-welcome.jsp +ScientificCMS Specializing Items List,Sci Specialising List item page,/templates/ccm-ldn-navigation/navigation/SpecializingList.jsp +ScientificCMS Publications List,Sci publications listing page,/templates/ccm-ldn-navigation/navigation/SciPublicationList.jsp diff --git a/ccm-ldn-aplaws/bundles/devel/res/placeholder.info b/ccm-ldn-aplaws/bundles/devel/res/placeholder.info new file mode 100644 index 000000000..5ae76207c --- /dev/null +++ b/ccm-ldn-aplaws/bundles/devel/res/placeholder.info @@ -0,0 +1,3 @@ +Subdirectory may optionally contain one or more local site specific +import xml files for Terms domain categories. + diff --git a/ccm-ldn-aplaws/bundles/devel/templates/placeholder.info b/ccm-ldn-aplaws/bundles/devel/templates/placeholder.info new file mode 100644 index 000000000..25d83c34e --- /dev/null +++ b/ccm-ldn-aplaws/bundles/devel/templates/placeholder.info @@ -0,0 +1,12 @@ +Subdirectory may optionally contain navigation item templates for +navigation index pages which either overwrite or ammend those templates +which are default for ccm-ldn-aplaws and stored in + /web/templates/ccm-navigation/navigation + +Templates of the same name in this subdirectory just overwrite the +default files. Templates of different names are stored in addition +to the default template files. In the later case a developer must +provide a customised template.txt file replacing the default file + /src/WEB-INF/navigation/templates.txt +This file must be specified in parameter + com.arsdigita.navigation.templates_file \ No newline at end of file diff --git a/ccm-ldn-aplaws/bundles/devel/themes/master/dummy b/ccm-ldn-aplaws/bundles/devel/themes/master/dummy new file mode 100644 index 000000000..29e760753 --- /dev/null +++ b/ccm-ldn-aplaws/bundles/devel/themes/master/dummy @@ -0,0 +1,4 @@ +Just a dummy file as a placeholder. This directory may contain theme files +which are used by themedirector for download a base theme to be further +customized by a site designer. If it should be used this way, ccm-themedirector +must be configured appropriately \ No newline at end of file diff --git a/ccm-ldn-aplaws/bundles/devel/themes/placeholder.info b/ccm-ldn-aplaws/bundles/devel/themes/placeholder.info new file mode 100644 index 000000000..dbae76348 --- /dev/null +++ b/ccm-ldn-aplaws/bundles/devel/themes/placeholder.info @@ -0,0 +1,13 @@ +Bundle subdir themes + +Purpose: +This subdir may optionally contain theme files which either replace part of the +theme or add files to the theme provided as default for APLAWS+ and this +way adopt the theme for site specific design. + +All files and subdirectories all copied asis to the applications ~/themes +directory in its document (context) root. + +It is the responsibility of developer / system integrator to ensure all files +are copied to the right location and the theme works with the modification. No +functionality or consistency check is perfordmed! \ No newline at end of file diff --git a/ccm-ldn-aplaws/src/ccm-ldn-aplaws.load b/ccm-ldn-aplaws/src/ccm-ldn-aplaws.load index 34ea2c55a..c77538d36 100755 --- a/ccm-ldn-aplaws/src/ccm-ldn-aplaws.load +++ b/ccm-ldn-aplaws/src/ccm-ldn-aplaws.load @@ -5,10 +5,10 @@ - + + - diff --git a/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws b/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws index 575317dd7..721c3f6d2 100755 --- a/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws +++ b/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws @@ -17,32 +17,29 @@ - shortcuts - com.arsdigita.london.shortcuts.ShortcutFilter + com.arsdigita.shortcuts.ShortcutFilter subsite - com.arsdigita.london.subsite.SubsiteFilter + com.arsdigita.subsite.SubsiteFilter - + + content-center + com.arsdigita.cms.WorkspaceServlet + + content-section com.arsdigita.cms.ContentSectionServlet + + cms-service + com.arsdigita.cms.ServiceServlet + + content-type-xsl com.arsdigita.cms.dispatcher.ContentTypeXSLServlet @@ -161,7 +193,6 @@ com.arsdigita.cms.dispatcher.TemplateXSLServlet - TextOnlyServlet Text Only Servlet @@ -235,28 +266,22 @@ com.arsdigita.dispatcher.PortletTypeXSLServlet - + - rss-files + rssfeed-files com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-ldn-rss + /templates/ccm-rssfeed file-resolver - com.arsdigita.london.rss.RSSFileResolver + com.arsdigita.rssfeed.RSSFileResolver - + - - worker - com.arsdigita.london.search.SearchWorkerServlet - 4 - - search-files com.arsdigita.web.ApplicationFileServlet @@ -275,26 +300,26 @@ - + shortcuts-files com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-ldn-shortcuts + /templates/ccm-shortcuts - + subsite-files com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-ldn-subsite + /templates/ccm-subsite - + @@ -307,33 +332,33 @@ - + theme-files com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-ldn-theme + /templates/ccm-themedirector ThemeDownload - com.arsdigita.london.theme.dispatcher.ThemeDownloadServlet + com.arsdigita.themedirector.dispatcher.ThemeDownloadServlet ThemePreviewServlet Servlet to allow admins to preview look/feel - com.arsdigita.london.theme.dispatcher.InternalThemePrefixerServlet + com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet prefix /theme - + + - rss-files - /ccm-ldn-rss/files/* + rssfeed-files + /ccm-rssfeed/files/* + @@ -386,18 +412,18 @@ - + shortcuts-files - /ccm-ldn-shortcuts/files/* + /ccm-shortcuts/files/* - + subsite-files - /ccm-ldn-subsite/files/* + /ccm-subsite/files/* - + @@ -406,7 +432,7 @@ - + theme-files /theme-files/* @@ -421,7 +447,7 @@ ThemePreviewServlet /theme/* - + + + content-center + /templates/servlet/content-center/* + + content-section - /themes/servlet/content-section/* + /templates/servlet/content-section/* + + + + cms-service + /templates/servlet/cms-service/* content-item-xsl - /themes/servlet/content-item/* + /templates/servlet/content-item/* @@ -504,7 +565,6 @@ /print/* - diff --git a/ccm-ldn-aplaws/web/packages/navigation/templates/SpecializingList.jsp b/ccm-ldn-aplaws/web/packages/navigation/templates/SpecializingList.jsp deleted file mode 100644 index 31fd0f20e..000000000 --- a/ccm-ldn-aplaws/web/packages/navigation/templates/SpecializingList.jsp +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - long age = Navigation.getConfig().getIndexPageCacheLifetime(); - if (age == 0) { - DispatcherHelper.cacheDisable(response); - } else { - DispatcherHelper.cacheForWorld(response, (int)age); - } - - - - - - - - - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setDefinition(new CMSDataCollectionDefinition()); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setRenderer(new CMSDataCollectionRenderer()); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage"); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey"); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(20); - ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setSpecializeObjects(true); - - - - - - \ No newline at end of file diff --git a/ccm-ldn-aplaws/web/packages/navigation/templates/aplaws-legacy.jsp b/ccm-ldn-aplaws/web/packages/navigation/templates/aplaws-legacy.jsp deleted file mode 100755 index 5c71db6f0..000000000 --- a/ccm-ldn-aplaws/web/packages/navigation/templates/aplaws-legacy.jsp +++ /dev/null @@ -1,75 +0,0 @@ - - - - - -DispatcherHelper.cacheForWorld( response ); - - - - - - ((CategoryNav) categoryNav).setUseItemID(false); - - - - - - ((CategoryItemNav) categoryItemNav).setUseItemID(false); - - - - - - - - - ItemList fixedPromo = (ItemList) fixedPromoComponent; - fixedPromo.setObjectType( Article.BASE_DATA_OBJECT_TYPE ); - fixedPromo.setSpecificObjectType - ( "com.arsdigita.london.cms.dublin.types.FixedPromo" ); - fixedPromo.addAttribute( "title" ); - fixedPromo.addAttribute( "lead" ); - fixedPromo.setHowMany( 2 ); - - - - - - ItemList dynamicPromo = (ItemList) dynamicPromoComponent; - dynamicPromo.setObjectType( Article.BASE_DATA_OBJECT_TYPE ); - dynamicPromo.addAttribute( "name" ); - dynamicPromo.addAttribute( "title" ); - dynamicPromo.addAttribute( "lead" ); - dynamicPromo.addExcludedType - ( "com.arsdigita.london.cms.dublin.types.FixedPromo" ); - dynamicPromo.setHowMany( 3 ); - - - - - - - - - - - - - - diff --git a/ccm-ldn-aplaws/web/packages/navigation/templates/aplaws-portal.jsp b/ccm-ldn-aplaws/web/packages/navigation/templates/aplaws-portal.jsp deleted file mode 100755 index 5c2222697..000000000 --- a/ccm-ldn-aplaws/web/packages/navigation/templates/aplaws-portal.jsp +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - long age = Navigation.getConfig().getIndexPageCacheLifetime(); - if (age == 0) { - DispatcherHelper.cacheDisable(response); - } else { - DispatcherHelper.cacheForWorld(response, (int)age); - } - - - - - - - - - ((com.arsdigita.portalworkspace.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel()); - - - - - diff --git a/ccm-ldn-aplaws/web/packages/navigation/templates/aplaws-services.jsp b/ccm-ldn-aplaws/web/packages/navigation/templates/aplaws-services.jsp deleted file mode 100755 index 253d93f84..000000000 --- a/ccm-ldn-aplaws/web/packages/navigation/templates/aplaws-services.jsp +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - long age = Navigation.getConfig().getIndexPageCacheLifetime(); - if (age == 0) { - DispatcherHelper.cacheDisable(response); - } else { - DispatcherHelper.cacheForWorld(response, (int)age); - } - - - - - - - - - - - ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).setDefinition(new CMSDataCollectionDefinition()); - ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).setRenderer(new CMSDataCollectionRenderer()); - ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage"); - - ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setDescendCategories(false); - - ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().setPageSize(30); - ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute("objectType"); - ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "title"); - - - - - diff --git a/ccm-ldn-aplaws/web/packages/content-section/www/admin/auto-cat.jsp b/ccm-ldn-aplaws/web/templates/ccm-cms/content-section/admin/auto-cat.jsp old mode 100755 new mode 100644 similarity index 100% rename from ccm-ldn-aplaws/web/packages/content-section/www/admin/auto-cat.jsp rename to ccm-ldn-aplaws/web/templates/ccm-cms/content-section/admin/auto-cat.jsp diff --git a/ccm-ldn-aplaws/web/packages/content-section/www/admin/load-cat.jsp b/ccm-ldn-aplaws/web/templates/ccm-cms/content-section/admin/load-cat.jsp old mode 100755 new mode 100644 similarity index 100% rename from ccm-ldn-aplaws/web/packages/content-section/www/admin/load-cat.jsp rename to ccm-ldn-aplaws/web/templates/ccm-cms/content-section/admin/load-cat.jsp diff --git a/ccm-ldn-aplaws/web/packages/content-section/www/crash-me.jsp b/ccm-ldn-aplaws/web/templates/ccm-cms/content-section/crash-me.jsp old mode 100755 new mode 100644 similarity index 100% rename from ccm-ldn-aplaws/web/packages/content-section/www/crash-me.jsp rename to ccm-ldn-aplaws/web/templates/ccm-cms/content-section/crash-me.jsp diff --git a/ccm-ldn-aplaws/web/packages/content-section/templates/default/aplaws-folder.jsp b/ccm-ldn-aplaws/web/templates/ccm-cms/content-section/default/aplaws-folder.jsp old mode 100755 new mode 100644 similarity index 100% rename from ccm-ldn-aplaws/web/packages/content-section/templates/default/aplaws-folder.jsp rename to ccm-ldn-aplaws/web/templates/ccm-cms/content-section/default/aplaws-folder.jsp diff --git a/ccm-ldn-aplaws/web/packages/content-section/templates/default/aplaws-item.jsp b/ccm-ldn-aplaws/web/templates/ccm-cms/content-section/default/aplaws-item.jsp old mode 100755 new mode 100644 similarity index 95% rename from ccm-ldn-aplaws/web/packages/content-section/templates/default/aplaws-item.jsp rename to ccm-ldn-aplaws/web/templates/ccm-cms/content-section/default/aplaws-item.jsp index 48234f432..017b1664e --- a/ccm-ldn-aplaws/web/packages/content-section/templates/default/aplaws-item.jsp +++ b/ccm-ldn-aplaws/web/templates/ccm-cms/content-section/default/aplaws-item.jsp @@ -33,7 +33,7 @@ classname="com.arsdigita.navigation.ui.RelatedItems"/> + classname="com.arsdigita.bundle.ui.AssignedItemTerms"/> diff --git a/ccm-ldn-aplaws/web/packages/content-section/www/textonly.jsp b/ccm-ldn-aplaws/web/templates/ccm-cms/content-section/textonly.jsp old mode 100755 new mode 100644 similarity index 100% rename from ccm-ldn-aplaws/web/packages/content-section/www/textonly.jsp rename to ccm-ldn-aplaws/web/templates/ccm-cms/content-section/textonly.jsp