diff --git a/ccm-auth-http/src/com/arsdigita/auth/http/Loader.java b/ccm-auth-http/src/com/arsdigita/auth/http/Loader.java index ed819a068..6406dfc11 100755 --- a/ccm-auth-http/src/com/arsdigita/auth/http/Loader.java +++ b/ccm-auth-http/src/com/arsdigita/auth/http/Loader.java @@ -118,7 +118,7 @@ public class Loader extends PackageLoader { */ private void setupAdministrator() { - s_log.warn("Administrator eMail is retrieved as: " + getAdminEmail()); + s_log.info("Administrator eMail is retrieved as: " + getAdminEmail()); DataCollection coll = SessionManager.getSession() .retrieve(User.BASE_DATA_OBJECT_TYPE); @@ -133,7 +133,7 @@ public class Loader extends PackageLoader { User admin = User.retrieve( coll.getDataObject() ); coll.close(); - s_log.warn("Administrator is retrieved as: " + admin); + s_log.info("Administrator is retrieved as: " + admin); UserLogin login = UserLogin.findByUser(admin); if (login == null) { diff --git a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.6-6.6.7/remove_service_legacy_entries.sql b/ccm-cms/sql/ccm-cms/default/upgrade/6.6.6-6.6.7/remove_service_legacy_entries.sql new file mode 100644 index 000000000..5c9fc0e69 --- /dev/null +++ b/ccm-cms/sql/ccm-cms/default/upgrade/6.6.6-6.6.7/remove_service_legacy_entries.sql @@ -0,0 +1,131 @@ +-- +-- 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: remove_service_legacy_entries.sql $ + +-- ccm-cms Service is now initialized as a legacy free type +-- of application so entries in tables apm_package_types are no longer needed. + + +-- in case there may be several application instances! + +-- delete from object_context all entries referring to node_id in site_nodes +delete from object_context + where object_id in + (select node_id from site_nodes object_id where object_id in + ( select package_id from applications where application_type_id = + (select application_type_id from application_types + where object_type + like '%cms.Service%') + ) + ); + +-- delete from acs_objects all entries referring to node_id in site_nodes +alter table site_nodes drop constraint site_nodes_node_id_f_n1m2y ; +delete from acs_objects + where object_id in + (select node_id from site_nodes where object_id in + ( select package_id from applications where application_type_id = + (select application_type_id from application_types + where object_type + like '%cms.Service%') + ) + ); + +-- delete all entries in site_nodes referring to a Service instance +delete from site_nodes + where object_id in + (select package_id from applications where application_type_id = + (select application_type_id from application_types + where object_type + like '%cms.Service%') + ); +alter table site_nodes add constraint site_nodes_node_id_f_n1m2y + FOREIGN KEY (node_id) + REFERENCES acs_objects (object_id) MATCH SIMPLE + ON UPDATE NO ACTION ON DELETE NO ACTION ; + + + +-- delete from object_context all entries referring to package_id in apm_packages +delete from object_context + where object_id in + (select package_id from apm_packages where package_type_id = + (select package_type_id from application_types + where object_type + like '%cms.Service%') + ); + +-- delete from acs_objects all entries referring to package_id in apm_packages +alter table apm_packages drop constraint apm_package_package_id_f_46may ; +alter table applications drop constraint application_package_id_f_cdaho ; +delete from acs_objects + where object_id in + (select package_id from apm_packages where package_type_id = + (select package_type_id from application_types + where object_type + like '%cms.Service%') + ); + +-- delete all entries for Service instances in apm_packages +-- identified by package_type_id in application_types +delete from apm_packages + where package_type_id = + (select package_type_id from application_types + where object_type + like '%cms.Service%') ; + +-- there seem to be no intries for a apm_packages_types entry (row) in +-- acs_objects or object_context! + +-- delete all entries for subsite in apm_package_types identified by +-- package_type_id in application_types +alter table application_types drop constraint applica_typ_pac_typ_id_f_v80ma ; +delete from apm_package_types + where package_type_id = + (select package_type_id from application_types + where object_type + like '%cms.Service%') ; + + +-- set package_id to null for all entries referring to a Service instance +-- (indicating a new legacy free application) +update applications + set package_id = null + where application_type_id = + (select application_type_id from application_types + where object_type + like '%cms.Service%') ; + +-- set package_id to null for all entries referring to a Service instance +-- (indicating a new legacy free application) +update application_types + set package_type_id = null + where object_type like '%cms.Service%' ; + +alter table application_types add constraint applica_typ_pac_typ_id_f_v80ma + FOREIGN KEY (package_type_id) + REFERENCES apm_package_types (package_type_id) + MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION ; +alter table applications add constraint application_package_id_f_cdaho + FOREIGN KEY (package_id) + REFERENCES apm_packages (package_id) MATCH SIMPLE + ON UPDATE NO ACTION ON DELETE NO ACTION ; +alter table apm_packages add constraint apm_package_package_id_f_46may + FOREIGN KEY (package_id) + REFERENCES acs_objects (object_id) MATCH SIMPLE + ON UPDATE NO ACTION ON DELETE NO ACTION ; diff --git a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.6-6.6.7/remove_workspace_legacy_entries.sql b/ccm-cms/sql/ccm-cms/default/upgrade/6.6.6-6.6.7/remove_workspace_legacy_entries.sql new file mode 100644 index 000000000..b28b2d430 --- /dev/null +++ b/ccm-cms/sql/ccm-cms/default/upgrade/6.6.6-6.6.7/remove_workspace_legacy_entries.sql @@ -0,0 +1,131 @@ +-- +-- 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: remove_workspace_legacy_entries.sql $ + +-- ccm-cms Workspace (content-center) is now initialized as a legacy free type +-- of application so entries in tables apm_package_types are no longer needed. + + +-- in case there may be several application instances! + +-- delete from object_context all entries referring to node_id in site_nodes +delete from object_context + where object_id in + (select node_id from site_nodes object_id where object_id in + ( select package_id from applications where application_type_id = + (select application_type_id from application_types + where object_type + like '%cms.Workspace%') + ) + ); + +-- delete from acs_objects all entries referring to node_id in site_nodes +alter table site_nodes drop constraint site_nodes_node_id_f_n1m2y ; +delete from acs_objects + where object_id in + (select node_id from site_nodes where object_id in + ( select package_id from applications where application_type_id = + (select application_type_id from application_types + where object_type + like '%cms.Workspace%') + ) + ); + +-- delete all entries in site_nodes referring to a Workspace instance +delete from site_nodes + where object_id in + (select package_id from applications where application_type_id = + (select application_type_id from application_types + where object_type + like '%cms.Workspace%') + ); +alter table site_nodes add constraint site_nodes_node_id_f_n1m2y + FOREIGN KEY (node_id) + REFERENCES acs_objects (object_id) MATCH SIMPLE + ON UPDATE NO ACTION ON DELETE NO ACTION ; + + + +-- delete from object_context all entries referring to package_id in apm_packages +delete from object_context + where object_id in + (select package_id from apm_packages where package_type_id = + (select package_type_id from application_types + where object_type + like '%cms.Workspace%') + ); + +-- delete from acs_objects all entries referring to package_id in apm_packages +alter table apm_packages drop constraint apm_package_package_id_f_46may ; +alter table applications drop constraint application_package_id_f_cdaho ; +delete from acs_objects + where object_id in + (select package_id from apm_packages where package_type_id = + (select package_type_id from application_types + where object_type + like '%cms.Workspace%') + ); + +-- delete all entries for Workspace instances in apm_packages +-- identified by package_type_id in application_types +delete from apm_packages + where package_type_id = + (select package_type_id from application_types + where object_type + like '%cms.Workspace%') ; + +-- there seem to be no intries for a apm_packages_types entry (row) in +-- acs_objects or object_context! + +-- delete all entries for subsite in apm_package_types identified by +-- package_type_id in application_types +alter table application_types drop constraint applica_typ_pac_typ_id_f_v80ma ; +delete from apm_package_types + where package_type_id = + (select package_type_id from application_types + where object_type + like '%cms.Workspace%') ; + + +-- set package_id to null for all entries referring to a Workspace instance +-- (indicating a new legacy free application) +update applications + set package_id = null + where application_type_id = + (select application_type_id from application_types + where object_type + like '%cms.Workspace%') ; + +-- set package_id to null for all entries referring to a Workspace instance +-- (indicating a new legacy free application) +update application_types + set package_type_id = null + where object_type like '%cms.Workspace%' ; + +alter table application_types add constraint applica_typ_pac_typ_id_f_v80ma + FOREIGN KEY (package_type_id) + REFERENCES apm_package_types (package_type_id) + MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION ; +alter table applications add constraint application_package_id_f_cdaho + FOREIGN KEY (package_id) + REFERENCES apm_packages (package_id) MATCH SIMPLE + ON UPDATE NO ACTION ON DELETE NO ACTION ; +alter table apm_packages add constraint apm_package_package_id_f_46may + FOREIGN KEY (package_id) + REFERENCES acs_objects (object_id) MATCH SIMPLE + ON UPDATE NO ACTION ON DELETE NO ACTION ; diff --git a/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.6.6-6.6.7.sql b/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.6.6-6.6.7.sql new file mode 100644 index 000000000..e835a3791 --- /dev/null +++ b/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.6.6-6.6.7.sql @@ -0,0 +1,25 @@ +-- +-- 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: oracle-se-6.6.6-6.6.7.sql 2012-03-26 15:10:39Z pboy $ + +-- Update: content-center (Workspace) & CMS Service now loaded as +-- legacy free application +PROMPT Red Hat Enterprise CMS 6.6.6 -> 6.6.7 Upgrade Script (Oracle) + +@@ ../default/upgrade/6.6.6-6.6.7/remove_workspace_legacy_entries.sql +@@ ../default/upgrade/6.6.6-6.6.7/remove_service_legacy_entries.sql diff --git a/ccm-cms/sql/ccm-cms/upgrade/postgres-6.6.6-6.6.7.sql b/ccm-cms/sql/ccm-cms/upgrade/postgres-6.6.6-6.6.7.sql new file mode 100644 index 000000000..636215533 --- /dev/null +++ b/ccm-cms/sql/ccm-cms/upgrade/postgres-6.6.6-6.6.7.sql @@ -0,0 +1,30 @@ +-- +-- 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 +-- +-- $DateTime: 2011/09/06 23:15:09 $ +-- $Id: postgres-6.6.6-6.6.7.sql 2012-03-26 15:10:39Z pboy $ + +-- Update: content-center (Workspace) & CMS Service now loaded as +-- legacy free application +\echo Red Hat Enterprise CMS 6.6.6 -> 6.6.7 Upgrade Script (PostgreSQL) + +begin; + +\i ../default/upgrade/6.6.6-6.6.7/remove_workspace_legacy_entries.sql +\i ../default/upgrade/6.6.6-6.6.7/remove_service_legacy_entries.sql + +commit; diff --git a/ccm-cms/src/ccm-cms.upgrade b/ccm-cms/src/ccm-cms.upgrade index c68d2d58e..bffe7e28e 100755 --- a/ccm-cms/src/ccm-cms.upgrade +++ b/ccm-cms/src/ccm-cms.upgrade @@ -40,6 +40,7 @@