Nachführen ccm-gen-aplaws an Änderungen ccm-themedirector, verschiedene Kleinigkeiten bei ccm-zes-aplaws, Kleinkram.

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

ccm-core/src/com/arsdigita/bebop/SimpleContainer.java

@@ -256,6 +256,7 @@ public class SimpleContainer extends BlockStylable implements Container {
      * @see #setTag(String)
      * @see #setNamespace(String)
      */
+    @Override
     public void generateXML(PageState state, Element p) {
         if ( isVisible(state) ) {
             Element parent = generateParent(p);

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

@@ -1,3 +1,4 @@
+# Generic devel application.cfg
 # Main apps
 ccm-core
 ccm-cms
@@ -7,7 +8,8 @@ ccm-cms-assets-fileattachment
 ccm-cms-assets-imagestep
 ccm-cms-assets-notes
 ccm-cms-assets-relatedlink
-## -- ccm-ldn-dublin  ist das eigentlich ein asset?
+# is ccm-ldn-dublin really an asset?
+## -- ccm-ldn-dublin
 
 # Content types
 # -- ccm-cms-types-address
@@ -15,7 +17,6 @@ ccm-cms-assets-relatedlink
 ccm-cms-types-article
 ccm-cms-types-bookmark
 # -- ccm-cms-types-contact
-# -- ccm-cms-types-esdservice
 ccm-cms-types-event
 ccm-cms-types-faqitem
 ccm-cms-types-filestorageitem
@@ -32,13 +33,14 @@ ccm-cms-types-member
 ccm-cms-types-mparticle
 ccm-cms-types-newsitem
 # -- ccm-cms-types-organization
+ccm-cms-types-person
 # -- ccm-cms-types-pressrelease
+# -- ccm-cms-types-researchnetwork
 # -- ccm-cms-types-service
 # ## Fuer OpenCCM aktivieren:
 # -- ccm-cms-types-siteproxy
 # -- ccm-cms-types-xmlfeed
 
-
 # Applications
 # ------------
 # -- ccm-auth-http
@@ -48,6 +50,7 @@ ccm-cms-types-newsitem
 ccm-forum
 ccm-forum-categorised
 # -- ccm-simplesurvey
+ccm-themedirector
 ccm-user-preferences
 # -- ccm-weblog
 # -- ccm-webpage
@@ -67,7 +70,6 @@ ccm-ldn-search
 ccm-ldn-shortcuts
 ccm-ldn-subsite
 ccm-ldn-terms
-ccm-ldn-theme
 ccm-ldn-util
 
 # integration layer

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

@@ -1,4 +1,7 @@
+# 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
@@ -13,6 +16,7 @@ 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
@@ -21,22 +25,29 @@ waf.auto_registration_on=false
 #waf.pagemap.root=portal/
 #waf.pagemap.workspace=portal/
 #waf.pagemap.login_redirect=content/content-center-redirect.jsp
-core.ui.pagemap.root_page_url=navigation/
-core.ui.pagemap.workspace_url=navigation/
-core.ui.pagemap.user_redirect_url=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_item_template_path=/default/aplaws-item.jsp
 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
@@ -48,6 +59,7 @@ com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/CCMcmsXinhaConfi
 
 ; 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=
 
@@ -70,21 +82,30 @@ 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
+
+# Forum application
 com.arsdigita.forum.show_new_tabs=true
 com.arsdigita.forum.use_wysiwyg_editor=true
 com.arsdigita.forum.allow_quick_finish=true
@@ -93,6 +114,7 @@ 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
@@ -100,24 +122,29 @@ com.arsdigita.forum.disable_page_caching=true
 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/zes-default.jsp
+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
 
-com.arsdigita.london.theme.default_theme_context=
-com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-theme.web.mf
-com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws-generic
-com.arsdigita.london.theme.file_extensions=bmp gif jpeg jpg png css js png xsl xml  
 
+# ccm-ldn-themedirector application
+themedirector.default_theme_context=
+themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf
+themedirector.default_theme_path=themes/static/aplaws-generic
+themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl
 
-; =============================================================================================
+# com.arsdigita.london.cms.dublin.audience_domain=LGAL
-; devel specific configurations
-waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm
-waf.runtime.jdbc_pool_size=80
 
-waf.web.server=localhost\:8080
+# =============================================================================================
+# runtime specific configurations
 
 waf.admin.email=webmaster@openccm.org
 waf.admin.name.given=aplaws 
@@ -126,6 +153,14 @@ 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/devel/cfg/web.xml

@@ -303,33 +303,33 @@
   </servlet>
   <!-- module ccm-ldn-terms  -  servlet declarations END   -->
 
-  <!-- module ccm-ldn-themes  -  servlet declarations BEGIN   -->
+  <!-- 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-ldn-theme</param-value>
+      <param-value>/templates/ccm-themedirector</param-value>
     </init-param>
   </servlet>
 
   <servlet>
      <servlet-name>ThemeDownload</servlet-name>
-     <servlet-class>com.arsdigita.london.theme.dispatcher.ThemeDownloadServlet</servlet-class>
+     <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.london.theme.dispatcher.InternalThemePrefixerServlet
+     com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet
     </servlet-class>
     <init-param>
       <param-name>prefix</param-name>
       <param-value>/theme</param-value>
     </init-param>
   </servlet>
-  <!-- module ccm-ldn-themes  -  servlet declarations END   -->
+  <!-- module ccm-themedirector  -  servlet declarations END   -->
 
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      MODULES SERVLET MAPPINGS SECTION
@@ -403,7 +403,7 @@
   </servlet-mapping>
   <!-- module ccm-ldn-terms  -  servlet mappings END  -->
 
-  <!-- module ccm-ldn-theme  -  servlet mappings BEGIN   -->
+  <!-- module ccm-themedirector  -  servlet mappings BEGIN   -->
   <servlet-mapping>
     <servlet-name>theme-files</servlet-name>
     <url-pattern>/theme-files/*</url-pattern>
@@ -418,7 +418,7 @@
     <servlet-name>ThemePreviewServlet</servlet-name>
     <url-pattern>/theme/*</url-pattern>
   </servlet-mapping>
-  <!-- module ccm-ldn-themes  -  servlet mappings END   -->
+  <!-- module ccm-themedirector  -  servlet mappings END   -->
 
 
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

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

@@ -1,3 +1,4 @@
+# NSH application.cfg
 # Main apps
 ccm-core
 ccm-cms
@@ -12,14 +13,17 @@ ccm-cms-assets-relatedlink
 
 # 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-member
 ccm-cms-types-mparticle
 ccm-cms-types-newsitem
 ccm-cms-types-simpleaddress

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

@@ -3,9 +3,9 @@
 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.bebop.dhtml_editor=Xinha
-waf.bebop.dhtml_editor_src=/assets/xinha/XinhaLoader.js
 
 waf.categorization.show_internal_name=true
 waf.categorization.supported_languages=de
@@ -16,9 +16,11 @@ waf.dispatcher.default_expiry=3600
 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
 
 ; security.properties:
 waf.auto_registration_on=false
+
 # MOVED to ui.Config
 #waf.pagemap.root=portal/
 #waf.pagemap.workspace=portal/
@@ -32,22 +34,25 @@ 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@NetzwerkSelbsthilfeHirnverletzung.de
+
 ; 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_item_template_path=/default/aplaws-item.jsp
 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
 ; com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js
 ; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
-com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
-com.arsdigita.cms.dhtml_editor_hidden_buttons=
-com.arsdigita.cms.dhtml_editor_plugins=
 
 com.arsdigita.cms.disable_item_pfs=true
 
@@ -62,18 +67,26 @@ 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.newsitem.hide_homepage=true
-
 # ## com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
 
 
@@ -83,10 +96,10 @@ 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
+;  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
@@ -96,25 +109,28 @@ com.arsdigita.london.navigation.category_menu_show_grand_children=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-ldn-themedirector application
 themedirector.default_theme_context=
 themedirector.default_theme_manifest=ccm-gen-aplaws.web.mf
-themedirector.default_theme_path=__ccm__/themes/aplaws-generic
+themedirector.default_theme_path=themes/static/aplaws-generic
 themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl
 
 # com.arsdigita.london.cms.dublin.audience_domain=LGAL
 
-; =============================================================================================
+# =============================================================================================
-; devel specific configurations
+# runtime specific configurations
 waf.mail.default_from=webmaster@nsh.de
-
-waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/nsh?user\=nsh&password\=nsh42web
-waf.runtime.jdbc_pool_size=80
-waf.web.server=localhost\:8080
-
 waf.admin.email=webmaster@NetzwerkSelbsthilfeHirnverletzung.de
 waf.admin.name.given=NSH 
 waf.admin.name.family=Administrator
@@ -122,6 +138,12 @@ waf.admin.password=nge3025
 waf.admin.password.question=12345 
 waf.admin.password.answer=6
 
-# com.arsdigita.aplaws.lite_load=true
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/nsh?user\=nsh&password\=nsh42web
-# waf.debug=true
+waf.runtime.jdbc_pool_size=80
-# waf.bebop.fancy_xsl_errors=true
+waf.web.server=localhost\:8080
+
+# =============================================================================================
+# devel specific configurations
+; waf.debug=true
+; waf.bebop.fancy_xsl_errors=true
+

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

@@ -4,6 +4,32 @@
 
 <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>
@@ -24,6 +50,20 @@
     <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>
@@ -80,7 +120,10 @@
     <servlet-class>com.arsdigita.web.ResourceServlet</servlet-class>
   </servlet>
 
-  <!-- ADDITIONAL SERVLET DECLARATIONS -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     ADDITIONAL SERVLET DECLARATIONS SECTION 
+     basically requirred by ccm-cms
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
   <servlet>
     <servlet-name>content-section</servlet-name>
@@ -126,19 +169,28 @@
    </init-param>
  </servlet>
 
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     MODULES SERVLET DECLARATIONS SECTION
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <!-- module ccm-ldn-atoz  -  servlet definitions BEGIN
+       NOT USED with ZeS   
   <servlet>
-   <servlet-name>ThemePreviewServlet</servlet-name>
+    <servlet-name>atoz-files</servlet-name>
-   <display-name>Servlet to allow admins to preview look/feel</display-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
-   <servlet-class>
-    com.arsdigita.london.theme.dispatcher.InternalThemePrefixerServlet
-   </servlet-class>
     <init-param>
-     <param-name>prefix</param-name>
+      <param-name>template-path</param-name>
-     <param-value>/theme</param-value>
+      <param-value>/templates/ccm-ldn-atoz</param-value>
     </init-param>
   </servlet>
+       module ccm-ldn-atoz  -  servlet definitions END  -->
 
-<!-- XXX hack -->
+  <!-- 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>
@@ -167,16 +219,130 @@
     <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>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>
@@ -187,7 +353,71 @@
     <url-pattern>/ccm-ldn-navigation/files/*</url-pattern>
   </servlet-mapping>
 
-  <!-- /ADDITIONAL SERVLET DECLARATIONS -->
+  <!-- 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>
@@ -224,7 +454,10 @@
     <url-pattern>/resource/*</url-pattern>
   </servlet-mapping>
 
-  <!-- ADDITIONAL SERVLET MAPPINGS -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     ADDITIONAL SERVLET MAPPINGS SECTION
+     basically requirred by ccm-cms
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
   <servlet-mapping>
     <servlet-name>content-section</servlet-name>
@@ -232,13 +465,13 @@
   </servlet-mapping>
 
   <servlet-mapping>
-    <servlet-name>content-type-xsl</servlet-name>
+    <servlet-name>content-item-xsl</servlet-name>
-    <url-pattern>/__ccm__/servlet/content-type/*</url-pattern>
+    <url-pattern>/__ccm__/servlet/content-item/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
-    <servlet-name>content-item-xsl</servlet-name>
+    <servlet-name>content-type-xsl</servlet-name>
-    <url-pattern>/__ccm__/servlet/content-item/*</url-pattern>
+    <url-pattern>/__ccm__/servlet/content-type/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
@@ -256,13 +489,9 @@
      <url-pattern>/print/*</url-pattern>
  </servlet-mapping>
 
- <servlet-mapping>
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     <servlet-name>ThemePreviewServlet</servlet-name>
+     ERROR PAGES
-     <url-pattern>/theme/*</url-pattern>
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- </servlet-mapping>
-
-
-  <!-- /ADDITIONAL SERVLET MAPPINGS -->
 
   <error-page>
     <exception-type>com.arsdigita.dispatcher.AccessDeniedException</exception-type>
@@ -289,10 +518,28 @@
     <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/WEB-INF/resources/aplaws-stylesheet-paths.txt

@@ -12,23 +12,27 @@ http://::host::/__ccm__/servlet/content-item/index.xsl?oid=::item_template_oid::
 
 # added by Quasimodo
 # Theme with single entry point (e.g Mandalay)
-http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/start.xsl
+http://::host::/resource/::webapp::/themes/::themedir::/::theme::/start.xsl
 
 # Theme, with optional locale & prefix
-http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl
+http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl
-http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
+http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
 
 # Theme, with optional locale
-http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::-::locale::.xsl
+http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.xsl
-http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::.xsl
+http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::.xsl
 
 # APLAWS generic default, with locale and prefix
 # XXX change ROOT -> ccm-ldn-aplaws
+http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::prefix::-::locale::.xsl
+http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::prefix::.xsl
 http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::-::locale::.xsl
 http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::.xsl
 
 # APLAWS generic default, with locale
 # XXX change ROOT -> ccm-ldn-aplaws
+http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::locale::.xsl
+http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::.xsl
 http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::locale::.xsl
 http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::.xsl
 
@@ -37,5 +41,7 @@ http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::-::l
 http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::.xsl
 
 # Global default, from application's own web app - relocated version >= 6.6.1
+http://::host::/resource/ROOT/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
+http://::host::/resource/ROOT/themes/heirloom/apps/::application::/xsl/::url::.xsl
 http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
 http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl

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

@@ -142,9 +142,8 @@ public class Loader extends PackageLoader {
             if (s_log.isInfoEnabled()) {
                 s_log.info("Process " + file);
             }
-            parser.parse(Thread.currentThread().getContextClassLoader
+            parser.parse(Thread.currentThread().getContextClassLoader().
-                         ().getResourceAsStream
+                    getResourceAsStream(file));
-                         (file));
         }
 
         String navigationKey = (String) get(m_navigationDomain);

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

@@ -15,6 +15,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
+
 package com.arsdigita.aplaws;
 
 import com.arsdigita.xml.Element;

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

@@ -3,8 +3,10 @@
   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/__ccm__/apps/admin/xsl/index.xsl"/>
+  -->
+  <xsl:import href="../../heirloom/apps/admin/xsl/index.xsl"/>
   <xsl:import href="lib/page.xsl"/>
 
   <xsl:param name="theme-prefix"/>

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

@@ -8,7 +8,10 @@
   xmlns:nav="http://ccm.redhat.com/london/navigation"
   version="1.0">
 
+<!--
   <xsl:import href="../../themes/aplaws-generic/navigation-index.xsl"/>
+  -->
+  <xsl:import href="navigation-index.xsl"/>
   
   <xsl:template name="pageContent">
     <a class="intLink" name="top" />

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

@@ -31,7 +31,6 @@
   
 
 
-
 	<xsl:param name="theme-prefix" />
 	<xsl:param name="context-prefix" />
 	<xsl:param name="dispatcher-prefix" />