diff --git a/ccm-cms-publicpersonalprofile/application.xml b/ccm-cms-publicpersonalprofile/application.xml index 9fd514503..f79d35315 100644 --- a/ccm-cms-publicpersonalprofile/application.xml +++ b/ccm-cms-publicpersonalprofile/application.xml @@ -2,7 +2,7 @@ diff --git a/ccm-cms-publicpersonalprofile/pdl/com/arsdigita/content-types/PublicPersonalProfile.pdl b/ccm-cms-publicpersonalprofile/pdl/com/arsdigita/content-types/PublicPersonalProfile.pdl index f33f91872..aa01f7949 100644 --- a/ccm-cms-publicpersonalprofile/pdl/com/arsdigita/content-types/PublicPersonalProfile.pdl +++ b/ccm-cms-publicpersonalprofile/pdl/com/arsdigita/content-types/PublicPersonalProfile.pdl @@ -1,3 +1,23 @@ +// +// Copyright (C) 2013 Jens Pelzetter 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$ + + model com.arsdigita.cms.contenttypes; import com.arsdigita.kernel.ACSObject; @@ -5,46 +25,46 @@ import com.arsdigita.cms.*; object type PublicPersonalProfile extends ContentPage { - String[0..1] profileUrl = ct_public_personal_profiles.profile_url VARCHAR(256); + String[0..1] profileUrl = ct_ppp.profile_url VARCHAR(256); - String[0..1] position = ct_public_personal_profiles.position VARCHAR(2048); - String[0..1] interests = ct_public_personal_profiles.interests CLOB; - String[0..1] misc = ct_public_personal_profiles.misc CLOB; + String[0..1] position = ct_ppp.position VARCHAR(2048); + String[0..1] interests = ct_ppp.interests CLOB; + String[0..1] misc = ct_ppp.misc CLOB; - reference key (ct_public_personal_profiles.profile_id); + reference key (ct_ppp.profile_id); } object type PublicPersonalProfileBundle extends ContentBundle { - reference key (ct_public_personal_profile_bundles.bundle_id); + reference key (ct_ppp_bundles.bundle_id); } association { PublicPersonalProfileBundle[0..n] profile = join cms_person_bundles.bundle_id - to ct_public_personal_profile_owner_map.owner_id, - join ct_public_personal_profile_owner_map.profile_id - to ct_public_personal_profile_bundles.bundle_id; + to ct_ppp_owner_map.owner_id, + join ct_ppp_owner_map.profile_id + to ct_ppp_bundles.bundle_id; - GenericPersonBundle[0..n] owner = join ct_public_personal_profile_bundles.bundle_id - to ct_public_personal_profile_owner_map.profile_id, - join ct_public_personal_profile_owner_map.owner_id + GenericPersonBundle[0..n] owner = join ct_ppp_bundles.bundle_id + to ct_ppp_owner_map.profile_id, + join ct_ppp_owner_map.owner_id to cms_person_bundles.bundle_id; - Integer[0..1] ownerOrder = ct_public_personal_profile_owner_map.owner_order INTEGER; + Integer[0..1] ownerOrder = ct_ppp_owner_map.owner_order INTEGER; } object type PublicPersonalProfileNavItem { - BigDecimal[1..1] navItemId = ct_public_personal_profile_nav_items.object_id INTEGER; - String[0..1] key = ct_public_personal_profile_nav_items.key VARCHAR(128); - String[0..1] lang = ct_public_personal_profile_nav_items.lang VARCHAR(2); - String[0..1] label = ct_public_personal_profile_nav_items.label VARCHAR(128); - Integer[0..1] navItemOrder = ct_public_personal_profile_nav_items.nav_item_order INTEGER; - String[0..1] generatorClass = ct_public_personal_profile_nav_items.generator_class VARCHAR(1024); + BigDecimal[1..1] navItemId = ct_ppp_nav_items.object_id INTEGER; + String[0..1] key = ct_ppp_nav_items.key VARCHAR(128); + String[0..1] lang = ct_ppp_nav_items.lang VARCHAR(2); + String[0..1] label = ct_ppp_nav_items.label VARCHAR(128); + Integer[0..1] navItemOrder = ct_ppp_nav_items.nav_item_order INTEGER; + String[0..1] generatorClass = ct_ppp_nav_items.generator_class VARCHAR(1024); unique(key, lang, label); object key (navItemId); - //reference key ( ct_public_personal_profile_nav_items.id); + //reference key ( ct_ppp_nav_items.id); } diff --git a/ccm-cms-publicpersonalprofile/pdl/com/arsdigita/publicpersonalprofile/PublicPersonalProfile.pdl b/ccm-cms-publicpersonalprofile/pdl/com/arsdigita/publicpersonalprofile/PublicPersonalProfile.pdl index c26553451..f927b5401 100644 --- a/ccm-cms-publicpersonalprofile/pdl/com/arsdigita/publicpersonalprofile/PublicPersonalProfile.pdl +++ b/ccm-cms-publicpersonalprofile/pdl/com/arsdigita/publicpersonalprofile/PublicPersonalProfile.pdl @@ -1,3 +1,23 @@ +// +// Copyright (C) 2013 Jens Pelzetter 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$ + + model com.arsdigita.cms.publicpersonalprofile; import com.arsdigita.web.Application; diff --git a/ccm-cms-publicpersonalprofile/sql/ccm-cms-publicpersonalprofile/postgres/upgrade/6.6.5-6.6.6/ren_tables_cms_publicpersonalprofile.sql b/ccm-cms-publicpersonalprofile/sql/ccm-cms-publicpersonalprofile/postgres/upgrade/6.6.5-6.6.6/ren_tables_cms_publicpersonalprofile.sql new file mode 100644 index 000000000..c396b9e5b --- /dev/null +++ b/ccm-cms-publicpersonalprofile/sql/ccm-cms-publicpersonalprofile/postgres/upgrade/6.6.5-6.6.6/ren_tables_cms_publicpersonalprofile.sql @@ -0,0 +1,48 @@ +-- +-- Copyright (C) 2014 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: ren_tables_cms_publicpersonalprofile.sql pboy $ + +-- Description: +-- Rename tables with names longer than 30 characters to retain Oracle compatibility +-- ct_publicpersonalprofiles_* to ct_ppp_* +-- This update is only applicable for the scientificcms tree up to version 2.2 +-- Don't use for the APLAWS tree! APLAWS is update just from 1.0.4 to 2.3.x +-- It corrects various updates +-- * 6.6.0-6.6.1/add_tables_cms_organisation.sql +-- * 6.6.3-6.6.4/create_orgaunit_hierarchy_table.sql +-- * 6.6.4-6.6.5/create_orgaunit_bundle.sql +-- * (6.6.7-6.6.8/add_personsstr_column.sql) + + +-- Difficult to recreate constraints, leave it as is +-- ALTER TABLE ct_public_personal_profiles +-- DROP CONSTRAINT cms_organiz_organiz_id_p_kk8qt; + +ALTER TABLE ct_public_personal_profiles + RENAME TO ct_ppp ; + +ALTER TABLE ct_public_personal_profiles_bundles + RENAME TO ct_ppp_bundles ; + +ALTER TABLE ct_public_personal_profiles_owner_map + RENAME TO ct_ppp_owner_map ; + +ALTER TABLE ct_public_personal_profiles_nav_items + RENAME TO ct_ppp_nav_items ; + + diff --git a/ccm-cms-publicpersonalprofile/sql/ccm-cms-publicpersonalprofile/upgrade/oracle-se-6.6.5-6.6.6.sql b/ccm-cms-publicpersonalprofile/sql/ccm-cms-publicpersonalprofile/upgrade/oracle-se-6.6.5-6.6.6.sql new file mode 100644 index 000000000..6fbc2ca68 --- /dev/null +++ b/ccm-cms-publicpersonalprofile/sql/ccm-cms-publicpersonalprofile/upgrade/oracle-se-6.6.5-6.6.6.sql @@ -0,0 +1,24 @@ +-- +-- Copyright (C) 2013 Jens Pelzetter 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: oracle-se-6.6.5-6.6.6.sql pboy $ + +-- Update: Fixes various identifiers with could be uses in PostgreSQL but not +-- in Oracle. Therefore there is nothing to do here. +PROMPT ScientificCMS PublicPersonalProfile 6.6.5 -> 6.6.6 Upgrade Script (Oracle) + +-- Do nothing! diff --git a/ccm-cms-publicpersonalprofile/sql/ccm-cms-publicpersonalprofile/upgrade/postgres-6.6.5-6.6.6.sql b/ccm-cms-publicpersonalprofile/sql/ccm-cms-publicpersonalprofile/upgrade/postgres-6.6.5-6.6.6.sql new file mode 100644 index 000000000..c039d1c6b --- /dev/null +++ b/ccm-cms-publicpersonalprofile/sql/ccm-cms-publicpersonalprofile/upgrade/postgres-6.6.5-6.6.6.sql @@ -0,0 +1,37 @@ +-- +-- Copyright (C) 2013 Jens Pelzetter 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$ + +-- This update is only applicable for the internal development tree at +-- University of Bremen ! Don't use for the APLAWS main trunk on +-- fedorahosted! + +-- Update: Fixes various identifiers with could be uses in PostgreSQL but not +-- in Oracle. Therefore there is no Oracle counterpart. +-- +-- This update is only applicable for the scientificcms tree up to 2.2 +-- Don't use for the APLAWS tree. APLAWS is updated from 1.0.4 +-- directly to 2.3.x (6.6.12)! + +\echo LibreCCM PublicPersonalProfile 6.6.4 -> 6.6.5 Upgrade Script (PostgreSQL) + +begin; + +\i ../postgres/upgrade/6.6.5-6.6.6/fix_app_name.sql + +commit; diff --git a/ccm-cms-publicpersonalprofile/src/ccm-cms-publicpersonalprofile.upgrade b/ccm-cms-publicpersonalprofile/src/ccm-cms-publicpersonalprofile.upgrade index 93eb65be2..0802335f0 100644 --- a/ccm-cms-publicpersonalprofile/src/ccm-cms-publicpersonalprofile.upgrade +++ b/ccm-cms-publicpersonalprofile/src/ccm-cms-publicpersonalprofile.upgrade @@ -12,5 +12,12 @@