diff --git a/ccm-shortcuts/doc/shortcuts-standalone/README b/ccm-shortcuts/doc/shortcuts-standalone/README index 94b48a697..c07fad383 100644 --- a/ccm-shortcuts/doc/shortcuts-standalone/README +++ b/ccm-shortcuts/doc/shortcuts-standalone/README @@ -1,5 +1,5 @@ Up to APLAWS version 1.0.4 shortcuts had been installed into its own -application context: [webapps]/ccm-shortcuts. +application context: [webapps]/ccm-ldn-shortcuts. Now it is installed inside the main APLAWS application context along with all other applications. @@ -8,7 +8,7 @@ If shortcuts should be installed as its own web context again following modifications are necessary: 1. remove webapp="xxx" from application.xml 2. move the files in this dir to WEB-INF/ -3. change src/com/ad/shortcuts/Shortcuts.java +3. change src/com/ad/london/shortcuts/Shortcuts.java method getServletContext() as back to "/files" 4. edit __ccm__/.../xsl/index.xsl according the comment 5. edit in ccm-ldn-aplaws /web/__ccm__/themes/aplaws/shortcuts.xml diff --git a/ccm-shortcuts/doc/shortcuts-standalone/web.xml b/ccm-shortcuts/doc/shortcuts-standalone/web.xml index 929964e2d..7084c53ec 100755 --- a/ccm-shortcuts/doc/shortcuts-standalone/web.xml +++ b/ccm-shortcuts/doc/shortcuts-standalone/web.xml @@ -8,7 +8,7 @@ com.arsdigita.web.ContextRegistrationServlet uri - /ccm-shortcuts/ + /ccm-ldn-shortcuts/ 1 @@ -18,7 +18,7 @@ com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-shortcuts + /templates/ccm-ldn-shortcuts diff --git a/ccm-shortcuts/doc/web.xml-shortcuts.in b/ccm-shortcuts/doc/web.xml-shortcuts.in index 3d831840b..b1aa87ccd 100644 --- a/ccm-shortcuts/doc/web.xml-shortcuts.in +++ b/ccm-shortcuts/doc/web.xml-shortcuts.in @@ -4,13 +4,13 @@ com.arsdigita.web.ApplicationFileServlet template-path - /templates/ccm-shortcuts + /templates/ccm-ldn-shortcuts shortcuts-files - /ccm-shortcuts/files/* + /ccm-ldn-shortcuts/files/* diff --git a/ccm-shortcuts/pdl/com/arsdigita/london/shortcuts/Shortcut.pdl b/ccm-shortcuts/pdl/com/arsdigita/london/shortcuts/Shortcut.pdl new file mode 100755 index 000000000..3d92347a3 --- /dev/null +++ b/ccm-shortcuts/pdl/com/arsdigita/london/shortcuts/Shortcut.pdl @@ -0,0 +1,11 @@ +model com.arsdigita.london.shortcuts; + +object type Shortcut { + + BigDecimal[1..1] shortcutID = sc_shortcuts.shortcut_id INTEGER; + String[1..1] urlKey = sc_shortcuts.url_key VARCHAR(1000); + String[1..1] redirect = sc_shortcuts.redirect VARCHAR(1000); + + object key (shortcutID); +} + diff --git a/ccm-shortcuts/pdl/com/arsdigita/shortcuts/Shortcuts.pdl b/ccm-shortcuts/pdl/com/arsdigita/london/shortcuts/Shortcuts.pdl similarity index 79% rename from ccm-shortcuts/pdl/com/arsdigita/shortcuts/Shortcuts.pdl rename to ccm-shortcuts/pdl/com/arsdigita/london/shortcuts/Shortcuts.pdl index 4f949cc7a..704dc2264 100755 --- a/ccm-shortcuts/pdl/com/arsdigita/shortcuts/Shortcuts.pdl +++ b/ccm-shortcuts/pdl/com/arsdigita/london/shortcuts/Shortcuts.pdl @@ -15,13 +15,10 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -model com.arsdigita.shortcuts; +model com.arsdigita.london.shortcuts; import com.arsdigita.web.Application; object type Shortcuts extends Application { - // nothing to persist - // there is only one instance of shortcuts (the admin application) and - // no instance specific settings to be persisted. - // reference key (sc_app.application_id); + reference key (sc_app.application_id); } diff --git a/ccm-shortcuts/pdl/com/arsdigita/shortcuts/Shortcut.pdl b/ccm-shortcuts/pdl/com/arsdigita/shortcuts/Shortcut.pdl deleted file mode 100755 index c151db86d..000000000 --- a/ccm-shortcuts/pdl/com/arsdigita/shortcuts/Shortcut.pdl +++ /dev/null @@ -1,28 +0,0 @@ -// -// Copyright (C) 2001-2004 Red Hat Inc. 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 - -model com.arsdigita.shortcuts; - -object type Shortcut { - - BigDecimal[1..1] shortcutID = sc_shortcuts.shortcut_id INTEGER; - String[1..1] urlKey = sc_shortcuts.url_key VARCHAR(1000); - String[1..1] redirect = sc_shortcuts.redirect VARCHAR(1000); - - object key (shortcutID); -} - diff --git a/ccm-shortcuts/sql/ccm-shortcuts/default/sequence-ss_shortcuts_seq.sql b/ccm-shortcuts/sql/ccm-ldn-shortcuts/default/sequence-ss_shortcuts_seq.sql similarity index 100% rename from ccm-shortcuts/sql/ccm-shortcuts/default/sequence-ss_shortcuts_seq.sql rename to ccm-shortcuts/sql/ccm-ldn-shortcuts/default/sequence-ss_shortcuts_seq.sql diff --git a/ccm-shortcuts/sql/ccm-shortcuts/default/table-sc_shortcuts.sql b/ccm-shortcuts/sql/ccm-ldn-shortcuts/default/table-sc_shortcuts.sql similarity index 100% rename from ccm-shortcuts/sql/ccm-shortcuts/default/table-sc_shortcuts.sql rename to ccm-shortcuts/sql/ccm-ldn-shortcuts/default/table-sc_shortcuts.sql diff --git a/ccm-shortcuts/sql/ccm-shortcuts/oracle-se-create.sql b/ccm-shortcuts/sql/ccm-ldn-shortcuts/oracle-se-create.sql similarity index 100% rename from ccm-shortcuts/sql/ccm-shortcuts/oracle-se-create.sql rename to ccm-shortcuts/sql/ccm-ldn-shortcuts/oracle-se-create.sql diff --git a/ccm-shortcuts/sql/ccm-shortcuts/postgres-create.sql b/ccm-shortcuts/sql/ccm-ldn-shortcuts/postgres-create.sql similarity index 100% rename from ccm-shortcuts/sql/ccm-shortcuts/postgres-create.sql rename to ccm-shortcuts/sql/ccm-ldn-shortcuts/postgres-create.sql diff --git a/ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/drop_app_table.sql b/ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/drop_app_table.sql deleted file mode 100644 index e8b00a5a9..000000000 --- a/ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/drop_app_table.sql +++ /dev/null @@ -1,23 +0,0 @@ --- --- 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: drop_app_table.sql pboy $ - --- drops table subsite_app which just contained application type id and is --- never used for any action. - -drop table sc_app ; diff --git a/ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/remove_legacy_entries.sql b/ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/remove_legacy_entries.sql deleted file mode 100644 index 9e8935e0c..000000000 --- a/ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/remove_legacy_entries.sql +++ /dev/null @@ -1,131 +0,0 @@ --- --- 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: remove_legacy_entries.sql $ - --- Subsite 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 '%shortcuts.Shortcuts%') - ) - ); - --- 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 '%shortcuts.Shortcuts%') - ) - ); - --- delete all entries in site_nodes referring to a subsite 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 '%shortcuts.Shortcuts%') - ); -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 'com.arsdigita.shortcuts.Shortcuts') - ); - --- 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 'com.arsdigita.shortcuts.Shortcuts') - ); - --- delete all entries for subsite 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 'com.arsdigita.shortcuts.Shortcuts') ; - --- 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 'com.arsdigita.shortcuts.Shortcuts') ; - - --- set package_id to null for all entries referring to a subsite 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 'com.arsdigita.shortcuts.Shortcuts') ; - --- set package_id to null for all entries referring to a subsite instance --- (indicating a new legacy free application) -update application_types - set package_type_id = null - where object_type like 'com.arsdigita.shortcuts.Shortcuts' ; - -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-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql b/ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql deleted file mode 100644 index 6b8f03e73..000000000 --- a/ccm-shortcuts/sql/ccm-shortcuts/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql +++ /dev/null @@ -1,66 +0,0 @@ --- --- 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: upd_system_tables.sql pboy $ - --- adjust various system tables to the new name of application shortcuts - -alter table init_requirements drop constraint init_requirements_init_f_cmmdn ; - -alter table init_requirements drop constraint init_require_requ_init_f_i6rgg ; - -update inits - set class_name=replace(class_name,'london.shortcuts', 'shortcuts') - where class_name like '%london.shortcuts%' ; - -update init_requirements - set init=replace(init,'london.shortcuts', 'shortcuts') - where init like '%london.shortcuts%' ; - -update init_requirements - set required_init=replace(required_init,'london.shortcuts', 'shortcuts') - where required_init like '%london.shortcuts%' ; - -ALTER TABLE ONLY init_requirements - ADD CONSTRAINT init_requirements_init_f_cmmdn FOREIGN KEY (init) - REFERENCES inits (class_name) MATCH SIMPLE - ON UPDATE NO ACTION ON DELETE NO ACTION; - -ALTER TABLE init_requirements - ADD CONSTRAINT init_require_requ_init_f_i6rgg FOREIGN KEY (required_init) - REFERENCES inits (class_name) MATCH SIMPLE - ON UPDATE NO ACTION ON DELETE NO ACTION; - - -update application_types - set object_type=replace(object_type,'london.shortcuts', 'shortcuts') - where object_type like '%london.shortcuts%' ; - --- table applications doesn't require an update - --- table apm_package_types doesn't require an update - --- table apm_packages doesn't require an update either --- table site_nodes doesn't require an update either - - --- update application type in acs_objects -update acs_objects - set (object_type,default_domain_class) = - (replace(object_type,'london.shortcuts', 'shortcuts') , - replace(default_domain_class,'london.shortcuts', 'shortcuts') ) - where object_type like '%london.shortcuts%' ; diff --git a/ccm-shortcuts/sql/ccm-shortcuts/upgrade/oracle-se-6.6.0-6.6.1.sql b/ccm-shortcuts/sql/ccm-shortcuts/upgrade/oracle-se-6.6.0-6.6.1.sql deleted file mode 100644 index 9cd2cc501..000000000 --- a/ccm-shortcuts/sql/ccm-shortcuts/upgrade/oracle-se-6.6.0-6.6.1.sql +++ /dev/null @@ -1,30 +0,0 @@ --- --- 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 --- --- $DateTime: 2011/03/27 23:15:09 $ --- $Id: oracle-se-6.6.0-6.6.1 pboy $ - --- drop table subsite_app - not needed anyway -@@ default/6.6.0-6.6.1/drop_app_table.sql --- rename table containing defined subsites following ccm naming conventions -@@ default/6.6.0-6.6.1/ren_sites_table.sql --- rename application from london.subsite to subsite -@@ default/6.6.0-6.6.1/upd_system_tables.sql --- remove legacy compatible bits -@@ 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 diff --git a/ccm-shortcuts/sql/ccm-shortcuts/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-shortcuts/sql/ccm-shortcuts/upgrade/postgres-6.6.0-6.6.1.sql deleted file mode 100644 index 453c8ce95..000000000 --- a/ccm-shortcuts/sql/ccm-shortcuts/upgrade/postgres-6.6.0-6.6.1.sql +++ /dev/null @@ -1,33 +0,0 @@ --- --- 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 --- --- $DateTime: 2010/11/10 23:15:09 $ - -\echo Red Hat Enterprise ccm-shortcuts 6.6.0 -> 6.6.1 Upgrade Script (PostgreSQL) - -begin; - --- drop table sc_app - not needed anyway -\i default/6.6.0-6.6.1/drop_app_table.sql - --- rename application from london.shortcuts to shortcuts -\i default/6.6.0-6.6.1/upd_system_tables.sql - --- remove legacy compatible bits -\i default/6.6.0-6.6.1/remove_legacy_entries.sql - -commit; diff --git a/ccm-shortcuts/src/ccm-ldn-shortcuts.config b/ccm-shortcuts/src/ccm-ldn-shortcuts.config new file mode 100755 index 000000000..27cae8844 --- /dev/null +++ b/ccm-shortcuts/src/ccm-ldn-shortcuts.config @@ -0,0 +1,5 @@ + + + + diff --git a/ccm-shortcuts/src/ccm-shortcuts.load b/ccm-shortcuts/src/ccm-ldn-shortcuts.load similarity index 58% rename from ccm-shortcuts/src/ccm-shortcuts.load rename to ccm-shortcuts/src/ccm-ldn-shortcuts.load index 11290a457..fb904ca6b 100755 --- a/ccm-shortcuts/src/ccm-shortcuts.load +++ b/ccm-shortcuts/src/ccm-ldn-shortcuts.load @@ -8,10 +8,10 @@ - + - - + + diff --git a/ccm-shortcuts/src/ccm-shortcuts.config b/ccm-shortcuts/src/ccm-shortcuts.config deleted file mode 100755 index 201a6b1a1..000000000 --- a/ccm-shortcuts/src/ccm-shortcuts.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/ccm-shortcuts/src/ccm-shortcuts.upgrade b/ccm-shortcuts/src/ccm-shortcuts.upgrade deleted file mode 100755 index 3ba556601..000000000 --- a/ccm-shortcuts/src/ccm-shortcuts.upgrade +++ /dev/null @@ -1,5 +0,0 @@ - - -