From 659d0dfa395fdfca2dc9b99cc11947202edcad7a Mon Sep 17 00:00:00 2001 From: pb Date: Thu, 31 Jul 2014 07:59:00 +0000 Subject: [PATCH] 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 | 2 +- .../bundles/base/cfg/integration.properties | 23 ++--- .../web-ccm.xml => base/cfg/libre-web.xml} | 71 +-------------- ccm-bundle/bundles/base/cfg/project.xml | 21 +++-- .../bundles/demo/cfg/integration.properties | 19 ++-- .../web-ccm.xml => demo/cfg/libre-web.xml} | 65 +------------- ccm-bundle/bundles/demo/cfg/project.xml | 72 ++++++++------- .../bundles/devel/cfg/integration.properties | 23 +++-- .../devel/cfg/{web-ccm.xml => libre-web.xml} | 52 +---------- ccm-bundle/bundles/devel/cfg/project.xml | 83 +++++++++-------- .../bundles/devel/templates/placeholder.info | 12 +++ .../standard/cfg/integration.properties | 24 ++--- .../cfg/{web-ccm.xml => libre-web.xml} | 73 +-------------- ccm-bundle/bundles/standard/cfg/project.xml | 44 ++++----- .../resources/librecms-stylesheet-paths.txt | 89 ++++++++++++------- ccm-core/src/com/arsdigita/web/URL.java | 3 + .../src/com/arsdigita/rssfeed/Feed.java | 6 +- .../src/com/arsdigita/rssfeed/Loader.java | 6 +- .../bundles/devel/cfg/integration.properties | 2 +- .../scientificCMS-stylesheet-paths.txt | 1 + tools-ng/netbeans/project.xml | 4 +- 21 files changed, 253 insertions(+), 442 deletions(-) rename ccm-bundle/bundles/{demo/cfg/web-ccm.xml => base/cfg/libre-web.xml} (89%) rename ccm-bundle/bundles/{base/cfg/web-ccm.xml => demo/cfg/libre-web.xml} (90%) rename ccm-bundle/bundles/devel/cfg/{web-ccm.xml => libre-web.xml} (92%) create mode 100644 ccm-bundle/bundles/devel/templates/placeholder.info rename ccm-bundle/bundles/standard/cfg/{web-ccm.xml => libre-web.xml} (89%) diff --git a/ccm-bundle/application.xml b/ccm-bundle/application.xml index 3e9490443..2d2d19a11 100644 --- a/ccm-bundle/application.xml +++ b/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"> diff --git a/ccm-bundle/bundles/base/cfg/integration.properties b/ccm-bundle/bundles/base/cfg/integration.properties index a7287dd44..47ecd07fa 100644 --- a/ccm-bundle/bundles/base/cfg/integration.properties +++ b/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_pool_size=30 +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 diff --git a/ccm-bundle/bundles/demo/cfg/web-ccm.xml b/ccm-bundle/bundles/base/cfg/libre-web.xml similarity index 89% rename from ccm-bundle/bundles/demo/cfg/web-ccm.xml rename to ccm-bundle/bundles/base/cfg/libre-web.xml index 09b706eb5..570c328e9 100644 --- a/ccm-bundle/bundles/demo/cfg/web-ccm.xml +++ b/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"> - LibreCMS DEMO Site + LibreCMS BASE Site Community and Content Management - - reg - com.arsdigita.web.ContextRegistrationServlet - - uri - / - - 1 - - ccm-dispatcher - com.arsdigita.web.DispatcherServlet - 2 + com.arsdigita.web.CCMDispatcherServlet + 1 @@ -173,44 +163,11 @@ com.arsdigita.cms.dispatcher.TemplateXSLServlet - - TextOnlyServlet - Text Only Servlet - - com.arsdigita.web.InternalPrefixerServlet - - - prefix - /text - - - - - PrintFriendlyServlet - Printer Friendly Output Servlet - - com.arsdigita.web.InternalPrefixerServlet - - - prefix - /print - - - - - atoz-files - com.arsdigita.web.ApplicationFileServlet - - template-path - /templates/ccm-atoz - - - @@ -344,13 +301,6 @@ MODULES SERVLET MAPPINGS SECTION - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - - atoz-files - /ccm-atoz/files/* - - - forum-main @@ -435,11 +385,6 @@ basically requirred by ccm-core - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - reg - /themes/null/reg/* - - ccm-dispatcher /ccm/* @@ -525,16 +470,6 @@ /themes/servlet/template/* - - TextOnlyServlet - /text/* - - - - PrintFriendlyServlet - /print/* - - diff --git a/ccm-bundle/bundles/base/cfg/project.xml b/ccm-bundle/bundles/base/cfg/project.xml index 11f2e4000..90780f32a 100644 --- a/ccm-bundle/bundles/base/cfg/project.xml +++ b/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 @@ - + @@ -127,8 +127,9 @@ --> + @@ -146,7 +148,7 @@ - + @@ -156,23 +158,20 @@ For the moment no longer supported (2012-02-06) --> - - + + + + --> - diff --git a/ccm-bundle/bundles/demo/cfg/integration.properties b/ccm-bundle/bundles/demo/cfg/integration.properties index 1b204ecfe..0fc6a72fe 100644 --- a/ccm-bundle/bundles/demo/cfg/integration.properties +++ b/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 diff --git a/ccm-bundle/bundles/base/cfg/web-ccm.xml b/ccm-bundle/bundles/demo/cfg/libre-web.xml similarity index 90% rename from ccm-bundle/bundles/base/cfg/web-ccm.xml rename to ccm-bundle/bundles/demo/cfg/libre-web.xml index 09b706eb5..def87b614 100644 --- a/ccm-bundle/bundles/base/cfg/web-ccm.xml +++ b/ccm-bundle/bundles/demo/cfg/libre-web.xml @@ -77,20 +77,10 @@ basically requirred by ccm-core - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - reg - com.arsdigita.web.ContextRegistrationServlet - - uri - / - - 1 - - ccm-dispatcher - com.arsdigita.web.DispatcherServlet - 2 + com.arsdigita.web.CCMDispatcherServlet + 1 @@ -173,44 +163,11 @@ com.arsdigita.cms.dispatcher.TemplateXSLServlet - - TextOnlyServlet - Text Only Servlet - - com.arsdigita.web.InternalPrefixerServlet - - - prefix - /text - - - - - PrintFriendlyServlet - Printer Friendly Output Servlet - - com.arsdigita.web.InternalPrefixerServlet - - - prefix - /print - - - - - atoz-files - com.arsdigita.web.ApplicationFileServlet - - template-path - /templates/ccm-atoz - - - @@ -344,12 +301,12 @@ MODULES SERVLET MAPPINGS SECTION - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - + + @@ -435,11 +392,6 @@ basically requirred by ccm-core - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - reg - /themes/null/reg/* - - ccm-dispatcher /ccm/* @@ -525,15 +477,6 @@ /themes/servlet/template/* - - TextOnlyServlet - /text/* - - - - PrintFriendlyServlet - /print/* - + @@ -31,20 +35,14 @@ - - - - - - @@ -55,54 +53,60 @@ - - + + - - - - + + + + + + + + + + + + - - - - - + + + +--> + + - + @@ -147,8 +158,6 @@ For the moment no longer supported (2012-02-06) --> - @@ -159,11 +168,10 @@ + + + --> - diff --git a/ccm-bundle/bundles/devel/cfg/integration.properties b/ccm-bundle/bundles/devel/cfg/integration.properties index a6b0fb45e..dd3720acb 100644 --- a/ccm-bundle/bundles/devel/cfg/integration.properties +++ b/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,16 +214,17 @@ auth.http.admin_identifier=webmaster # ============================================================================== # runtime specific configurations +# ============================================================================== waf.admin.email=webmaster@libreCMS.org waf.admin.name.given=LibreCMS waf.admin.name.family=Administrator waf.admin.password=lib2000 -waf.admin.password.question=12345 +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_pool_size=40 +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 diff --git a/ccm-bundle/bundles/devel/cfg/web-ccm.xml b/ccm-bundle/bundles/devel/cfg/libre-web.xml similarity index 92% rename from ccm-bundle/bundles/devel/cfg/web-ccm.xml rename to ccm-bundle/bundles/devel/cfg/libre-web.xml index c007093d5..b7a8fee62 100644 --- a/ccm-bundle/bundles/devel/cfg/web-ccm.xml +++ b/ccm-bundle/bundles/devel/cfg/libre-web.xml @@ -77,20 +77,10 @@ basically requirred by ccm-core - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - reg - com.arsdigita.web.ContextRegistrationServlet - - uri - / - - 1 - - ccm-dispatcher - com.arsdigita.web.DispatcherServlet - 2 + com.arsdigita.web.CCMDispatcherServlet + 1 @@ -173,29 +163,6 @@ com.arsdigita.cms.dispatcher.TemplateXSLServlet - - TextOnlyServlet - Text Only Servlet - - com.arsdigita.web.InternalPrefixerServlet - - - prefix - /text - - - - - PrintFriendlyServlet - Printer Friendly Output Servlet - - com.arsdigita.web.InternalPrefixerServlet - - - prefix - /print - - - - reg - /themes/null/reg/* - - ccm-dispatcher /ccm/* @@ -525,16 +487,6 @@ /themes/servlet/template/* - - TextOnlyServlet - /text/* - - - - PrintFriendlyServlet - /print/* - - diff --git a/ccm-bundle/bundles/devel/cfg/project.xml b/ccm-bundle/bundles/devel/cfg/project.xml index fe8eec77b..1a9637697 100644 --- a/ccm-bundle/bundles/devel/cfg/project.xml +++ b/ccm-bundle/bundles/devel/cfg/project.xml @@ -3,14 +3,14 @@ - @@ -31,14 +31,9 @@ - - - - - @@ -46,7 +41,6 @@ - @@ -59,34 +53,39 @@ - - - - + + + + - + + + + + + + + + + + + - - - + + @@ -95,17 +94,17 @@ - - - - + + + + @@ -144,6 +143,21 @@ --> + + + + + + + + + + @@ -157,8 +171,6 @@ For the moment no longer supported (2012-02-06) --> - @@ -171,12 +183,9 @@ - --> + --> - diff --git a/ccm-bundle/bundles/devel/templates/placeholder.info b/ccm-bundle/bundles/devel/templates/placeholder.info new file mode 100644 index 000000000..c78cf06e6 --- /dev/null +++ b/ccm-bundle/bundles/devel/templates/placeholder.info @@ -0,0 +1,12 @@ +Subdirectory