Anpassungen an Aenderungen in navigation

git-svn-id: https://svn.libreccm.org/ccm/trunk@904 8810af33-2d31-482b-a856-94f89814c4df

ccm-gen-aplaws/CHANGE_LOG

@@ -0,0 +1,10 @@
+2011-05-12
+Adaptation in web to the relocation of default theme files (from __ccm__ to
+themes) and new names of modules ccm-ldn-portal and ccm-ldn-themes.
+
+2007-08-06:
+./ccm-shp-aplaws/src/WEB-INF/content-types/c...types/aplaws-mparticle-item.jsp
+<define:page name="itemPage" application="content  changed to
+<define:page name="itemPage" application="content-section"
+as is all other contenttyp jsp pages. Requires corresponding modification
+in the theme! 

ccm-gen-aplaws/application.xml

@@ -9,7 +9,7 @@
     <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-ldn-subsite" version="6.6.0" relation="ge"/>
-    <ccm:requires name="ccm-portalworkspace" version="6.6.0" relation="ge"/>
+    <ccm:requires name="ccm-portalworkspace" version="6.6.1" relation="ge"/>
     <ccm:requires name="ccm-ldn-terms" version="6.6.0" relation="ge"/>
     <!--  not required anymore (2007-06-09)
     <ccm:requires name="ccm-ldn-dublin" version="6.6.0" relation="ge"/>

ccm-gen-aplaws/bundles/develpb/ChangeLog

@@ -0,0 +1,9 @@
+* Thu Sep 22 2005 Alan Pevec <apevec@redhat.com>
+- Build all APLAWS+ bundles from the common set of templates.
+
+* Mon Feb 21 2005 Alan Pevec <apevec@redhat.com>
+- Requires applications.
+
+* Mon Jan 26 2004 Daniel Berrange <berrange@redhat.com>
+- Initial build.
+

ccm-gen-aplaws/bundles/develpb/bundle.in

@@ -0,0 +1,4 @@
+BUNDLE_NAME=aplaws-plus-devel
+BUNDLE_PRETTY_NAME="APLAWS+ Devel Bundle"
+VERSION=1.0.9devel
+RELEASE=1

ccm-gen-aplaws/bundles/develpb/cfg/applications.cfg

@@ -0,0 +1,84 @@
+# Generic devel application.cfg
+# Main apps
+ccm-core
+ccm-cms
+
+# Content assets
+ccm-cms-assets-fileattachment
+ccm-cms-assets-imagestep
+ccm-cms-assets-notes
+ccm-cms-assets-relatedlink
+
+# is ccm-ldn-dublin really an asset?
+## -- ccm-ldn-dublin
+
+# Content types
+# ccm-cms-types-address
+# ccm-cms-types-agenda
+ccm-cms-types-article
+ccm-cms-types-bookmark
+# ccm-cms-types-contact
+ccm-cms-types-event
+ccm-cms-types-faqitem
+ccm-cms-types-filestorageitem
+ccm-cms-types-formitem
+ccm-cms-types-formsectionitem
+ccm-cms-types-glossaryitem
+# ccm-cms-types-htmlform
+# ccm-cms-types-inlinesite
+# ccm-cms-types-job
+# ccm-cms-types-legalnotice
+ccm-cms-types-member
+# ccm-cms-types-minutes
+# ccm-cms-types-motditem
+ccm-cms-types-mparticle
+ccm-cms-types-newsitem
+# ccm-cms-types-organization
+# ccm-cms-types-person
+# ccm-cms-types-pressrelease
+# ccm-cms-types-service
+# ## Fuer OpenCCM aktivieren:
+# ccm-cms-types-siteproxy
+# ccm-cms-types-xmlfeed
+
+
+# Applications
+# ------------
+# ccm-auth-http
+# ccm-bookmarks
+ccm-docmgr
+# ccm-formbuilder-pdf
+ccm-forum
+# ccm-forum-categorised
+ccm-portalserver
+ccm-portalworkspace
+# -- ccm-simplesurvey
+ccm-themedirector
+# ccm-user-preferences
+# ccm-weblog
+# ccm-webpage
+
+# ldn extensions
+# --------------
+# -- ccm-ldn-aplaws
+# -- ccm-ldn-atoz
+# ccm-ldn-dublin
+# -- ccm-ldn-exporter
+# ccm-ldn-freeform
+# ccm-ldn-importer
+ccm-ldn-navigation
+# ccm-ldn-rss
+ccm-ldn-search
+ccm-ldn-shortcuts
+ccm-ldn-subsite
+ccm-ldn-terms
+ccm-ldn-util
+
+
+# SCI extensions
+# ccm-sci-publications
+# ccm-sci-types-organization
+
+# integration layer
+ccm-gen-aplaws
+

ccm-gen-aplaws/bundles/develpb/cfg/integration.properties

@@ -0,0 +1,163 @@
+# Generic devel bundle integration.properties
+#
+waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
+#
+; dhtml editor to use (system wide)
+; Xinha is default
+; waf.bebop.dhtml_editor=Xinha
+; waf.bebop.dhtml_editor=FCKeditor
+
+waf.categorization.show_internal_name=true
+waf.categorization.supported_languages=de,en
+
+waf.dispatcher.default_expiry=3600
+;
+waf.kernel.data_permission_check_enabled=false
+waf.kernel.primary_user_identifier=email
+; if you activate screen_name, forum loader doesn't work.
+; waf.kernel.primary_user_identifier=screen_name
+waf.kernel.supported_languages=de,en
+
+; security.properties: 
+waf.auto_registration_on=false
+
+# MOVED to ui.Config
+#waf.pagemap.root=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=navigation/
+core.ui.pagemap.workspace_url=navigation/
+core.ui.pagemap.user_redirect_url=content/content-center-redirect.jsp
+
+; workflow configuration
+waf.workflow.simple.alerts_enabled=true
+waf.workflow.simple.alerts_sender=root@localhost.localdomain
+
+; Configures the xml processing
+waf.xml.xsl_transformer=xalan
+waf.xml.activate_full_date_formatter=true
+
+# ccm-cms parameters
+
+com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
+
+com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
+com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
+com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver
+
+; Configure dhtml editor for use in cms content-center
+; Xinha is default and should work out of the box
+;com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/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=XinhaConfig,/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=XinhaConfig,/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.disable_item_pfs=true
+
+; com.arsdigita.cms.hide_admin_tabs=true
+; com.arsdigita.cms.hide_folder_index_checkbox=true
+com.arsdigita.cms.hide_launch_date=true
+; 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
+
+
+# ccm-cms-types-event parameters
+com.arsdigita.cms.contenttypes.event.hide_cost=true
+com.arsdigita.cms.contenttypes.event.hide_date_description=false
+com.arsdigita.cms.contenttypes.event.hide_event_type=true
+com.arsdigita.cms.contenttypes.event.hide_link_to_map=true
+com.arsdigita.cms.contenttypes.event.hide_main_contributor=true
+com.arsdigita.cms.contenttypes.event.use_html_date_description=false
+com.arsdigita.cms.contenttypes.event.start_year=2000
+com.arsdigita.cms.contenttypes.event.end_year_delta=5
+
+
+# ccm-cms-types-newsitem parameters
+com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true
+com.arsdigita.cms.contenttypes.newsitem.start_year=2000
+com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
+
+
+# ?? Where are these used?
+com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
+
+; com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
+
+
+# Forum application
+com.arsdigita.forum.show_new_tabs=true
+com.arsdigita.forum.use_wysiwyg_editor=true
+com.arsdigita.forum.allow_quick_finish=true
+com.arsdigita.forum.disable_page_caching=true
+
+;  atoz currently not in use
+;  com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+
+# ccm-ldn-navigation application
+; com.arsdigita.london.navigation.category_menu_show_grand_children_min=1
+; com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive
+; com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1
+; com.arsdigita.london.navigation.category_menu_show_grand_children_max=65536
+com.arsdigita.london.navigation.category_menu_show_grand_children=false
+; com.arsdigita.london.navigation.category_menu_show_nephews=false
+com.arsdigita.london.navigation.default_cat_root_path=/navigation/
+com.arsdigita.london.navigation.default_template=/packages/navigation/templates/gen-default.jsp
+
+
+
+# ccm-ldn-search application
+com.arsdigita.london.search.show_sponsored_links=true
+
+
+
+# ccm-ldn-subsite application
+com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+
+
+# ccm-themedirector application
+themedirector.default_theme_path=themes/static/aplaws-generic
+
+# com.arsdigita.london.cms.dublin.audience_domain=LGAL
+
+# =============================================================================================
+# runtime specific configurations
+
+waf.admin.email=webmaster@openccm.org
+waf.admin.name.given=aplaws 
+waf.admin.name.family=Administrator
+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_pool_size=60
+
+waf.web.server=localhost\:8080
+
+
+# =============================================================================================
+# devel specific configurations
+waf.debug=true
+waf.bebop.fancy_xsl_errors=true
+

ccm-gen-aplaws/bundles/develpb/cfg/web.xml

@@ -0,0 +1,557 @@
+<!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>
+
+  <display-name>OpenCCM</display-name> 
+  <description>Community and Content Management</description>
+
+  <!-- path and filename of the log4j user accessible config file
+       WEB-INF/conf/log4j.properties is the built-in default value -->
+  <context-param>
+    <param-name>log4j-conf-file</param-name>
+    <param-value>WEB-INF/conf/log4j.properties</param-value>
+  </context-param>
+
+
+  <!-- Require secure connection by redirect to host-port part
+       of parameter waf.web.secure_server               
+  <filter>
+    <filter-name>secured</filter-name>
+    <filter-class>com.arsdigita.web.SecureFilter</filter-class>
+  </filter>
+  -->
+  <!-- Initialize Profiler timers
+       NOT USED with standard / production                                  
+  <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>
+
+<!--    NOT USED HERE
+  <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>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     Context Listener 
+     required and used to initialize the runtime environment before any other 
+     task is performed or any servlet initialized. 
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+  <listener>
+    <listener-class>com.arsdigita.web.CCMApplicationContextListener</listener-class>
+  </listener>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     BASE SERVLET DECLARATIONS SECTION
+     basically requirred by ccm-core
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <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 SECTION 
+     basically requirred by ccm-cms
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <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>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     MODULES SERVLET DECLARATIONS SECTION
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <!-- module ccm-ldn-atoz  -  servlet definitions BEGIN
+       NOT USED with ZeS   
+  <servlet>
+    <servlet-name>atoz-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-ldn-atoz</param-value>
+    </init-param>
+  </servlet>
+       module ccm-ldn-atoz  -  servlet definitions END  -->
+
+  <!-- module ccm-forum  -  servlet declarations BEGIN  -->  
+  <servlet>
+    <servlet-name>forum-main</servlet-name>
+    <servlet-class>com.arsdigita.forum.ForumServlet</servlet-class>
+  </servlet>
+  <!-- module ccm-forum  -  servlet declarations END    -->  
+
+  <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>
+ 
+  <!-- module ccm-ldn-rss  -  servlet declaration BEGIN   -->
+  <servlet>
+    <servlet-name>rss-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-ldn-rss</param-value>
+    </init-param>
+    <init-param>
+      <param-name>file-resolver</param-name>
+      <param-value>com.arsdigita.london.rss.RSSFileResolver</param-value>
+    </init-param>
+  </servlet>
+  <!-- module ccm-ldn-rss  -  servlet declaration END   -->
+
+  <!-- module ccm-ldn-search  -  servlet declarations BEGIN   -->
+  <servlet>
+    <servlet-name>worker</servlet-name>
+    <servlet-class>com.arsdigita.london.search.SearchWorkerServlet</servlet-class>
+    <load-on-startup>4</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>search-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-ldn-search</param-value>
+    </init-param>
+  </servlet>
+
+  <servlet>
+    <servlet-name>AxisServlet</servlet-name>
+    <display-name>Apache-Axis Servlet</display-name>
+    <servlet-class>
+     org.apache.axis.transport.http.AxisServlet
+    </servlet-class>
+  </servlet>
+  <!-- module ccm-ldn-search  -  servlet declarations END  -->
+
+  <!-- module ccm-ldn-shortcuts  -  servlet definitions   -->
+  <servlet>
+    <servlet-name>shortcuts-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-ldn-shortcuts</param-value>
+    </init-param>
+  </servlet>
+
+  <!-- module ccm-ldn-subsite  -  servlet declarations BEGIN  -->
+  <servlet>
+    <servlet-name>subsite-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-ldn-subsite</param-value>
+    </init-param>
+  </servlet>
+  <!-- module ccm-ldn-subsite  -  servlet declarations END  -->
+
+  <!-- module ccm-ldn-terms  -  servlet declarations BEGIN   -->
+  <servlet>
+    <servlet-name>terms-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-ldn-terms</param-value>
+    </init-param>
+  </servlet>
+  <!-- module ccm-ldn-terms  -  servlet declarations END   -->
+
+  <!-- module ccm-themedirector  -  servlet declarations BEGIN   -->
+  <servlet>
+    <servlet-name>theme-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-themedirector</param-value>
+    </init-param>
+  </servlet>
+
+  <servlet>
+     <servlet-name>ThemeDownload</servlet-name>
+     <servlet-class>com.arsdigita.themedirector.dispatcher.ThemeDownloadServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>ThemePreviewServlet</servlet-name>
+     <display-name>Servlet to allow admins to preview look/feel</display-name>
+    <servlet-class>
+     com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet
+    </servlet-class>
+    <init-param>
+      <param-name>prefix</param-name>
+      <param-value>/theme</param-value>
+    </init-param>
+  </servlet>
+  <!-- module ccm-themedirector  -  servlet declarations END   -->
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     MODULES SERVLET MAPPINGS SECTION
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <!-- module ccm-ldn-atoz  -  servlet mappings BEGIN  
+       NOT USED HERE
+  <servlet-mapping>
+    <servlet-name>atoz-files</servlet-name>
+    <url-pattern>/ccm-ldn-atoz/files/*</url-pattern>
+  </servlet-mapping>
+       module ccm-ldn-atoz  -  servlet mappings END  -->
+
+  <!-- module ccm-forum  -  servlet mappings BEGIN  -->
+  <servlet-mapping>
+    <servlet-name>forum-main</servlet-name>
+    <url-pattern>/forum-main/main/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-forum  -  servlet mappings END    -->
+
+  <servlet-mapping>
+    <servlet-name>portlet-type-xsl</servlet-name>
+    <url-pattern>/__ccm__/servlet/portlet-type/*</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>
+
+  <!-- module ccm-ldn-rss  -  servlet mappings   -->
+  <servlet-mapping>
+    <servlet-name>rss-files</servlet-name>
+    <url-pattern>/ccm-ldn-rss/files/*</url-pattern>
+  </servlet-mapping>
+
+  <!-- module ccm-ldn-search  -  servlet mappings BEGIN  -->
+  <servlet-mapping>
+    <servlet-name>search-files</servlet-name>
+    <url-pattern>/ccm-ldn-search/files/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>AxisServlet</servlet-name>
+    <url-pattern>/services/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-ldn-search  -  servlet mappings END  -->
+
+  <!-- module ccm-ldn-shortcuts  -  servlet mappings   -->
+  <servlet-mapping>
+    <servlet-name>shortcuts-files</servlet-name>
+    <url-pattern>/ccm-ldn-shortcuts/files/*</url-pattern>
+  </servlet-mapping>
+
+  <!-- module ccm-ldn-subsite  -  servlet mappings BEGIN  -->
+  <servlet-mapping>
+    <servlet-name>subsite-files</servlet-name>
+    <url-pattern>/ccm-ldn-subsite/files/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-ldn-subsite  -  servlet mappings END  -->
+
+  <!-- module ccm-ldn-terms  -  servlet mappings BEGIN  -->
+  <servlet-mapping>
+    <servlet-name>terms-files</servlet-name>
+    <url-pattern>/ccm-ldn-terms/files/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-ldn-terms  -  servlet mappings END  -->
+
+  <!-- module ccm-themedirector  -  servlet mappings BEGIN   -->
+  <servlet-mapping>
+    <servlet-name>theme-files</servlet-name>
+    <url-pattern>/theme-files/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>ThemeDownload</servlet-name>
+    <url-pattern>/theme-files/download/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>ThemePreviewServlet</servlet-name>
+    <url-pattern>/theme/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-themedirector  -  servlet mappings END   -->
+
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     BASE SERVLET MAPPINGS SECTION
+     basically requirred by ccm-core
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <servlet-mapping>
+    <servlet-name>reg</servlet-name>
+    <url-pattern>/__ccm__/null/reg/*</url-pattern>
+  </servlet-mapping>
+
+  <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 SECTION
+     basically requirred by ccm-cms
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <servlet-mapping>
+    <servlet-name>content-section</servlet-name>
+    <url-pattern>/__ccm__/servlet/content-section/*</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>content-type-xsl</servlet-name>
+    <url-pattern>/__ccm__/servlet/content-type/*</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>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     ERROR PAGES
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <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>
+    <exception-type>java.lang.Error</exception-type>
+    <location>/error/general.jsp</location>
+  </error-page>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     TAG LIBS
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <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>

ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java

@@ -180,10 +180,18 @@ public class Loader extends PackageLoader {
         registerNavigationTemplates();
 
         // Switch /portal/ to use 1 column layout for funky aplaws stuff.
-        Workspace portal = (Workspace)Application
+        // pboy: This will have no effect at all. A portal page created at
+        // url /portal/ (and beneath) will always use the homepage jsp's which
+        // are hardcoded to create a three column design and ignore any
+        // column configuration. All portal pages at other urls are not
+        // affect by this setting which touches only the one application (portal)
+        // at url /portal/. Portal pages at other urls use the corresponding
+        // configuration parameter for its initial value and number of columns
+        // may be modified at any time using configuration ui.
+/*      Workspace portal = (Workspace)Application
               .retrieveApplicationForPath("/portal/");
         portal.setDefaultLayout(PageLayout
-              .findLayoutByFormat(PageLayout.FORMAT_ONE_COLUMN));
+              .findLayoutByFormat(PageLayout.FORMAT_ONE_COLUMN));             */
     }   // end run method
 
 //  public void registerServicesTemplate(String appURL) {
@@ -242,6 +250,19 @@ public class Loader extends PackageLoader {
             "Generic Welcome Page for navigation",
             "/packages/navigation/templates/gen-welcome.jsp");
     
+
+        template =
+        Template.create(
+                "MultiPartArticle as Index Item",
+                "Display a MultiPartArticle as index item",
+                "/packages/navigation/templates/mparticle-index.jsp");
+
+
+        template =
+        Template.create(
+                "Specializing list",
+                "Displays a list of items as the ordinary template, but specializes the objects in the list.",
+                "/packages/navigation/templates/SpecializingList.jsp");
     }
 
     /**
@@ -252,14 +273,12 @@ public class Loader extends PackageLoader {
      * delivered.  
      */
     // -- public void registerDefaultNavigationDomain() {
-
     // -- private StringParameter m_customNavKey;
     // -- private URLParameter    m_customNavDomainURL;
     // -- private StringParameter m_customNavPath;
     // -- private StringParameter m_customNavUseContext;
     // -- private StringParameter m_customNavTitle;
     // -- private StringParameter m_customNavDesc;
-      
     // -- m_customNavKey = new StringParameter(
     // --     "com.arsdigita.aplaws.custom_nav_key",
     // --     Parameter.REQUIRED,
@@ -278,57 +297,17 @@ public class Loader extends PackageLoader {
         // --     throw new UncheckedWrapperException("Cannot parse url", ex);
         // -- }
 
-        
+    /*   Zugriff auf Website wird nicht benötigt, aber der Parameter bei Einrichtung
-        // -- m_customNavPath = new StringParameter(
+     *   der Kategorien. Funktion URL prüft auf korrekte Syntax, nicht auf Existenz
-        // --     "com.arsdigita.aplaws.custom_nav_path",
+     */
+    // -- try {
+    // --     m_customNavDomainURL = new URLParameter(
+    // --         "com.arsdigita.aplaws.custom_nav_domain_url",
     // --         Parameter.REQUIRED,
-        // --     "local");
+    // --         new URL("http://www.aplaws.org.uk/" +
-        
+    // --                 "standards/custom/1.00/termslist.xml"));
-        // -- m_customNavUseContext = new StringParameter(
+    // -- } catch (MalformedURLException ex) {
-        // --     "com.arsdigita.aplaws.custom_nav_use_context",
+    // --     throw new UncheckedWrapperException("Cannot parse url", ex);
-        // --     Parameter.REQUIRED,
-        // --     "local");
-        
-        // -- m_customNavTitle = new StringParameter(
-        // --     "com.arsdigita.aplaws.custom_nav_title",
-        // --     Parameter.REQUIRED,
-        // --     "APLAWS Custom Navigation");
-        
-        // -- m_customNavDesc = new StringParameter(
-        // --     "com.arsdigita.aplaws.custom_nav_desc",
-        // --     Parameter.REQUIRED,
-        // --     "Installation specific navigation tree");
-       
-        
-        // -- register(m_customNavDesc);
-        // -- register(m_customNavDomainURL);
-        // -- register(m_customNavKey);
-        // -- register(m_customNavPath);
-        // -- register(m_customNavTitle);
-        // -- register(m_customNavUseContext);
-
-        // -- String customNavPath = (String)get(m_customNavPath);
-        // -- String customNavTitle = (String)get(m_customNavTitle);
-
-        // Package com.arsdigita.web
-        // Application.createApplication(Navigation.BASE_DATA_OBJECT_TYPE,
-        //                               customNavPath,
-        //                               customNavTitle,
-        //                               null);
-
-        
-        
-                // -- String customNavDesc = (String)get(m_customNavDesc);
-        // -- String customNavKey = (String)get(m_customNavKey);
-        // -- String customNavUseContext = (String)get(m_customNavUseContext);
-        // -- URL customNavDomainURL = (URL)get(m_customNavDomainURL);
-
-        // -- Domain.create(customNavKey, customNavDomainURL,
-        // --               customNavTitle, customNavDesc, "1.0.0", new Date());
-
-        // registerDomain(customNavKey, '/'+customNavPath+'/', null);
-        // -- registerDomain(customNavKey, "/content/", customNavUseContext);
-
     // -- }
 
     /**
@@ -339,9 +318,8 @@ public class Loader extends PackageLoader {
                                String appURL,
                                String context) {
         if (s_log.isDebugEnabled()) {
-            s_log.debug("Mapping domain " + domainKey + 
+            s_log.debug("Mapping domain " + domainKey + " to app " + appURL
-                        " to app " + appURL + 
+                        + " in context " + context);
-                        " in context " + context);
         }
 
         Domain domain = Domain.retrieve(domainKey);  // package com.arsdigita.london.terms
@@ -353,8 +331,8 @@ public class Loader extends PackageLoader {
             Set categorizeRoles = new HashSet();
             while (coll.next()) {
                 Role role = coll.getRole();
-                final DataQuery privs = RoleFactory.getRolePrivileges
+                final DataQuery privs = RoleFactory.getRolePrivileges(
-                    (app.getID(), role.getGroup().getID());
+                        app.getID(), role.getGroup().getID());
                 while (privs.next()) {
                     String priv = (String) privs.get(RoleFactory.PRIVILEGE);
                     if (priv.equals(SecurityManager.CMS_CATEGORY_ADMIN)) {

ccm-gen-aplaws/src/com/arsdigita/aplaws/ObjectTypeSchemaGenerator.java

@@ -370,4 +370,5 @@ public class ObjectTypeSchemaGenerator extends ObjectTypeTraversal {
         }
         m_property = (Property) m_properties.pop();
     }
+    
 }

ccm-gen-aplaws/web/WEB-INF/web.xml-aplaws

@@ -210,11 +210,11 @@
   <!-- module ccm-forum  -  servlet declarations END    -->  
 
   <servlet>
-    <servlet-name>portal-files</servlet-name>
+    <servlet-name>portalworkspace-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>
+      <param-value>/templates/ccm-portalworkspace</param-value>
     </init-param>
   </servlet>
 
@@ -361,8 +361,8 @@
   </servlet-mapping>
 
   <servlet-mapping>
-    <servlet-name>portal-files</servlet-name>
+    <servlet-name>portalworkspace-files</servlet-name>
-    <url-pattern>/ccm-ldn-portal/files/*</url-pattern>
+    <url-pattern>/ccm-portalworkspace/files/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>

ccm-gen-aplaws/web/packages/navigation/templates/SpecializingList.jsp

@@ -0,0 +1,46 @@
+<jsp:root
+    xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:define="/WEB-INF/bebop-define.tld"
+    xmlns:show="/WEB-INF/bebop-show.tld"
+    version="1.2">
+
+    <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+    <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="org.apache.log4j.Logger"/>
+
+    <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+    }
+    </jsp:scriptlet>
+
+    <define:page name="defaultItemPage" application="navigation"
+                 title="Navigation" cache="false">
+        <define:component name="greetingItem"
+                          classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
+        <define:component name="categoryPath"
+                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+        <define:component name="categoryMenu"
+                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+        <define:component name="itemList"
+                          classname="com.arsdigita.london.navigation.ui.object.ComplexObjectList"/>
+        <jsp:scriptlet>
+            ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+            ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+            ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
+            ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
+            ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(20);
+            ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setSpecializeObjects(true);
+        </jsp:scriptlet>
+
+        <define:component name="assignedTerms"
+                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+    </define:page>
+    <show:all/>	
+</jsp:root>

ccm-gen-aplaws/web/packages/navigation/templates/mparticle-index.jsp

@@ -0,0 +1,65 @@
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+       xmlns:define="/WEB-INF/bebop-define.tld" 
+         xmlns:show="/WEB-INF/bebop-show.tld"
+	    version="1.2">
+
+  <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
+  <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
+  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
+  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+
+  <jsp:scriptlet>
+    long age = Navigation.getConfig().getIndexPageCacheLifetime();
+    if (age == 0) {
+      DispatcherHelper.cacheDisable(response);
+    } else {
+      DispatcherHelper.cacheForWorld(response, (int)age);
+    }
+  </jsp:scriptlet>
+
+  <define:page name="defaultItemPage" application="navigation"
+    title="Navigation" cache="true">
+
+    <define:component name="greetingItem"
+      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
+    <define:component name="sectionXML"
+      classname="com.arsdigita.cms.contenttypes.ui.mparticle.ArticleSectionPanel"/>
+    <jsp:scriptlet>
+        com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.london.navigation.ui.GreetingItem) greetingItem).getObject();
+        ((com.arsdigita.cms.contenttypes.ui.mparticle.ArticleSectionPanel) sectionXML).setContentItem(item);
+    </jsp:scriptlet>
+    <define:component name="categoryPath"
+      classname="com.arsdigita.london.navigation.ui.category.Path"/>
+    <define:component name="categoryMenu"
+      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+    <define:component name="itemList"
+      classname="com.arsdigita.london.navigation.ui.object.SimpleObjectList"/>
+    <jsp:scriptlet>
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
+
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);      
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
+      
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30);
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "definition");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "summary");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "lead");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "description");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "eventDate");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "startDate" );
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "endDate");
+      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "newsDate");
+    </jsp:scriptlet>
+
+    <define:component name="assignedTerms"
+         classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+
+  </define:page>
+  <show:all/>
+</jsp:root>
+

ccm-gen-aplaws/web/templates/ccm-ldn-portal/portal/README.txt

@@ -1,6 +0,0 @@
-jsp files replace  files provided by ccm-ldn-portal.
-
-goal: Make the portal homepage read-only and cached for 15min. EXPERIMENTAL
-
-Dynamic no-cache version is available at /ccm/portal/custom.jsp for admins to get the 'customize area' links.
-see r1082

ccm-gen-aplaws/web/templates/ccm-ldn-portal/portal/custom.jsp

@@ -1,37 +0,0 @@
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
-	  xmlns:define="/WEB-INF/bebop-define.tld"
-	  xmlns:show="/WEB-INF/bebop-show.tld"
-	  version="1.2">
-
-    <jsp:directive.page
-        import="com.arsdigita.dispatcher.DispatcherHelper,
-		com.arsdigita.aplaws.ui.*"/>
-
-    <jsp:scriptlet>
-        DispatcherHelper.cacheDisable(response);
-    </jsp:scriptlet>
-
-<define:page name="itemPage" application="portal" title="APLAWS" cache="true">
-
-  <define:component name="left" classname="com.arsdigita.aplaws.ui.HomepageWorkspace" />
-  <define:component name="middle" classname="com.arsdigita.aplaws.ui.HomepageWorkspace" />
-  <define:component name="right" classname="com.arsdigita.aplaws.ui.HomepageWorkspace" />
-
-  <jsp:scriptlet>
-HomepageWorkspaceSelectionModel workspace = new HomepageWorkspaceSelectionModel();
-((HomepageWorkspace)left).setModel(new HomepagePortalSelectionModel(workspace, 0));
-((HomepageWorkspace)left).setName("left");
-((HomepageWorkspace)left).addWidgets();
-((HomepageWorkspace)middle).setModel(new HomepagePortalSelectionModel(workspace, 1));
-((HomepageWorkspace)middle).setName("middle");
-((HomepageWorkspace)middle).addWidgets();
-((HomepageWorkspace)right).setModel(new HomepagePortalSelectionModel(workspace, 2));
-((HomepageWorkspace)right).setCustomizable(true);
-((HomepageWorkspace)right).setName("right");
-((HomepageWorkspace)right).addWidgets();
-  </jsp:scriptlet>
-</define:page>
-
-<show:all/>
-
-</jsp:root>

ccm-gen-aplaws/web/templates/ccm-ldn-portal/portal/index.jsp

@@ -1,39 +0,0 @@
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
-	  xmlns:define="/WEB-INF/bebop-define.tld"
-	  xmlns:show="/WEB-INF/bebop-show.tld"
-	  version="1.2">
-
-    <jsp:directive.page
-        import="com.arsdigita.dispatcher.DispatcherHelper,
-		com.arsdigita.aplaws.ui.*"/>
-
-    <jsp:scriptlet>
-        DispatcherHelper.cacheForWorld(response,900);
-    </jsp:scriptlet>
-
-<define:page name="itemPage" application="portal" title="APLAWS" cache="true">
-
-  <define:component name="left" classname="com.arsdigita.aplaws.ui.HomepageWorkspace" />
-  <define:component name="middle" classname="com.arsdigita.aplaws.ui.HomepageWorkspace" />
-  <define:component name="right" classname="com.arsdigita.aplaws.ui.HomepageWorkspace" />
-
-  <jsp:scriptlet>
-HomepageWorkspaceSelectionModel workspace = new HomepageWorkspaceSelectionModel();
-((HomepageWorkspace)left).setModel(new HomepagePortalSelectionModel(workspace, 0));
-((HomepageWorkspace)left).setReadOnly(true);
-((HomepageWorkspace)left).setName("left");
-((HomepageWorkspace)left).addWidgets();
-((HomepageWorkspace)middle).setModel(new HomepagePortalSelectionModel(workspace, 1));
-((HomepageWorkspace)middle).setReadOnly(true);
-((HomepageWorkspace)middle).setName("middle");
-((HomepageWorkspace)middle).addWidgets();
-((HomepageWorkspace)right).setModel(new HomepagePortalSelectionModel(workspace, 2));
-((HomepageWorkspace)right).setReadOnly(true);
-((HomepageWorkspace)right).setName("right");
-((HomepageWorkspace)right).addWidgets();
-  </jsp:scriptlet>
-</define:page>
-
-<show:all/>
-
-</jsp:root>

ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-admin.css

@@ -1,2 +1,2 @@
 @import url("/css/acs-master.css");
-@import url("/__ccm__/apps/navigation/xsl/admin.css");
+@import url("/themes/heirloom/apps/navigation/xsl/admin.css");

ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-directory.xsl

@@ -4,8 +4,8 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   version="1.0">
 
-  <xsl:import href="../../../../ROOT/packages/bebop/xsl/bebop.xsl"/>
+  <xsl:import href="../../heirloom/packages/bebop/xsl/bebop.xsl"/>
-  <xsl:import href="../../../../ROOT/packages/ui/xsl/ui.xsl"/>
+  <xsl:import href="../../heirloom/packages/ui/xsl/ui.xsl"/>
   <xsl:import href="lib/page.xsl"/>
 
   <xsl:param name="theme-prefix" />

ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-index.xsl

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet 
+<xsl:stylesheet   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
                xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
                    xmlns:ui="http://www.arsdigita.com/ui/1.0"
@@ -10,9 +9,7 @@
     exclude-result-prefixes="xsl bebop aplaws ui cms nav"
                     version="1.0">
 
-  <xsl:import href="../../../../ROOT/__ccm__/apps/navigation/xsl/index.xsl"/>
+  <xsl:import href="../../heirloom/apps/navigation/xsl/index.xsl"/>
-  
-	
   <xsl:import href="content-section-index.xsl"/>
 
 </xsl:stylesheet>

ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-services.xsl

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet 
+<xsl:stylesheet    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
                      version="1.0">
 
-  <xsl:import href="../../../../ROOT/packages/bebop/xsl/bebop.xsl"/>
+  <xsl:import href="../../heirloom/packages/bebop/xsl/bebop.xsl"/>
-  <xsl:import href="../../../../ROOT/packages/ui/xsl/ui.xsl"/>
+  <xsl:import href="../../heirloom/packages/ui/xsl/ui.xsl"/>
   <xsl:import href="lib/page.xsl"/>
 
   <xsl:param name="theme-prefix" />

ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-sitemap.xsl

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet
+<xsl:stylesheet    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
                 xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
                     xmlns:ui="http://www.arsdigita.com/ui/1.0"
@@ -15,7 +14,7 @@
 	
 <xsl:import href="lib/header.xsl"/>
 <xsl:import href="lib/lib.xsl"/>
-<xsl:import href="../../../../ROOT/packages/bebop/xsl/dcp.xsl"/>
+<xsl:import href="../../heirloom/packages/bebop/xsl/dcp.xsl"/>
 
 <xsl:param name="context-prefix"></xsl:param>
 <xsl:param name="dispatcher-prefix" />

ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-summary.xsl

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet 
+<xsl:stylesheet   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
                 xmlns:terms="http://xmlns.redhat.com/london/terms/1.0"
                     version="1.0">
 
-  <xsl:import href="../../../../ROOT/__ccm__/apps/navigation/xsl/index.xsl"/>
+  <xsl:import href="../../heirloom/apps/navigation/xsl/index.xsl"/>
   
   
   <xsl:import href="content-section-index.xsl"/>

ccm-gen-aplaws/web/themes/static/aplaws-generic/portal-workspace-index.xsl

@@ -126,9 +126,13 @@
 
 <xsl:template match="portal:homepageWorkspace/bebop:link">
 <xsl:choose>
-<xsl:when test="./bebop:label='browse'"><a href="{@href}"  class="adminReturn" title="Return to the standard page view">back to user's view</a></xsl:when>
+<xsl:when test="./bebop:label='browse'"><a href="{@href}"  
-<xsl:when test="./bebop:label='reset'"><a href="{@href}" class="adminWarning"  title="WARNING!!: This link will delete the whole area!">delete area</a></xsl:when>
+          class="adminReturn"
-<xsl:when test="./bebop:label='customize'"><a href="{@href}" title="Customise this part of the page">customise area</a></xsl:when>
+          title="Return to the standard page view">back to user's view</a></xsl:when>
+<xsl:when test="./bebop:label='reset'"><a href="{@href}" class="adminWarning"
+          title="WARNING!!: This link will delete the whole area!">delete area</a></xsl:when>
+<xsl:when test="./bebop:label='customize'"><a href="{@href}"
+          title="Customise this part of the page">customise area</a></xsl:when>
 <xsl:otherwise><xsl:apply-templates /></xsl:otherwise>
 </xsl:choose>
 </xsl:template>
@@ -178,13 +182,13 @@
 <scenarios ><scenario default="yes" name="Scenario2" userelativepaths="yes" 
     externalpreview="no" url="..\XML\newHomepagePortal.xml"
     htmlbaseurl="http://194.202.210.43:9005/theme/ibm&#x2D;generic/"
-             outputurl="" processortype="internal" profilemode="0"
+    outputurl="" processortype="internal" profilemode="0" urlprofilexml=""
-             urlprofilexml="" commandline="" additionalpath=""
+    commandline="" additionalpath="" additionalclasspath=""
-             additionalclasspath="" postprocessortype="none"
+    postprocessortype="none" postprocesscommandline=""
-             postprocesscommandline="" postprocessadditionalpath=""
+    postprocessadditionalpath=""
     postprocessgeneratedext=""/></scenarios><MapperInfo srcSchemaPath=""
-             srcSchemaRoot="" srcSchemaPathIsRelative="yes"
+    srcSchemaRoot="" srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no"
-             srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot=""
+    destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes"
-             destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/>
+    destSchemaInterpretAsXML="no"/>
 </metaInformation>
 -->