Modifications in ccm-bundle to reflect the latest code changes und to ensure compatibility to run the old aplaws theme and heirloom theme.

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

ccm-bundle/application.xml

@@ -3,7 +3,7 @@
   name="ccm-bundle"
   prettyName="LibreCMS based on CCM"
   version="6.6.0"
-  release="1"
+  release="2"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.6.0" relation="ge"/>

ccm-bundle/bundles/base/cfg/integration.properties

@@ -1,5 +1,5 @@
 # ##############################################################################
-# Libre CMS BASE bundle integration.properties, version 2.0.x
+# Libre CMS BASE bundle integration.properties, version 2.2.x
 # ##############################################################################
 #
 #
@@ -24,7 +24,7 @@ waf.kernel.data_permission_check_enabled=false
 waf.kernel.primary_user_identifier=email
 ; if you activate screen_name, forum loader does not work.
 ; waf.kernel.primary_user_identifier=screen_name
-waf.kernel.supported_languages=de,en
+waf.kernel.supported_languages=en,de
 waf.kernel.language_independent_items=true
 
 # CORE KERNEL.SECURITY configuration parameters
@@ -43,7 +43,7 @@ waf.mail.default_from=webmaster@librecms.org
 # ##############################################################################
 waf.search.indexer=lucene
 ; Below parameter used in version 1.0.4, now outdated und not valid anymore
-; May be useful to chech the lucene serach functionality. Has to be deleted
+; May be useful to check the lucene serach functionality. Has to be deleted
 ; after all QA testing
 ; waf.lucene.location=/var/ccm-devel/web/redhat/intratest/data/lucene
 
@@ -60,11 +60,6 @@ core.ui.pagemap.root_page_url=/portal/
 #core.ui.pagemap.user_redirect_url=content-center/redirect.jsp
 core.ui.pagemap.user_redirect_url=/content-center/
 core.ui.pagemap.workspace_url=/portal/
-# With version 2 moved from kernel/security to ui rsp ui.permissions and
-# no longer intended to be user configurable. 
-# TODO CHECK what these URLS (esp. ../one) is used for.
-# waf.pagemap.permission=permissions/                   ; DEFAULT
-# waf.pagemap.perm_single=permissions/one
 
 
 # CORE WEB configuration parameters
@@ -132,6 +127,7 @@ com.arsdigita.cms.soon_expired_timespan_months=0
 com.arsdigita.cms.unpublished_not_found=false
 com.arsdigita.cms.use_section_categories=false
 com.arsdigita.cms.use_streamlined_creation=true
+com.arsdigita.cms.delete_workflow_after_publication=false
 
 
 # ccm-cms-types-event parameters
@@ -141,7 +137,7 @@ 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.start_year=2010
 com.arsdigita.cms.contenttypes.event.end_year_delta=5
 
 
@@ -151,11 +147,6 @@ com.arsdigita.cms.contenttypes.newsitem.start_year=2000
 com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
 
 
-# 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 configuration parameters
 # ##############################################################################
@@ -226,8 +217,8 @@ waf.admin.password=lib2000
 waf.admin.password.question=12345
 waf.admin.password.answer=6
 
-waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm42web
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm42web&stringtype\=unspecified
-waf.runtime.jdbc_pool_size=30
+waf.runtime.jdbc_pool_size=60
 
 waf.web.server=localhost\:8080
 

ccm-bundle/bundles/base/cfg/libre-web.xml

@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
                version="2.4">
 
-  <display-name>LibreCMS DEMO Site</display-name> 
+  <display-name>LibreCMS BASE Site</display-name> 
   <description>Community and Content Management</description>
 
   <!-- path and filename of the log4j user accessible config file
@@ -77,20 +77,10 @@
      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>ccm-dispatcher</servlet-name>
-    <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
+    <servlet-class>com.arsdigita.web.CCMDispatcherServlet</servlet-class>
-    <load-on-startup>2</load-on-startup>
+    <load-on-startup>1</load-on-startup>
   </servlet>
   
   <servlet>
@@ -173,44 +163,11 @@
     <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-atoz  -  servlet definitions BEGIN   -->
-  <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-atoz</param-value>
-    </init-param>
-  </servlet>
-  <!-- module ccm-atoz  -  servlet definitions END  -->
 
   <!-- module ccm-forum  -  servlet declarations BEGIN  -->  
   <servlet>
@@ -344,13 +301,6 @@
      MODULES SERVLET MAPPINGS SECTION
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <!-- module ccm-atoz  -  servlet mappings BEGIN  -->
-  <servlet-mapping>
-    <servlet-name>atoz-files</servlet-name>
-    <url-pattern>/ccm-atoz/files/*</url-pattern>
-  </servlet-mapping>
-  <!-- module ccm-atoz  -  servlet mappings END  -->
-
   <!-- module ccm-forum  -  servlet mappings BEGIN  -->
   <servlet-mapping>
     <servlet-name>forum-main</servlet-name>
@@ -435,11 +385,6 @@
      basically requirred by ccm-core
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <servlet-mapping>
-    <servlet-name>reg</servlet-name>
-    <url-pattern>/themes/null/reg/*</url-pattern>
-  </servlet-mapping>
-
   <servlet-mapping>
     <servlet-name>ccm-dispatcher</servlet-name>
     <url-pattern>/ccm/*</url-pattern>
@@ -525,16 +470,6 @@
     <url-pattern>/themes/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
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

ccm-bundle/bundles/base/cfg/project.xml

@@ -17,7 +17,7 @@
               prettyName="LibreCMS OpenCCM" 
                  version="0-0-0" 
                  release="trunk-base" 
-                  webxml="web-ccm.xml" 
+                  webxml="libre-web.xml" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
 
@@ -55,7 +55,7 @@
         <ccm:application name="ccm-ldn-terms"/>
         <ccm:application name="ccm-ldn-util"/>
 
-<!--   SCI extension  -->
+<!--   LibreCMS bundle  -->
         <ccm:application name="ccm-bundle"/>
 
 
@@ -127,8 +127,9 @@
 -->
 <!--
         <ccm:application name="ccm-portalserver"/>
-        <ccm:application name="ccm-portalworkspace-homepage"/>
 -->
+<!--    currently doesn't work for unknown reason
+        <ccm:application name="ccm-simplesurvey"/>                   -->
 <!--
         <ccm:application name="ccm-weblog"/>
         <ccm:application name="ccm-webpage"/>
@@ -139,6 +140,7 @@
         <ccm:application name="ccm-ldn-exporter"/>
         <ccm:application name="ccm-ldn-freeform"/>
         <ccm:application name="ccm-ldn-importer"/>
+        <ccm:application name="ccm-portalworkspace-homepage"/>
 -->
 
 
@@ -156,23 +158,20 @@
         For the moment no longer supported (2012-02-06)                      -->
 
 <!--   Applications   -->
-<!--    currently doesn't work for unknown reason
-        <ccm:application name="ccm-simplesurvey"/>                   -->
 <!--    Without known funcionality
         <ccm:application name="ccm-formbuilder-pdf"/>
         <ccm:application name="ccm-user-preferences"/>               -->
 
 <!--   LDN extension  -->
-<!--    Conflicts with ccm-sci-bundle (this package)                 -->
+<!--    Conflicts with ccm-bundle (this package)                     -->
 <!--    and contains very ldn specific (esd) meta tags               -->
 <!--    <ccm:application name="ccm-ldn-aplaws"/>                     -->
 <!--    In it's current implementation very ldn / aplaws specific
         <ccm:application name="ccm-ldn-atoz"/>  
-        <ccm:application name="ccm-ldn-dublin"/>                     -->
+        <ccm:application name="ccm-ldn-dublin"/> 
+        <ccm:application name="ccm-ldn-types-contact"/>
+        <ccm:application name="ccm-ldn-types-esdservice"/>                   -->
 
 
-<!-- tools will be downloaded from trunk, but does not
-     contain java code to be compiled!
-        <ccm:application name="tools"/>           -->
 
 </ccm:project>

ccm-bundle/bundles/demo/cfg/integration.properties

@@ -1,5 +1,5 @@
 # ##############################################################################
-# Libre CMS demo bundle integration.properties, version 2.0.x
+# Libre CMS demo bundle integration.properties, version 2.2.x
 # ##############################################################################
 #
 #
@@ -24,7 +24,7 @@ waf.kernel.data_permission_check_enabled=false
 waf.kernel.primary_user_identifier=email
 ; if you activate screen_name, forum loader does not work.
 ; waf.kernel.primary_user_identifier=screen_name
-waf.kernel.supported_languages=de,en
+waf.kernel.supported_languages=en,de
 waf.kernel.language_independent_items=true
 
 # CORE KERNEL.SECURITY configuration parameters
@@ -43,7 +43,7 @@ waf.mail.default_from=webmaster@librecms.org
 # ##############################################################################
 waf.search.indexer=lucene
 ; Below parameter used in version 1.0.4, now outdated und not valid anymore
-; May be useful to chech the lucene serach functionality. Has to be deleted
+; May be useful to check the lucene serach functionality. Has to be deleted
 ; after all QA testing
 ; waf.lucene.location=/var/ccm-devel/web/redhat/intratest/data/lucene
 
@@ -132,6 +132,7 @@ com.arsdigita.cms.soon_expired_timespan_months=0
 com.arsdigita.cms.unpublished_not_found=false
 com.arsdigita.cms.use_section_categories=false
 com.arsdigita.cms.use_streamlined_creation=true
+com.arsdigita.cms.delete_workflow_after_publication=false
 
 
 # ccm-cms-types-event parameters
@@ -141,7 +142,7 @@ 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.start_year=2010
 com.arsdigita.cms.contenttypes.event.end_year_delta=5
 
 
@@ -151,11 +152,6 @@ com.arsdigita.cms.contenttypes.newsitem.start_year=2000
 com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
 
 
-# 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 configuration parameters
 # ##############################################################################
@@ -188,7 +184,8 @@ com.arsdigita.navigation.templates_file=bundle/navigation/gen-templates.txt
 com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
 
-# ccm-themedirector application
+# THEMEDIRECTOR configuration parameters
+# ##############################################################################
 # Required to point to the package containing the theme to copy from when creating
 # a new theme! (In addition to default_theme_path. Otherwise no files are copied!
 themedirector.default_theme_manifest=ccm-bundle.web.mf
@@ -226,7 +223,7 @@ waf.admin.password.question=12345
 waf.admin.password.answer=6
 
 waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm-lib?user\=ccm&password\=sci47web&stringtype\=unspecified
-waf.runtime.jdbc_pool_size=30
+waf.runtime.jdbc_pool_size=60
 
 waf.web.server=localhost\:8080
 

ccm-bundle/bundles/demo/cfg/libre-web.xml

@@ -77,20 +77,10 @@
      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>ccm-dispatcher</servlet-name>
-    <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
+    <servlet-class>com.arsdigita.web.CCMDispatcherServlet</servlet-class>
-    <load-on-startup>2</load-on-startup>
+    <load-on-startup>1</load-on-startup>
   </servlet>
   
   <servlet>
@@ -173,44 +163,11 @@
     <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-atoz  -  servlet definitions BEGIN   -->
-  <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-atoz</param-value>
-    </init-param>
-  </servlet>
-  <!-- module ccm-atoz  -  servlet definitions END  -->
 
   <!-- module ccm-forum  -  servlet declarations BEGIN  -->  
   <servlet>
@@ -435,11 +392,6 @@
      basically requirred by ccm-core
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <servlet-mapping>
-    <servlet-name>reg</servlet-name>
-    <url-pattern>/themes/null/reg/*</url-pattern>
-  </servlet-mapping>
-
   <servlet-mapping>
     <servlet-name>ccm-dispatcher</servlet-name>
     <url-pattern>/ccm/*</url-pattern>
@@ -525,15 +477,6 @@
     <url-pattern>/themes/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

ccm-bundle/bundles/demo/cfg/project.xml

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!--  project.xml LibreCMS demo - containing only modules used for 
+<!-- ======================================================================
-                                  LibreCMS DEMO edition                 -->
+     project.xml - DEMO - includes a set of modules supposed to be 
+     useful for most (or even any) installations of LibreCMS, 
+     configured for demonstration purpose. 
+     
+     ======================================================================= -->
 
 <ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
                xmlns:ccm="http://ccm.redhat.com/ccm-project" 
@@ -9,8 +13,8 @@
                     name="librecms-ccm" 
               prettyName="LibreCMS OpenCCM" 
                  version="0-0-0" 
-                 release="trunk-r1323" 
+                 release="trunk-base" 
-                  webxml="web-ccm.xml" 
+                  webxml="libre-web.xml" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
 
@@ -31,20 +35,14 @@
         <ccm:application name="ccm-cms"/>
 
 <!--   Content Assets   -->
-        <ccm:application name="ccm-cms-assets-imagestep"/>
-        <ccm:application name="ccm-cms-assets-relatedlink"/>
 
 <!--   Content Types   -->
         <ccm:application name="ccm-cms-types-article"/>
-        <ccm:application name="ccm-cms-types-filestorageitem"/>
-        <ccm:application name="ccm-cms-types-formitem"/>
-        <ccm:application name="ccm-cms-types-formsectionitem"/>
 
 <!--   Applications   -->
         <ccm:application name="ccm-navigation"/>
         <!-- ccm-portalworkspace depends on ccm-subsite  -->
         <ccm:application name="ccm-portalworkspace"/>
-        <ccm:application name="ccm-portalworkspace-homepage"/>
         <ccm:application name="ccm-shortcuts"/>
         <ccm:application name="ccm-subsite"/>                    
 
@@ -55,54 +53,60 @@
         <ccm:application name="ccm-ldn-terms"/>
         <ccm:application name="ccm-ldn-util"/>
 
-<!--   SCI extension  -->
+<!--   LibreCMS bundle  -->
-        <ccm:application name="ccm-sci-bundle"/>
+        <ccm:application name="ccm-bundle"/>
 
 
 
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   -->
-<!--    Scientific CMS  OPTIONAL packages                                    -->
+<!--    Libre CMS  STANDARD packages (for rich informational web sites)     -->
 <!--    Various combinations of these packages make up specific editions    -->
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   -->
 
 <!--   Content Assets   -->
         <ccm:application name="ccm-cms-assets-fileattachment"/>
+        <ccm:application name="ccm-cms-assets-imagestep"/>
         <ccm:application name="ccm-cms-assets-notes"/>
+        <ccm:application name="ccm-cms-assets-relatedlink"/>
 
 <!--   Content Types   -->
         <ccm:application name="ccm-cms-types-address"/>
         <ccm:application name="ccm-cms-types-bookmark"/>
         <ccm:application name="ccm-cms-types-contact"/>
+        <ccm:application name="ccm-cms-types-decisiontree"/>
         <ccm:application name="ccm-cms-types-event"/>
+        <ccm:application name="ccm-cms-types-faqitem"/>
+        <ccm:application name="ccm-cms-types-filestorageitem"/>
+        <ccm:application name="ccm-cms-types-formitem"/>
+        <ccm:application name="ccm-cms-types-formsectionitem"/>
+        <ccm:application name="ccm-cms-types-glossaryitem"/>
         <ccm:application name="ccm-cms-types-image"/>
         <ccm:application name="ccm-cms-types-mparticle"/>
         <ccm:application name="ccm-cms-types-newsitem"/>
         <ccm:application name="ccm-cms-types-person"/>
 
 <!--   Applications   -->
-        <ccm:application name="ccm-cms-publicpersonalprofile"/>
-        <ccm:application name="ccm-portalserver"/>
 
-<!--   LDN extension  -->
+<!--    temporarily excluded because configuration issues have to be resolved
-<!--    temporyrily excluded because configuration has to be cleared
+        <ccm:application name="ccm-rssfeed"/>  
-        <ccm:application name="ccm-ldn-rss"/>                        
 -->
 
 
 
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-<!--    Scientific CMS   potential ADD-ONS packages                          -->
+<!--    Libre CMS   STANDARD ADD-ONS packages                                -->
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
+<!--   Content Assets   -->
+<!--    
+-->
 
 <!--  CMS Content Types  -->
 <!--    
         <ccm:application name="ccm-cms-types-agenda"/>
-        <ccm:application name="ccm-cms-types-faqitem"/>
-        <ccm:application name="ccm-cms-types-glossaryitem"/>
-        <ccm:application name="ccm-cms-types-htmlform"/>
         <ccm:application name="ccm-cms-types-inlinesite"/>
         <ccm:application name="ccm-cms-types-job"/>
         <ccm:application name="ccm-cms-types-legalnotice"/>
+        <ccm:application name="ccm-cms-types-member"/>
         <ccm:application name="ccm-cms-types-minutes"/>
         <ccm:application name="ccm-cms-types-organization"/>
         <ccm:application name="ccm-cms-types-pressrelease"/>
@@ -115,11 +119,18 @@
 <!--
         <ccm:application name="ccm-auth-http"/>
         <ccm:application name="ccm-bookmarks"/>
+        <ccm:application name="ccm-cms-publicpersonalprofile"/>
         <ccm:application name="ccm-docmgr"/>
 -->
         <ccm:application name="ccm-docrepo"/>
         <ccm:application name="ccm-forum"/>  
         <ccm:application name="ccm-forum-categorised"/>
+-->
+<!--
+        <ccm:application name="ccm-portalserver"/>
+-->
+<!--    currently doesn't work for unknown reason
+        <ccm:application name="ccm-simplesurvey"/>                   -->
 <!--
         <ccm:application name="ccm-weblog"/>
         <ccm:application name="ccm-webpage"/>
@@ -137,7 +148,7 @@
 
 
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-<!--    Scientific CMS   list of OBSOLETE modules                            -->
+<!--    Libre CMS   list of OBSOLETE modules                                 -->
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 
 <!--   Content Types   -->
@@ -147,8 +158,6 @@
         For the moment no longer supported (2012-02-06)                      -->
 
 <!--   Applications   -->
-<!--    currently doesn't work for unknown reason
-        <ccm:application name="ccm-simplesurvey"/>                   -->
 <!--    Without known funcionality
         <ccm:application name="ccm-formbuilder-pdf"/>
         <ccm:application name="ccm-user-preferences"/>               -->
@@ -159,11 +168,10 @@
 <!--    <ccm:application name="ccm-ldn-aplaws"/>                     -->
 <!--    In it's current implementation very ldn / aplaws specific
         <ccm:application name="ccm-ldn-atoz"/>  
-        <ccm:application name="ccm-ldn-dublin"/>                     -->
+        <ccm:application name="ccm-ldn-dublin"/> 
+        <ccm:application name="ccm-ldn-types-contact"/>
+        <ccm:application name="ccm-ldn-types-esdservice"/>                   -->
 
 
-<!-- tools will be downloaded from trunk, but does not
-     contain java code to be compiled!
-        <ccm:application name="tools"/>           -->
 
 </ccm:project>

ccm-bundle/bundles/devel/cfg/integration.properties

@@ -1,5 +1,5 @@
 # ##############################################################################
-# Libre CMS based on OpenCCM devel bundle integration.properties, version 2.0.x
+# Libre CMS DEVEL bundle integration.properties, version 2.2.x
 # ##############################################################################
 #
 #
@@ -43,7 +43,7 @@ waf.mail.default_from=webmaster@librecms.org
 # ##############################################################################
 waf.search.indexer=lucene
 ; Below parameter used in version 1.0.4, now outdated und not valid anymore
-; May be useful to chech the lucene serach functionality. Has to be deleted
+; May be useful to check the lucene serach functionality. Has to be deleted
 ; after all QA testing
 ; waf.lucene.location=/var/ccm-devel/web/redhat/intratest/data/lucene
 
@@ -133,6 +133,8 @@ com.arsdigita.cms.unpublished_not_found=false
 com.arsdigita.cms.use_section_categories=false
 com.arsdigita.cms.use_streamlined_creation=true
 
+com.arsdigita.cms.delete_workflow_after_publication=false
+
 
 # ccm-cms-types-event parameters
 com.arsdigita.cms.contenttypes.event.hide_cost=true
@@ -141,7 +143,7 @@ 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.start_year=2010
 com.arsdigita.cms.contenttypes.event.end_year_delta=5
 
 
@@ -151,11 +153,6 @@ com.arsdigita.cms.contenttypes.newsitem.start_year=2000
 com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
 
 
-# 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 configuration parameters
 # ##############################################################################
@@ -188,7 +185,8 @@ com.arsdigita.navigation.templates_file=bundle/navigation/gen-templates.txt
 com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
 
-# ccm-themedirector application
+# THEMEDIRECTOR configuration parameters
+# ##############################################################################
 # Required to point to the package containing the theme to copy from when creating
 # a new theme! (In addition to default_theme_path. Otherwise no files are copied!
 themedirector.default_theme_manifest=ccm-bundle.web.mf
@@ -216,6 +214,7 @@ auth.http.admin_identifier=webmaster
 
 # ==============================================================================
 # runtime specific configurations
+# ==============================================================================
 
 waf.admin.email=webmaster@libreCMS.org
 waf.admin.name.given=LibreCMS
@@ -224,8 +223,8 @@ waf.admin.password=lib2000
 waf.admin.password.question=12345
 waf.admin.password.answer=6
 
-waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm42web
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm42web&stringtype\=unspecified
-waf.runtime.jdbc_pool_size=40
+waf.runtime.jdbc_pool_size=60
 
 waf.web.server=localhost\:8080
 

ccm-bundle/bundles/devel/cfg/libre-web.xml

@@ -77,20 +77,10 @@
      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>ccm-dispatcher</servlet-name>
-    <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
+    <servlet-class>com.arsdigita.web.CCMDispatcherServlet</servlet-class>
-    <load-on-startup>2</load-on-startup>
+    <load-on-startup>1</load-on-startup>
   </servlet>
   
   <servlet>
@@ -173,29 +163,6 @@
     <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
@@ -435,11 +402,6 @@
      basically requirred by ccm-core
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <servlet-mapping>
-    <servlet-name>reg</servlet-name>
-    <url-pattern>/themes/null/reg/*</url-pattern>
-  </servlet-mapping>
-
   <servlet-mapping>
     <servlet-name>ccm-dispatcher</servlet-name>
     <url-pattern>/ccm/*</url-pattern>
@@ -525,16 +487,6 @@
     <url-pattern>/themes/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
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

ccm-bundle/bundles/devel/cfg/project.xml

@@ -9,8 +9,8 @@
                     name="librecms-ccm" 
               prettyName="LibreCMS OpenCCM" 
                  version="0-0-0" 
-                 release="trunk-r1323" 
+                 release="trunk-base" 
-                  webxml="web-ccm.xml" 
+                  webxml="libre-web.xml" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
 
@@ -31,14 +31,9 @@
         <ccm:application name="ccm-cms"/>
 
 <!--   Content Assets   -->
-        <ccm:application name="ccm-cms-assets-imagestep"/>
-        <ccm:application name="ccm-cms-assets-relatedlink"/>
 
 <!--   Content Types   -->
         <ccm:application name="ccm-cms-types-article"/>
-        <ccm:application name="ccm-cms-types-filestorageitem"/>
-        <ccm:application name="ccm-cms-types-formitem"/>
-        <ccm:application name="ccm-cms-types-formsectionitem"/>
 
 <!--   Applications   -->
         <ccm:application name="ccm-navigation"/>
@@ -46,7 +41,6 @@
         <ccm:application name="ccm-portalworkspace"/>
         <ccm:application name="ccm-shortcuts"/>
         <ccm:application name="ccm-subsite"/>                    
-
         <ccm:application name="ccm-themedirector"/>
 
 <!--   LDN extension  -->
@@ -60,31 +54,36 @@
 
 
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   -->
-<!--    Libre CMS                                                            -->
+<!--    Libre CMS  STANDARD packages (for rich informational web sites)     -->
-<!--    Set of packages which make up a specific site                        -->
+<!--    Various combinations of these packages make up specific editions    -->
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   -->
 
 <!--   Content Assets   -->
 <!--
-        <ccm:application name="ccm-cms-assets-fileattachment"/>
-        <ccm:application name="ccm-cms-assets-notes"/>
 -->
-        <!-- <ccm:application name="ccm-cms-assets-dublincore"/> -->
+        <ccm:application name="ccm-cms-assets-fileattachment"/>
+        <ccm:application name="ccm-cms-assets-imagestep"/>
+        <ccm:application name="ccm-cms-assets-notes"/>
+        <ccm:application name="ccm-cms-assets-relatedlink"/>
 
 <!--   Content Types   -->
+        <ccm:application name="ccm-cms-types-address"/>
         <ccm:application name="ccm-cms-types-bookmark"/>
+        <ccm:application name="ccm-cms-types-contact"/>
+        <ccm:application name="ccm-cms-types-decisiontree"/>
         <ccm:application name="ccm-cms-types-event"/>
+        <ccm:application name="ccm-cms-types-faqitem"/>
+        <ccm:application name="ccm-cms-types-filestorageitem"/>
+        <ccm:application name="ccm-cms-types-formitem"/>
+        <ccm:application name="ccm-cms-types-formsectionitem"/>
+        <ccm:application name="ccm-cms-types-glossaryitem"/>
         <ccm:application name="ccm-cms-types-image"/>
         <ccm:application name="ccm-cms-types-mparticle"/>
         <ccm:application name="ccm-cms-types-newsitem"/>
         <ccm:application name="ccm-cms-types-person"/>
-<!--   Applications   -->
-<!--
-        <ccm:application name="ccm-cms-publicpersonalprofile"/>
-        <ccm:application name="ccm-portalworkspace-homepage"/>
--->
 
-<!--   LDN extension  -->
+<!--   Applications   -->
+
 <!--    temporarily excluded because configuration issues have to be resolved
         <ccm:application name="ccm-rssfeed"/>  
 -->
@@ -95,17 +94,17 @@
 <!--    Libre CMS   potential ADD-ONS packages                               -->
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 
-<!--  CMS Content Types  -->
+<!--   Content Assets   -->
-        <ccm:application name="ccm-cms-types-address"/>
-        <ccm:application name="ccm-cms-types-agenda"/>
-        <ccm:application name="ccm-cms-types-contact"/>
 <!--    
-        <ccm:application name="ccm-cms-types-faqitem"/>
+-->
-        <ccm:application name="ccm-cms-types-glossaryitem"/>
+
-        <ccm:application name="ccm-cms-types-htmlform"/>
+<!--  CMS Content Types  -->
+<!--    
+        <ccm:application name="ccm-cms-types-agenda"/>
         <ccm:application name="ccm-cms-types-inlinesite"/>
         <ccm:application name="ccm-cms-types-job"/>
         <ccm:application name="ccm-cms-types-legalnotice"/>
+        <ccm:application name="ccm-cms-types-member"/>
         <ccm:application name="ccm-cms-types-minutes"/>
         <ccm:application name="ccm-cms-types-organization"/>
         <ccm:application name="ccm-cms-types-pressrelease"/>
@@ -118,6 +117,7 @@
 <!--
         <ccm:application name="ccm-auth-http"/>
         <ccm:application name="ccm-bookmarks"/>
+        <ccm:application name="ccm-cms-publicpersonalprofile"/>
         <ccm:application name="ccm-docmgr"/>
         <ccm:application name="ccm-docrepo"/>
         <ccm:application name="ccm-forum"/>  
@@ -132,7 +132,6 @@
 <!--   LDN extension  -->
 <!--
         <ccm:application name="ccm-ldn-exporter"/>
-        <ccm:application name="ccm-ldn-freeform"/>
         <ccm:application name="ccm-ldn-importer"/>
 -->
 
@@ -144,6 +143,21 @@
         <ccm:application name="ccm-portlet-latestnews"/>
 -->
 
+        <!-- <ccm:application name="ccm-cms-assets-dublincore"/> -->
+<!--    currently doesn't work for unknown reason
+        <ccm:application name="ccm-simplesurvey"/>                   -->
+
+
+<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
+<!--    Libre CMS   list of foreign modules                                  -->
+<!--    these modules will never be included in LibreCMS but (temporarily)   -->
+<!--    part of the full development set to ensure compatibilitgy            -->
+<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
+<!--
+        <ccm:application name="ccm-portalworkspace-homepage"/>
+        <ccm:application name="ccm-ldn-freeform"/>
+        <ccm:application name="ccm-cms-types-simpleaddress"/>
+-->
 
 
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
@@ -157,8 +171,6 @@
         For the moment no longer supported (2012-02-06)                      -->
 
 <!--   Applications   -->
-<!--    currently doesn't work for unknown reason
-        <ccm:application name="ccm-simplesurvey"/>                   -->
 <!--    Without known funcionality
         <ccm:application name="ccm-formbuilder-pdf"/>
         <ccm:application name="ccm-user-preferences"/>               -->
@@ -174,9 +186,6 @@
         <ccm:application name="ccm-ldn-types-esdservice"/>                   -->
 
 
-<!-- tools will be downloaded from trunk, but does not
-     contain java code to be compiled!
-        <ccm:application name="tools"/>           -->
 
   </ccm:build>
 

ccm-bundle/bundles/devel/templates/placeholder.info

@@ -0,0 +1,12 @@
+Subdirectory  <nav> may optionally contain navigation item templates for
+navigation index pages which either overwrite or ammend those templates
+which are default for ccm-sci-bundle 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/sci-templates.txt
+This file must be specified in parameter 
+   com.arsdigita.navigation.templates_file

ccm-bundle/bundles/standard/cfg/integration.properties

@@ -1,5 +1,5 @@
 # ##############################################################################
-# Libre CMS STANDARD bundle integration.properties, version 2.0.x
+# Libre CMS STANDARD bundle integration.properties, version 2.2.x
 # ##############################################################################
 #
 #
@@ -24,7 +24,7 @@ waf.kernel.data_permission_check_enabled=false
 waf.kernel.primary_user_identifier=email
 ; if you activate screen_name, forum loader does not work.
 ; waf.kernel.primary_user_identifier=screen_name
-waf.kernel.supported_languages=de,en
+waf.kernel.supported_languages=en,de
 waf.kernel.language_independent_items=true
 
 # CORE KERNEL.SECURITY configuration parameters
@@ -43,7 +43,7 @@ waf.mail.default_from=webmaster@librecms.org
 # ##############################################################################
 waf.search.indexer=lucene
 ; Below parameter used in version 1.0.4, now outdated und not valid anymore
-; May be useful to chech the lucene serach functionality. Has to be deleted
+; May be useful to check the lucene serach functionality. Has to be deleted
 ; after all QA testing
 ; waf.lucene.location=/var/ccm-devel/web/redhat/intratest/data/lucene
 
@@ -90,7 +90,6 @@ com.arsdigita.cms.allow_content_create_in_section_listing=false
 # In order to create several content-section uncomment the line below and
 # list the desired content section names
 #com.arsdigita.cms.loader.section_names=generic,openccm,homepages
-com.arsdigita.cms.loader.section_names=info
 
 # Replace CMS category form with a terms specific widget
 com.arsdigita.cms.category_authoring_add_form=com.arsdigita.london.terms.ui.ItemCategoryPicker
@@ -129,6 +128,8 @@ com.arsdigita.cms.unpublished_not_found=false
 com.arsdigita.cms.use_section_categories=false
 com.arsdigita.cms.use_streamlined_creation=true
 
+com.arsdigita.cms.delete_workflow_after_publication=false
+
 
 # ccm-cms-types-event parameters
 com.arsdigita.cms.contenttypes.event.hide_cost=true
@@ -137,7 +138,7 @@ 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.start_year=2010
 com.arsdigita.cms.contenttypes.event.end_year_delta=5
 
 
@@ -147,12 +148,6 @@ com.arsdigita.cms.contenttypes.newsitem.start_year=2000
 com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
 
 
-# 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 configuration parameters
 # ##############################################################################
 com.arsdigita.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
@@ -209,7 +204,6 @@ auth.http.admin_identifier=webmaster
 #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/
-com.arsdigita.bundle.loader.domain_mappings=STD-NAV:/navigation/,STD-NAV:/info/,STD-NAV:/portal/
 
 
 # ==============================================================================
@@ -223,7 +217,7 @@ waf.admin.password=lib2000
 waf.admin.password.question=12345
 waf.admin.password.answer=6
 
-waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm42web
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm42web&stringtype\=unspecified
 waf.runtime.jdbc_pool_size=60
 
 waf.web.server=localhost\:8080
@@ -231,6 +225,6 @@ waf.web.server=localhost\:8080
 
 # =============================================================================================
 # devel specific configurations
-waf.debug=false
+waf.debug=true
-waf.bebop.fancy_xsl_errors=false
+waf.bebop.fancy_xsl_errors=true
 

ccm-bundle/bundles/standard/cfg/libre-web.xml

@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
                version="2.4">
 
-  <display-name>LibreCMS DEMO Site</display-name> 
+  <display-name>LibreCMS Standard Site</display-name> 
   <description>Community and Content Management</description>
 
   <!-- path and filename of the log4j user accessible config file
@@ -77,20 +77,10 @@
      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>ccm-dispatcher</servlet-name>
-    <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
+    <servlet-class>com.arsdigita.web.CCMDispatcherServlet</servlet-class>
-    <load-on-startup>2</load-on-startup>
+    <load-on-startup>1</load-on-startup>
   </servlet>
   
   <servlet>
@@ -173,45 +163,10 @@
     <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-atoz  -  servlet definitions BEGIN   -->
-  <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-atoz</param-value>
-    </init-param>
-  </servlet>
-  <!-- module ccm-atoz  -  servlet definitions END  -->
-
   <!-- module ccm-forum  -  servlet declarations BEGIN  -->  
   <servlet>
     <servlet-name>forum-main</servlet-name>
@@ -344,13 +299,6 @@
      MODULES SERVLET MAPPINGS SECTION
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <!-- module ccm-atoz  -  servlet mappings BEGIN  -->
-  <servlet-mapping>
-    <servlet-name>atoz-files</servlet-name>
-    <url-pattern>/ccm-atoz/files/*</url-pattern>
-  </servlet-mapping>
-  <!-- module ccm-atoz  -  servlet mappings END  -->
-
   <!-- module ccm-forum  -  servlet mappings BEGIN  -->
   <servlet-mapping>
     <servlet-name>forum-main</servlet-name>
@@ -435,11 +383,6 @@
      basically requirred by ccm-core
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <servlet-mapping>
-    <servlet-name>reg</servlet-name>
-    <url-pattern>/themes/null/reg/*</url-pattern>
-  </servlet-mapping>
-
   <servlet-mapping>
     <servlet-name>ccm-dispatcher</servlet-name>
     <url-pattern>/ccm/*</url-pattern>
@@ -525,16 +468,6 @@
     <url-pattern>/themes/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
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

ccm-bundle/bundles/standard/cfg/project.xml

@@ -14,9 +14,9 @@
               ccmVersion="6.1" 
                     name="librecms-ccm" 
               prettyName="LibreCMS OpenCCM" 
-                 version="0-0-0" 
+                 version="2.3.0" 
-                 release="trunk-base" 
+                 release="trunk" 
-                  webxml="web-ccm.xml" 
+                  webxml="libre-web.xml" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
 
@@ -54,13 +54,13 @@
         <ccm:application name="ccm-ldn-terms"/>
         <ccm:application name="ccm-ldn-util"/>
 
-<!--   SCI extension  -->
+<!--   LibreCMS bundle  -->
         <ccm:application name="ccm-bundle"/>
 
 
 
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   -->
-<!--    Libre CMS  STANDARD packages                                        -->
+<!--    Libre CMS  STANDARD packages (for rich informational web sites)     -->
 <!--    Various combinations of these packages make up specific editions    -->
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   -->
 
@@ -71,6 +71,10 @@
         <ccm:application name="ccm-cms-assets-relatedlink"/>
 
 <!--   Content Types   -->
+        <ccm:application name="ccm-cms-types-address"/>
+        <ccm:application name="ccm-cms-types-bookmark"/>
+        <ccm:application name="ccm-cms-types-contact"/>
+        <ccm:application name="ccm-cms-types-decisiontree"/>
         <ccm:application name="ccm-cms-types-event"/>
         <ccm:application name="ccm-cms-types-faqitem"/>
         <ccm:application name="ccm-cms-types-filestorageitem"/>
@@ -80,15 +84,18 @@
         <ccm:application name="ccm-cms-types-image"/>
         <ccm:application name="ccm-cms-types-mparticle"/>
         <ccm:application name="ccm-cms-types-newsitem"/>
+        <ccm:application name="ccm-cms-types-person"/>
 
 <!--   Applications   -->
 
-<!--   LDN extension  -->
+<!--    temporarily excluded because configuration issues have to be resolved
+-->
+        <ccm:application name="ccm-rssfeed"/>  
 
 
 
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-<!--    Scientific CMS   STANDARD ADD-ONS packages                           -->
+<!--    Libre CMS   STANDARD ADD-ONS packages                                -->
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 
 <!--   Content Assets   -->
@@ -97,18 +104,13 @@
 
 <!--  CMS Content Types  -->
 <!--    
-        <ccm:application name="ccm-cms-types-address"/>
         <ccm:application name="ccm-cms-types-agenda"/>
-        <ccm:application name="ccm-cms-types-bookmark"/>
-        <ccm:application name="ccm-cms-types-contact"/>
-        <ccm:application name="ccm-cms-types-htmlform"/>
         <ccm:application name="ccm-cms-types-inlinesite"/>
         <ccm:application name="ccm-cms-types-job"/>
         <ccm:application name="ccm-cms-types-legalnotice"/>
         <ccm:application name="ccm-cms-types-member"/>
         <ccm:application name="ccm-cms-types-minutes"/>
         <ccm:application name="ccm-cms-types-organization"/>
-        <ccm:application name="ccm-cms-types-person"/>
         <ccm:application name="ccm-cms-types-pressrelease"/>
         <ccm:application name="ccm-cms-types-service"/>
         <ccm:application name="ccm-cms-types-siteproxy"/>
@@ -127,8 +129,9 @@
 -->
 <!--
         <ccm:application name="ccm-portalserver"/>
-        <ccm:application name="ccm-portalworkspace-homepage"/>
 -->
+<!--    currently doesn't work for unknown reason
+        <ccm:application name="ccm-simplesurvey"/>                   -->
 <!--
         <ccm:application name="ccm-weblog"/>
         <ccm:application name="ccm-webpage"/>
@@ -142,6 +145,7 @@
 -->
 
 
+
   </ccm:build>
 
 
@@ -156,23 +160,21 @@
         For the moment no longer supported (2012-02-06)                      -->
 
 <!--   Applications   -->
-<!--    currently doesn't work for unknown reason
-        <ccm:application name="ccm-simplesurvey"/>                   -->
 <!--    Without known funcionality
         <ccm:application name="ccm-formbuilder-pdf"/>
         <ccm:application name="ccm-user-preferences"/>               -->
 
+
 <!--   LDN extension  -->
-<!--    Conflicts with ccm-sci-bundle (this package)                 -->
+<!--    Conflicts with ccm-bundle (this package)                     -->
 <!--    and contains very ldn specific (esd) meta tags               -->
 <!--    <ccm:application name="ccm-ldn-aplaws"/>                     -->
 <!--    In it's current implementation very ldn / aplaws specific
         <ccm:application name="ccm-ldn-atoz"/>  
-        <ccm:application name="ccm-ldn-dublin"/>                     -->
+        <ccm:application name="ccm-ldn-dublin"/> 
+        <ccm:application name="ccm-ldn-types-contact"/>
+        <ccm:application name="ccm-ldn-types-esdservice"/>                   -->
 
 
-<!-- tools will be downloaded from trunk, but does not
-     contain java code to be compiled!
-        <ccm:application name="tools"/>           -->
 
 </ccm:project>

ccm-bundle/src/WEB-INF/resources/librecms-stylesheet-paths.txt

@@ -3,45 +3,70 @@
 # "PatternStylesheetResolver". Please read the Javadoc for that file for
 # the full story.
 
-# Output type is for things such as text/javascript
+# Currently the "resource" part is actually "short-circuited", see 
-http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::-::locale::.xsl
+# Templating#transformURL(url). As long as we store and synchronize all theme
-http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::.xsl
+# files in each server's local file system, we use the direct file apprach to
+# avoid unnecessary http request and traffic between client (user) and server!
+# Additionally all modules are installed into one webapp context, so the
+# webapp tag is redundant, but sort of required by some part of the code.
+
+
+# Theme with single entry point (e.g Mandalay) managed by themedirector
+#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/start.xsl
+#http://::host::/::webapp::/themes/::themedir::/::theme::/start.xsl
+
+# Theme with single entry point (e.g Mandalay) unmanaged default
+#http://::host::/resource/::webapp::/themes/mandalay/start.xsl
+#http://::host::/::webapp::/themes/mandalay/start.xsl
+
+
+# ==============================================================================
+# The following is for multi-entry themes, deprecated in LibreCMS
+# ==============================================================================
+
+# Output type is for things such as text/javascript stored in tradition default theme
+#http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::-::locale::.xsl
+#http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::.xsl
+http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::-::locale::.xsl
+http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::.xsl
 
 # Grabs custom item xsl for CMS
 http://::host::/themes/servlet/content-item/index.xsl?oid=::item_template_oid::&delegated=::item_delegated_url::
 
-# added by Quasimodo
+# Theme, managed by themedirector, with optional locale & prefix
-# Theme with single entry point (e.g Mandalay)
+#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl
-http://::host::/resource/::webapp::/themes/::themedir::/::theme::/start.xsl
+#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
+http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl
+http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
 
-# Theme, with optional locale & prefix
+# Theme managed by themedirector, with optional locale (without prefix)
-http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl
+#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.xsl
-http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
+#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::.xsl
-
+http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.xsl
-# Theme, with optional locale
+http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::.xsl
-http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.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::-::locale::.xsl
+#http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::prefix::.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::-::locale::.xsl
+#http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::.xsl
-http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::.xsl
+http://::host::/::webapp::/themes/static/aplaws-generic/::application::-::url::-::prefix::-::locale::.xsl
+http://::host::/::webapp::/themes/static/aplaws-generic/::application::-::url::-::prefix::.xsl
+#http://::host::/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::-::locale::.xsl
+#http://::host:://ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::.xsl
 
-# APLAWS generic default, with locale
+# APLAWS generic default, with locale (without prefix)
-# 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::-::locale::.xsl
+#http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::.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::-::locale::.xsl
+#http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::.xsl
-http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::.xsl
+http://::host::/::webapp::/themes/static/aplaws-generic/::application::-::url::-::locale::.xsl
+http://::host::/::webapp::/themes/static/aplaws-generic/::application::-::url::.xsl
+#http://::host::/::webapp::/__ccm__/themes/aplaws-generic/::application::-::url::-::locale::.xsl
+#http://::host::/::webapp::/__ccm__/themes/aplaws-generic/::application::-::url::.xsl
 
 # Global default, from application's own web app
-http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
+#http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
-http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl
+#http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl
-
+http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
-# Global default, from application's own web app - relocated version >= 6.6.1
+http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl
-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-core/src/com/arsdigita/web/URL.java

@@ -807,6 +807,9 @@ public class URL {
      * <p>This function <b>should not be used</b> unless you really don't have an
      * <code>HttpServletRequest</code> object as it will ignore any Host header
      * given by the client.</p>
+     * @param path
+     * @param params
+     * @return 
      */
     public static final URL there(final String path,
                                   final ParameterMap params) {

ccm-rssfeed/src/com/arsdigita/rssfeed/Feed.java

@@ -52,7 +52,9 @@ public class Feed extends ACSObject {
     }
 
     /**
-     * Constructor
+     * Constructor.
+     * 
+     * @param id
      */
     public Feed(BigDecimal id)
         throws DataObjectNotFoundException {
@@ -61,6 +63,7 @@ public class Feed extends ACSObject {
 
     /**
      * Constructor
+     * @param obj
      */
     public Feed(DataObject obj) {
         super(obj);
@@ -68,6 +71,7 @@ public class Feed extends ACSObject {
 
     /**
      * Constructor
+     * @param oid
      */
     public Feed(OID oid)
         throws DataObjectNotFoundException {

ccm-rssfeed/src/com/arsdigita/rssfeed/Loader.java

@@ -48,9 +48,11 @@ public class Loader extends PackageLoader {
      *
      * @param ctx
      */
+    @Override
     public void run(final ScriptContext ctx) {
 
         new KernelExcursion() {
+            @Override
             public void excurse() {
                 setEffectiveParty(Kernel.getSystemParty());
 
@@ -84,7 +86,8 @@ public class Loader extends PackageLoader {
 
     /**
      * Creates the application type for the admin application as an
-     * (new style) legacy-free applicaiton.
+     * (new style) legacy-free applicaiton and an instance of the admin
+     * application.
      */
     public void setupChannelControlCenter() {
 
@@ -103,6 +106,7 @@ public class Loader extends PackageLoader {
       
         if (!Application.isInstalled(RSSFeed.BASE_DATA_OBJECT_TYPE,
                                      "/channels/")) {
+            // create an (singelton) application instance
             Application app = Application
                               .createApplication(type,
                                                  "channels",

ccm-sci-bundle/bundles/devel/cfg/integration.properties

@@ -43,7 +43,7 @@ waf.mail.default_from=webmaster@scientificcms.org
 # ##############################################################################
 waf.search.indexer=lucene
 ; Below parameter used in version 1.0.4, now outdated und not valid anymore
-; May be useful to chech the lucene serach functionality. Has to be deleted
+; May be useful to check the lucene serach functionality. Has to be deleted
 ; after all QA testing
 ; waf.lucene.location=/var/ccm-devel/web/redhat/intratest/data/lucene
 

ccm-sci-bundle/src/WEB-INF/resources/scientificCMS-stylesheet-paths.txt

@@ -34,6 +34,7 @@ http://::host::/::webapp::/themes/mandalay/start.xsl
 # Grabs custom item xsl for CMS
 # NOT used by ScientificCMS, uses Mandalay only!
 #http://::host::/themes/servlet/content-item/index.xsl?oid=::item_template_oid::&delegated=::item_delegated_url::
+
 # Theme, with optional locale & prefix
 # NOT used by ScientificCMS, uses Mandalay only!
 #http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl

tools-ng/netbeans/project.xml

@@ -867,8 +867,8 @@
                         <location>ccm-cms-types-simpleaddress/src</location>
                     </source-folder>
                     <source-folder style="packages">
-                        <label>ccm-cms-types-simpleorganisation (Source)</label>
+                        <label>ccm-cms-types-simpleorganization (Source)</label>
-                        <location>ccm-cms-types-simpleorganisation/src</location>
+                        <location>ccm-cms-types-simpleorganization/src</location>
                     </source-folder>
                     <source-folder style="packages">
                         <label>ccm-cms-types-siteproxy (Source)</label>