Nachziehen der Änderungen zu CKEditor in core r4769

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

ccm-lcs-bundle/application.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-  name="ccm-cms-bundle"
+  name="ccm-lcs-bundle"
   prettyName="LibreCMS based on CCM"
-  version="6.6.0"
+  version="6.6.1"
   release="2"
   webapp="ROOT">
   <ccm:dependencies>

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

@@ -10,8 +10,8 @@ waf.bebop.base_page=com.arsdigita.bundle.ui.SimplePage
 ; dhtml editor to use (system wide)
 ; Xinha is default
 ; default: Xinha editor & src=/assets/xinha/XinhaLoader.js
-; To use FCKeditor configure:
+; To use CKeditor configure:
-; waf.bebop.dhtml_editor=FCKeditor
+; waf.bebop.dhtml_editor=CKeditor
 
 waf.categorization.show_internal_name=true
 

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

@@ -49,7 +49,7 @@
         <ccm:application name="ccm-ldn-util"/>
 
 <!--   LibreCMS bundle  -->
-        <ccm:application name="ccm-cms-bundle"/>
+        <ccm:application name="ccm-lcs-bundle"/>
 
 
 

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

@@ -11,13 +11,24 @@
 # 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
+# Theme with single entry point (e.g Foundry) 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
+# Theme with single entry point (e.g Foundry) unmanaged default
-#http://::host::/resource/::webapp::/themes/mandalay/start.xsl
+# Optional customer specific default. If empty librecms-default is tried.
-http://::host::/::webapp::/themes/mandalay/start.xsl
+#http://::host::/resource/::webapp::/themes/librecms-custom/start.xsl
+http://::host::/::webapp::/themes/librecms-custom/start.xsl
+
+# Theme with single entry point (e.g Foundry) unmanaged default
+# Optional distribution specific default. If empty, foundry-base is used.
+#http://::host::/resource/::webapp::/themes/librecms-default/start.xsl
+http://::host::/::webapp::/themes/librecms-default/start.xsl
+
+# Theme with single entry point (e.g Foundry) unmanaged default
+# Fall back if anything else fails.
+#http://::host::/resource/::webapp::/themes/foundry-base/start.xsl
+http://::host::/::webapp::/themes/foundry-base/start.xsl
 
 
 # ==============================================================================
@@ -27,31 +38,31 @@ http://::host::/::webapp::/themes/mandalay/start.xsl
 # 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::-::locale::.xsl
-http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::.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::
+##http://::host::/themes/servlet/content-item/index.xsl?oid=::item_template_oid::&delegated=::item_delegated_url::
 
 # Theme, managed by themedirector, with optional locale & prefix
 #http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.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::-::locale::.xsl
-http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
+##http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
 
 # Theme managed by themedirector, with optional locale (without prefix)
 #http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.xsl
 #http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::.xsl
-http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.xsl
+##http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.xsl
-http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::.xsl
+##http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::.xsl
 
 # APLAWS generic default, with locale and prefix
 #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
-http://::host::/::webapp::/themes/static/aplaws-generic/::application::-::url::-::prefix::-::locale::.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::/::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
 
@@ -60,13 +71,13 @@ http://::host::/::webapp::/themes/static/aplaws-generic/::application::-::url::-
 #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
-http://::host::/::webapp::/themes/static/aplaws-generic/::application::-::url::-::locale::.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::/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::.xsl
-http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
+##http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
-http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl
+##http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl

ccm-lcs-bundle/src/ccm-lcs-bundle.upgrade

@@ -1,5 +1,4 @@
 <upgrade>
-  <!-- ONLY HB trunk, never used in APLAWS, removed from APLAWS trunk -->
   <version from="0.0.0" to="6.6.0">
     <script sql="ccm-bundle/upgrade/::database::-0.0.0-6.6.0.sql"/>
   </version>

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

@@ -54,7 +54,11 @@ waf.search.indexer=lucene
 # ##############################################################################
 ; Searches for localized style sheet (among others) 
 waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
+; For new installations and Foundry default theme
 waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-stylesheet-paths.txt
+; For updates and existing Mandalay based themes:
+#waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-Mandalay-stylesheet-paths.txt
+
 
 # CORE UI configuration parameters
 # ##############################################################################
@@ -85,9 +89,11 @@ waf.workflow.simple.alerts_sender=root@localhost.localdomain
 
 # CORE XML processing configuration parameters
 # ##############################################################################
-waf.xml.xsl_transformer=saxonhe
 waf.xml.activate_full_date_formatter=true
-
+; For new installations and Foundry default theme
+waf.xml.xsl_transformer=saxonhe
+; For updates and existing Mandalay based themes:
+#waf.xml.xsl_transformer=
 
 
 # CMS configuration parameters
@@ -138,13 +144,14 @@ com.arsdigita.cms.delete_workflow_after_publication=false
 
 
 # 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=2010
+com.arsdigita.cms.contenttypes.event.start_year=2015
 com.arsdigita.cms.contenttypes.event.end_year_delta=5
 
 
@@ -193,7 +200,6 @@ com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCat
 # a new theme! (In addition to default_theme_path. Otherwise no files are copied!
 themedirector.default_theme_manifest=ccm-ldn-aplaws.web.mf
 # Required to denote the dir containing the default theme!
-#themedirector.default_theme_path=themes/static/aplaws
 themedirector.default_theme_path=themes/aplaws-default
 
 # LDN-SEARCH application

ccm-ldn-aplaws/bundles/devel/cfg/project.xml

@@ -12,7 +12,7 @@
               ccmVersion="6.1" 
                     name="aplaws" 
               prettyName="APLAWS plus (devel)"
-                 version="2.3.0" 
+                 version="2.3.2" 
                  release="devel" 
                   webxml="web.xml" 
                   webapp="aplaws"

ccm-ldn-aplaws/src/WEB-INF/resources/aplaws-backwardscomp-stylesheet-paths.txt

@@ -0,0 +1,88 @@
+# -*- text -*-
+# This file locates stylesheets, if you are using the
+# "PatternStylesheetResolver". Please read the Javadoc for that file for
+# the full story.
+
+# Currently the "resource" part is actually "short-circuited", see 
+# Templating#transformURL(url). As long as we store and synchronize all theme
+# 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 Foundry/Mandaly) 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 Foundry) unmanaged distribution default
+# Provides optionally a distribution / bundle specific default theme. It it
+# is empty foundry-base is used as fall-back.
+#http://::host::/resource/::webapp::/themes/mandalay/start.xsl
+http://::host::/::webapp::/themes/aplaws-default/start.xsl
+
+# Theme with single entry point (e.g Foundry) unmanaged fallback
+# Provides a very basic Foundry theme
+#http://::host::/resource/::webapp::/themes/mandalay/start.xsl
+http://::host::/::webapp::/themes/foundry-base/start.xsl
+
+# ===========================================================
+# Entry point for new theme only for content center and admin
+# ===========================================================
+
+http://::host::/::webapp::/themes/foundry-base/::application::-::url::.xsl
+
+
+
+# ==============================================================================
+# The following is for multi-entry themes, the traditional way in APLAWS
+# Deprecated, retained for backwards compatibility to old existing custom themes.
+# ==============================================================================
+
+# 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::
+
+# Theme, managed by themedirector, with optional locale & prefix
+#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.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 managed by themedirector, with optional locale (without prefix)
+#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.xsl
+#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::.xsl
+http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.xsl
+http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::.xsl
+
+# APLAWS default, with locale and prefix
+#http://::host::/resource/ROOT/themes/static/aplaws/::application::-::url::-::prefix::-::locale::.xsl
+#http://::host::/resource/ROOT/themes/static/aplaws/::application::-::url::-::prefix::.xsl
+#http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::-::prefix::-::locale::.xsl
+#http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::-::prefix::.xsl
+#http://::host::/::webapp::/themes/static/aplaws/::application::-::url::-::prefix::-::locale::.xsl
+#http://::host::/::webapp::/themes/static/aplaws/::application::-::url::-::prefix::.xsl
+#http://::host::/ROOT/__ccm__/themes/aplaws/::application::-::url::-::prefix::-::locale::.xsl
+#http://::host:://ROOT/__ccm__/themes/aplaws/::application::-::url::-::prefix::.xsl
+
+# APLAWS generic default, with locale (without prefix)
+#http://::host::/resource/ROOT/themes/static/aplaws/::application::-::url::-::locale::.xsl
+#http://::host::/resource/ROOT/themes/static/aplaws/::application::-::url::.xsl
+#http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::-::locale::.xsl
+#http://::host::/resource/ROOT/__ccm__/themes/aplaws/::application::-::url::.xsl
+#http://::host::/::webapp::/themes/static/aplaws/::application::-::url::-::locale::.xsl
+#http://::host::/::webapp::/themes/static/aplaws/::application::-::url::.xsl
+#http://::host::/::webapp::/__ccm__/themes/aplaws/::application::-::url::-::locale::.xsl
+#http://::host::/::webapp::/__ccm__/themes/aplaws/::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::.xsl
+http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
+http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl
+

ccm-ldn-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt

@@ -11,19 +11,25 @@
 # 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
+# Theme with single entry point (e.g Foundry) 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
+# Theme with single entry point (e.g Foundry) unmanaged distribution default
+# Provides optionally a distribution / bundle specific default theme. It it
+# is empty foundry-base is used as fall-back.
 #http://::host::/resource/::webapp::/themes/mandalay/start.xsl
 http://::host::/::webapp::/themes/aplaws-default/start.xsl
 
+# Theme with single entry point (e.g Foundry) unmanaged fallback
+# Provides a very basic Foundry theme
+#http://::host::/resource/::webapp::/themes/mandalay/start.xsl
+http://::host::/::webapp::/themes/foundry-base/start.xsl
+
 # ===========================================================
 # Entry point for new theme only for content center and admin
 # ===========================================================
 
-#http://::host::/::webapp::/themes/mandalay/::application::-::url::.xsl
 http://::host::/::webapp::/themes/foundry-base/::application::-::url::.xsl
 
 
@@ -36,23 +42,23 @@ http://::host::/::webapp::/themes/foundry-base/::application::-::url::.xsl
 # 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::-::locale::.xsl
-http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::.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::
+#http://::host::/themes/servlet/content-item/index.xsl?oid=::item_template_oid::&delegated=::item_delegated_url::
 
 # Theme, managed by themedirector, with optional locale & prefix
 #http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.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::-::locale::.xsl
-http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
+#http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
 
 # Theme managed by themedirector, with optional locale (without prefix)
 #http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.xsl
 #http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::.xsl
-http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.xsl
+#http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.xsl
-http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::.xsl
+#http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::.xsl
 
 # APLAWS default, with locale and prefix
 #http://::host::/resource/ROOT/themes/static/aplaws/::application::-::url::-::prefix::-::locale::.xsl
@@ -77,6 +83,6 @@ http://::host::/::webapp::/themes/::themedir::/::theme::/::application::-::url::
 # 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::.xsl
-http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
+#http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
-http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl
+#http://::host::/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl
 

ccm-ldn-aplaws/web/themes/aplaws-default/aPlaceholder.txt

@@ -0,0 +1,5 @@
+This directory contains an optional unmanaged default theme which is used if
+no managed theme is available (as usually at install time). If it is empty
+foundry-base is used as fallback and last-resort.
+
+It is configurable in 'WEB_INF/conf/registry/ccm-core.

ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/FreeformHTMLPortletEditor.java

@@ -59,7 +59,7 @@ public class FreeformHTMLPortletEditor extends PortletConfigFormSection {
             if (Workspace.getConfig().useWysiwygEditor())  {
                 m_content = new CMSDHTMLEditor(PageTextForm.TEXT_ENTRY);
                 m_content.setWrap(CMSDHTMLEditor.SOFT);
-                if (Bebop.getConfig().getDHTMLEditor().equals(BebopConstants.BEBOP_FCKEDITOR)) {
+                if (Bebop.getConfig().getDHTMLEditor().equals(BebopConstants.BEBOP_CKEDITOR)) {
                     ((DHTMLEditor)m_content).setConfig(new DHTMLEditor.Config("portlet-fck", FCK_PORTLET_CONFIG));
                     m_content.setMetaDataAttribute("height", "300");
                 } else {