From b00e272ffab46766f23179a0f0ef444e30f4ff47 Mon Sep 17 00:00:00 2001 From: pb Date: Sat, 17 Mar 2012 13:19:00 +0000 Subject: [PATCH] Nachhalten r1541 aus rel 1.2.0: Fixed ccm-cms#content-section update script (updated title and description ot enable proper XSL detection). git-svn-id: https://svn.libreccm.org/ccm/trunk@1542 8810af33-2d31-482b-a856-94f89814c4df --- .../6.6.5-6.6.6/adjust_app_properties.sql | 34 +++++++++++++++++++ .../ccm-cms/upgrade/oracle-se-6.6.5-6.6.6.sql | 1 + .../ccm-cms/upgrade/postgres-6.6.5-6.6.6.sql | 1 + ccm-cms/src/com/arsdigita/cms/Service.java | 1 + .../6.6.0-6.6.1/adjust_app_properties.sql | 33 ++++++++++++++++++ .../upgrade/oracle-se-6.6.0-6.6.1.sql | 2 ++ .../upgrade/postgres-6.6.0-6.6.1.sql | 3 ++ 7 files changed, 75 insertions(+) create mode 100644 ccm-cms/sql/ccm-cms/default/upgrade/6.6.5-6.6.6/adjust_app_properties.sql create mode 100644 ccm-subsite/sql/ccm-subsite/upgrade/default/6.6.0-6.6.1/adjust_app_properties.sql diff --git a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.5-6.6.6/adjust_app_properties.sql b/ccm-cms/sql/ccm-cms/default/upgrade/6.6.5-6.6.6/adjust_app_properties.sql new file mode 100644 index 000000000..ccabd619f --- /dev/null +++ b/ccm-cms/sql/ccm-cms/default/upgrade/6.6.5-6.6.6/adjust_app_properties.sql @@ -0,0 +1,34 @@ +-- +-- Copyright (C) 2011 Peter Boy. All Rights Reserved. +-- +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public License +-- as published by the Free Software Foundation; either version 2.1 of +-- the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- You should have received a copy of the GNU Lesser General Public +-- License along with this library; if not, write to the Free Software +-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +-- +-- $Id: adjust_app_properties.sql $ + +-- ccm-cms ContentSection is now initialized as a legacy free type of +-- application. +-- Application properties as title have to be adjusted in order to make +-- XSL style sheets locatable. + + +-- Rename title from CMS Content Section to just Content Section +update application_types + set title='Content Section' + where title like 'CMS Content Section'; + +-- Adjust description +update application_types + set description='The CMS Content Section application.' + where title like 'Content Section'; \ No newline at end of file diff --git a/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.6.5-6.6.6.sql b/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.6.5-6.6.6.sql index 9abcf9343..76aeef2e3 100644 --- a/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.6.5-6.6.6.sql +++ b/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.6.5-6.6.6.sql @@ -21,3 +21,4 @@ PROMPT Red Hat Enterprise CMS 6.6.5 -> 6.6.6 Upgrade Script (Oracle) @@ ../default/upgrade/6.6.5-6.6.6/remove_legacy_entries.sql +@@ ../default/upgrade/6.6.5-6.6.6/adjust_app_properties.sql diff --git a/ccm-cms/sql/ccm-cms/upgrade/postgres-6.6.5-6.6.6.sql b/ccm-cms/sql/ccm-cms/upgrade/postgres-6.6.5-6.6.6.sql index b0b7d43a4..eb06eb9b0 100644 --- a/ccm-cms/sql/ccm-cms/upgrade/postgres-6.6.5-6.6.6.sql +++ b/ccm-cms/sql/ccm-cms/upgrade/postgres-6.6.5-6.6.6.sql @@ -24,5 +24,6 @@ begin; \i ../default/upgrade/6.6.5-6.6.6/remove_legacy_entries.sql +\i ../default/upgrade/6.6.5-6.6.6/adjust_app_properties.sql commit; diff --git a/ccm-cms/src/com/arsdigita/cms/Service.java b/ccm-cms/src/com/arsdigita/cms/Service.java index 7bcb9c13f..772c85985 100644 --- a/ccm-cms/src/com/arsdigita/cms/Service.java +++ b/ccm-cms/src/com/arsdigita/cms/Service.java @@ -45,6 +45,7 @@ import org.apache.log4j.Logger; */ public class Service extends Application { + /** Logger instance for debugging */ private static final Logger s_log = Logger.getLogger(Service.class); // pdl stuff (constants) diff --git a/ccm-subsite/sql/ccm-subsite/upgrade/default/6.6.0-6.6.1/adjust_app_properties.sql b/ccm-subsite/sql/ccm-subsite/upgrade/default/6.6.0-6.6.1/adjust_app_properties.sql new file mode 100644 index 000000000..1ddfe2bc0 --- /dev/null +++ b/ccm-subsite/sql/ccm-subsite/upgrade/default/6.6.0-6.6.1/adjust_app_properties.sql @@ -0,0 +1,33 @@ +-- +-- Copyright (C) 2012 Peter Boy. All Rights Reserved. +-- +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public License +-- as published by the Free Software Foundation; either version 2.1 of +-- the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- You should have received a copy of the GNU Lesser General Public +-- License along with this library; if not, write to the Free Software +-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +-- +-- $Id: adjust_app_properties.sql $ + +-- ccm-subsite is now initialized as a legacy free type of application. +-- Application properties as title have to be adjusted in order to make +-- XSL style sheets locatable. + + +-- Rename title from CCM Subsite Admin to just Subsite +update application_types + set title='Subsite' + where title like 'CMS Subsite Admin'; + +-- Adjust description +update application_types + set description='The CCM subsite administration application.' + where title like 'Subsite'; \ No newline at end of file diff --git a/ccm-subsite/sql/ccm-subsite/upgrade/oracle-se-6.6.0-6.6.1.sql b/ccm-subsite/sql/ccm-subsite/upgrade/oracle-se-6.6.0-6.6.1.sql index 9cd2cc501..56c42ad97 100644 --- a/ccm-subsite/sql/ccm-subsite/upgrade/oracle-se-6.6.0-6.6.1.sql +++ b/ccm-subsite/sql/ccm-subsite/upgrade/oracle-se-6.6.0-6.6.1.sql @@ -28,3 +28,5 @@ @@ default/6.6.0-6.6.1/remove_legacy_entries.sql -- adjust class name in content_sections table @@ default/6.6.0-6.6.1/upd_cms_tables.sql +-- adjust properties like title in application_types +@@ default/6.6.0-6.6.1/adjust_app_properties.sql diff --git a/ccm-subsite/sql/ccm-subsite/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-subsite/sql/ccm-subsite/upgrade/postgres-6.6.0-6.6.1.sql index 6656afbd5..2771f3dce 100644 --- a/ccm-subsite/sql/ccm-subsite/upgrade/postgres-6.6.0-6.6.1.sql +++ b/ccm-subsite/sql/ccm-subsite/upgrade/postgres-6.6.0-6.6.1.sql @@ -36,4 +36,7 @@ begin; -- adjust class name in content_sections table \i default/6.6.0-6.6.1/upd_cms_tables.sql +-- adjust properties like title in application_types +\i default/6.6.0-6.6.1/adjust_app_properties.sql + commit;