Removed old style application classes:

* kernel/SiteNode
* kernel/SiteNodeCollection
* kernel/Packages
* kernel/PackageTypes
* kernel/PackageInstanceCollection
* kernel/PackageEventListener
* kernel/PackageInstanceCollection
* kernel/PackageTypeCollection
* kernel/PackageInstance



git-svn-id: https://svn.libreccm.org/ccm/trunk@2056 8810af33-2d31-482b-a856-94f89814c4df

ccm-core/CHANGELOG

@@ -0,0 +1,3 @@
+
+Version 6.6.5 r1
+- Removed kernel.SiteNode / kernel.Packages / kernel.PackageTypes

ccm-core/application.xml

@@ -2,7 +2,7 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-core"
   prettyName="Core"
-  version="6.6.4"
+  version="6.6.5"
   release="1"
   shared="true"
   webapp="ROOT"

ccm-core/pdl/com/arsdigita/kernel/Package.pdl

@@ -1,84 +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
-//
-// $Id: Package.pdl 2141 2011-01-16 12:17:15Z pboy $
-// $DateTime: 2004/08/16 18:10:38 $
-model com.arsdigita.kernel;
-
-import com.arsdigita.globalization.*;
-
-object type PackageType {
-    BigDecimal id = apm_package_types.package_type_id INTEGER;
-    unique String[1..1] packageKey = apm_package_types.package_key VARCHAR(100);
-    unique String[1..1] prettyName = apm_package_types.pretty_name VARCHAR(100);
-    unique String prettyPlural = apm_package_types.pretty_plural VARCHAR(100);
-    unique String[1..1] packageURI = apm_package_types.package_uri VARCHAR(1500);
-    String dispatcherClass = apm_package_types.dispatcher_class VARCHAR(100);
-    // XXX: Deprecated.
-    String servletPackage = apm_package_types.servlet_package VARCHAR(100);
-
-//  deprecated
-//  Stylesheet[0..n] defaultStyle = join apm_package_types.package_type_id
-//                                    to acs_stylesheet_type_map.package_type_id,
-//                                  join acs_stylesheet_type_map.stylesheet_id
-//                                    to acs_stylesheets.stylesheet_id;
-    PackageListener[0..n] listener = 
-                           join apm_package_types.package_type_id 
-                             to apm_package_type_listener_map.package_type_id, 
-                           join apm_package_type_listener_map.listener_id 
-                             to apm_listeners.listener_id;
-    component PackageInstance[0..n] packageInstance =
-                    join apm_package_types.package_type_id 
-                      to apm_packages.package_type_id;
-
-    object key(id);
-}
-
-object type PackageListener {
-    unique String[1..1] listenerClass = apm_listeners.listener_class VARCHAR(100);
-    BigDecimal id = apm_listeners.listener_id INTEGER;
-    PackageType[0..n] packageType;
-    
-    object key (id);
-
-}
-
-object type PackageInstance extends ACSObject {
-    String prettyName = apm_packages.pretty_name VARCHAR(300);
-    SiteNode[0..n] mountPoint 
-        = join apm_packages.package_id to site_nodes.object_id;
-    composite PackageType[1..1] packageType 
-        = join apm_packages.package_type_id 
-            to apm_package_types.package_type_id;
-    Locale[0..1] locale 
-        = join apm_packages.locale_id to g11n_locales.locale_id;
-
-    reference key (apm_packages.package_id);
-
-    delete {
-        do {
-            UPDATE site_nodes
-            SET object_id = null
-            WHERE object_Id = :id
-        }
-        do {
-            DELETE from apm_packages
-            WHERE package_id = :id
-        }
-
-    }
-}

ccm-core/pdl/com/arsdigita/kernel/SiteNode.pdl

@@ -1,70 +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
-//
-// $Id: SiteNode.pdl 2141 2011-01-16 12:17:15Z pboy $
-// $DateTime: 2004/08/16 18:10:38 $
-model com.arsdigita.kernel;
-
-// SiteNode Object Type Definition
-//
-// A "site node" is a node in a URL hierarchy that can be mapped
-// to an application instance.
-//
-// @version "$Id: SiteNode.pdl 2141 2011-01-16 12:17:15Z pboy $"
-//
-
-object type SiteNode extends ACSObject {
-    String name = site_nodes.name VARCHAR(100);
-    String url = site_nodes.url VARCHAR(3000);
-
-    // If true, it is legal to create child nodes.
-    Boolean[1..1] isDirectory = site_nodes.directory_p BIT;
-
-    // If true, URLs that are logical children of this node should
-    // be mapped to this node, e.g. "www.arsdigita.com/news/item123"
-    // would be mapped to this node still.
-    Boolean[1..1] isPattern = site_nodes.pattern_p BIT;
-
-    SiteNode[0..1] parent = join site_nodes.parent_id to site_nodes.node_id;
-
-    component SiteNode[0..n] children =
-        join site_nodes.node_id to site_nodes.parent_id;
-
-    PackageInstance[0..1] mountedObject =
-        join site_nodes.object_id to apm_packages.package_id;
-
-//  Stylesheet[0..n] defaultStyle = join site_nodes.node_id
-//                                    to acs_stylesheet_node_map.node_id,
-//                                  join acs_stylesheet_node_map.stylesheet_id
-//                                    to acs_stylesheets.stylesheet_id;
-
-    unique (parent, name);
-
-    reference key ( site_nodes.node_id );
-
-    aggressive load (parent.id);
-}
-
-
-data operation updateSiteNodeDescendants {
-    do {
-        update site_nodes
-        set url = :newPrefix || substr(url, :oldPrefixLength + 1)
-        where url like :oldPrefix || '%'
-        and not node_id = :id
-    }
-}

ccm-core/pdl/com/arsdigita/kernel/Stylesheet.pdl.nolongerInUse

@@ -1,62 +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
-//
-// $Id: Stylesheet.pdl 287 2005-02-22 00:29:02Z sskracic $
-// $DateTime: 2004/08/16 18:10:38 $
-model com.arsdigita.kernel;
-
-import com.arsdigita.globalization.*;
-
-object type Stylesheet extends ACSObject {
-    String outputType = acs_stylesheets.output_type VARCHAR(50);
-    String pathName = acs_stylesheets.pathname VARCHAR(300);
-    // XXX: This might eventually link to the content repository.
-    BigDecimal itemID = acs_stylesheets.item_id INTEGER;
-    // XXX: This is a hack to allow filtering based on locale ID
-    //      Proper fix is to wait on persistence to give access
-    //      to 0..1 and 1..1 associations in filters (see Rafi)
-    BigDecimal localeID = acs_stylesheets.locale_id INTEGER;
-
-    PackageType[0..n] packageType = join acs_stylesheets.stylesheet_id
-                                      to acs_stylesheet_type_map.stylesheet_id,
-                                    join acs_stylesheet_type_map.package_type_id
-                                      to apm_package_types.package_type_id;
-    SiteNode[0..n] siteNode = join acs_stylesheets.stylesheet_id 
-                                to acs_stylesheet_node_map.stylesheet_id,
-                              join acs_stylesheet_node_map.node_id
-                                to site_nodes.node_id;
-    Locale[0..1] locale = join acs_stylesheets.locale_id 
-                            to g11n_locales.locale_id;
-
-    reference key (acs_stylesheets.stylesheet_id);
-}
-
-query allStyleSheets {
-    BigDecimal localeID;
-    BigDecimal itemID;
-    String pathName;
-    String outputType;
-    do {
-        SELECT ss.output_type, ss.pathname, ss.item_id, ss.locale_id
-        FROM acs_stylesheets
-    } map {
-        localeID = ss.locale_id;
-        outputType = ss.output_type;
-        pathName = ss.pathname;
-        itemID = ss.item_id;
-    }
-}

ccm-core/pdl/com/arsdigita/ui/sitemap/SiteMap.pdl

@@ -1,27 +0,0 @@
-//
-// Copyright (C) 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
-//
-// $Id: SiteMap.pdl 2284 2012-03-11 01:37:17Z pboy $
-// $DateTime: 2004/08/16 18:10:38 $
-model com.arsdigita.ui.sitemap;
-
-import com.arsdigita.web.Application;
-
-object type SiteMap extends Application {
-    // Nothing to store yet
-    // reference key (sitemap_app.application_id);
-}

ccm-core/pdl/com/arsdigita/ui/sitemap/Sitemap.ora.pdl

@@ -1,63 +0,0 @@
-//
-// Copyright (C) 2002-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
-//
-// $Id: Sitemap.ora.pdl 287 2005-02-22 00:29:02Z sskracic $
-// $DateTime: 2004/08/16 18:10:38 $
-model com.arsdigita.ui.sitemap;
-
-
-
-query getRootNode {
-    BigDecimal id;
-    String name;
-    BigDecimal nchild;
-    do {
-        select 'Root' as node_name, 
-               s1.node_id,
-               count(s2.node_id) as sub_count
-        from site_nodes s1,
-             site_nodes s2
-        where s1.node_id = :objectID
-          and s2.parent_id(+) = s1.node_id
-        group by s1.name, s1.node_id
-    } map {
-        id = s1.node_id;
-        name = node_name;
-        nchild = sub_count;
-    }
-}
-
-
-query getSubNodes {
-    BigDecimal id;
-    String name;
-    BigDecimal nchild;
-    do {
-        select s1.name,
-               s1.node_id,
-               count(s2.node_id) as sub_count
-        from site_nodes s1,
-             site_nodes s2
-        where s1.parent_id = :objectID
-          and s2.parent_id(+) = s1.node_id
-        group by s1.name, s1.node_id
-    } map {
-        id = s1.node_id;
-        name = s1.name;
-        nchild = sub_count;
-    }
-}

ccm-core/pdl/com/arsdigita/ui/sitemap/Sitemap.pg.pdl

@@ -1,61 +0,0 @@
-//
-// Copyright (C) 2002-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
-//
-// $Id: Sitemap.pg.pdl 287 2005-02-22 00:29:02Z sskracic $
-// $DateTime: 2004/08/16 18:10:38 $
-model com.arsdigita.ui.sitemap;
-
-
-
-query getRootNode {
-    BigDecimal id;
-    String name;
-    BigDecimal nchild;
-    do {
-        select 'Root' as node_name, 
-               s1.node_id,
-               count(s2.node_id) as sub_count
-        from site_nodes s1 left outer join site_nodes s2 
-	     on (s2.parent_id = s1.node_id)
-        where s1.node_id = :objectID
-        group by s1.name, s1.node_id
-    } map {
-        id = s1.node_id;
-        name = node_name;
-        nchild = sub_count;
-    }
-}
-
-
-query getSubNodes {
-    BigDecimal id;
-    String name;
-    BigDecimal nchild;
-    do {
-        select s1.name,
-               s1.node_id,
-               count(s2.node_id) as sub_count
-        from site_nodes s1 left outer join site_nodes s2
-             on (s2.parent_id = s1.node_id)
-        where s1.parent_id = :objectID
-        group by s1.name, s1.node_id
-    } map {
-        id = s1.node_id;
-        name = s1.name;
-        nchild = sub_count;
-    }
-}

ccm-core/pdl/com/arsdigita/web/Application.pdl

@@ -19,8 +19,8 @@
 // $DateTime: 2004/08/16 18:10:38 $
 model com.arsdigita.web;
 
-import com.arsdigita.kernel.PackageInstance;
-import com.arsdigita.kernel.PackageType;
+// import com.arsdigita.kernel.PackageInstance;
+// import com.arsdigita.kernel.PackageType;
 import com.arsdigita.kernel.Resource;
 import com.arsdigita.kernel.ResourceType;
 import com.arsdigita.kernel.permissions.Privilege;
@@ -49,14 +49,14 @@ association {
             to application_types.provider_id;
 }
 
-association {
-    PackageType[0..1] packageType =
-        join application_types.package_type_id
-            to apm_package_types.package_type_id;
-    ApplicationType[0..n] applicationType =
-        join apm_package_types.package_type_id
-            to application_types.package_type_id;
-}
+// association {
+//     PackageType[0..1] packageType =
+//         join application_types.package_type_id
+//             to apm_package_types.package_type_id;
+//     ApplicationType[0..n] applicationType =
+//         join apm_package_types.package_type_id
+//             to application_types.package_type_id;
+// }
 
 object type Application extends Resource {
     String primaryURL = applications.primary_url VARCHAR(4000);
@@ -64,47 +64,47 @@ object type Application extends Resource {
 }
 
 
-association {
-    PackageInstance[0..1] packageInstance =
-        join applications.package_id to apm_packages.package_id;
-    Application[0..1] application =
-        join apm_packages.package_id to applications.package_id;
-}
+// association {
+//     PackageInstance[0..1] packageInstance =
+//         join applications.package_id to apm_packages.package_id;
+//     Application[0..1] application =
+//         join apm_packages.package_id to applications.package_id;
+// }
 
-query applicationForSiteNodeID {
-    Application application;
-
-    do {
-        select
-          acs_objects.object_id,
-          acs_objects.object_type,
-          acs_objects.display_name,
-          acs_objects.default_domain_class,
-          applications.parent_application_id,
-          applications.package_id,
-          applications.title,
-          applications.description,
-          applications.primary_url
-        from
-          site_nodes,
-          apm_packages,
-          applications,
-          acs_objects
-        where
-          site_nodes.node_id = :siteNodeID
-          -- joins
-          and site_nodes.object_id = apm_packages.package_id
-          and apm_packages.package_id = applications.package_id
-          and applications.application_id = acs_objects.object_id
-    } map {
-        application.id = acs_objects.object_id;
-        application.objectType = acs_objects.object_type;
-        application.displayName = acs_objects.display_name;
-        application.defaultDomainClass = acs_objects.default_domain_class;
-        application.parentResource.id = applications.parent_application_id;
-        application.packageInstance.id = applications.package_id;
-        application.title = applications.title;
-        application.description = applications.description;
-        application.primaryURL = applications.primary_url;
-    }
-}
+// query applicationForSiteNodeID {
+//     Application application;
+// 
+//     do {
+//         select
+//           acs_objects.object_id,
+//           acs_objects.object_type,
+//           acs_objects.display_name,
+//           acs_objects.default_domain_class,
+//           applications.parent_application_id,
+//           applications.package_id,
+//           applications.title,
+//           applications.description,
+//           applications.primary_url
+//         from
+//           site_nodes,
+//           apm_packages,
+//           applications,
+//           acs_objects
+//         where
+//           site_nodes.node_id = :siteNodeID
+//           -- joins
+//           and site_nodes.object_id = apm_packages.package_id
+//           and apm_packages.package_id = applications.package_id
+//           and applications.application_id = acs_objects.object_id
+//     } map {
+//         application.id = acs_objects.object_id;
+//         application.objectType = acs_objects.object_type;
+//         application.displayName = acs_objects.display_name;
+//         application.defaultDomainClass = acs_objects.default_domain_class;
+//         application.parentResource.id = applications.parent_application_id;
+//         application.packageInstance.id = applications.package_id;
+//         application.title = applications.title;
+//         application.description = applications.description;
+//         application.primaryURL = applications.primary_url;
+//     }
+// }

ccm-core/pdl/com/arsdigita/web/WebApp.pdl.nolongerInUse

@@ -26,10 +26,10 @@ model com.arsdigita.web;
 
 // Class WebApp seems to be quit unfinisched work and is commented out.
 // So we need no table for it.
-// We leave igt hefre vofr further reference. 
+// We leave it here for further reference. 
 // pboy April 2011
-object type WebApp {
+// object type WebApp {
 //  String[1..1] name = webapps.name VARCHAR(200);
-
+//
 //  object key (name);
-}
+// }

ccm-core/sql/ccm-core/default/categorization/index-cat_object_root_category_map.sql

@@ -19,5 +19,5 @@
 -- $DateTime: 2004/08/16 18:10:38 $
 
 create index cat_object_root_cat_object_idx on cat_object_root_category_map(object_id);
-create index cat_object_root_cat_pkg_idx on cat_object_root_category_map(package_id);
+-- create index cat_object_root_cat_pkg_idx on cat_object_root_category_map(package_id);
 create index cat_object_root_cat_rt_cat_idx on cat_object_root_category_map(root_category_id);

ccm-core/sql/ccm-core/default/categorization/table-cat_object_root_category_map.sql

@@ -19,13 +19,13 @@
 -- $DateTime: 2004/08/16 18:10:38 $
 
 create table cat_object_root_category_map (
-       root_category_id           integer
+       root_category_id          integer
                                  constraint cat_obj_root_map_fk
                                  references cat_categories on delete cascade,
-       package_id                integer
-                                 constraint cat_obj_package_id_fk
-                                 references apm_packages 
-                                 on delete cascade,
+--(pb) package_id                integer
+--(pb)                           constraint cat_obj_package_id_fk
+--(pb)                           references apm_packages 
+--(pb)                           on delete cascade,
        -- most of the time the object_id is actually going to
        -- be a user_id and used for personalizing categories
        -- hierarchies within a package

ccm-core/sql/ccm-core/default/kernel/index-acs_stylesheet_type_map.sql

@@ -1,22 +0,0 @@
---
--- Copyright (C) 2002-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
---
--- $Id: index-acs_stylesheet_type_map.sql 287 2005-02-22 00:29:02Z sskracic $
--- $DateTime: 2004/08/16 18:10:38 $
-
-create index acs_stylesheet_type_pkg_idx on acs_stylesheet_type_map(stylesheet_id);
-create index acs_stylesheet_type_sheet_idx on acs_stylesheet_type_map(package_type_id);

ccm-core/sql/ccm-core/default/kernel/index-apm_packages.sql

@@ -1,22 +0,0 @@
---
--- Copyright (C) 2002-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
---
--- $Id: index-apm_packages.sql 287 2005-02-22 00:29:02Z sskracic $
--- $DateTime: 2004/08/16 18:10:38 $
-
-create index apm_packages_locale_id_idx on apm_packages(locale_id);
-create index apm_packages_package_type_idx on apm_packages(package_type_id);

ccm-core/sql/ccm-core/default/kernel/index-foreign_keys.sql

@@ -19,7 +19,7 @@
 -- $DateTime: 2004/08/16 18:10:38 $
 
 create index ACS_PERMISSIONS_PRIVILEGE_idx on ACS_PERMISSIONS(PRIVILEGE);
-create index APM_PTYP_LSTNR_MP_LSTNR_ID_idx on APM_PACKAGE_TYPE_LISTENER_MAP(LISTENER_ID);
+-- (pb) create index APM_PTYP_LSTNR_MP_LSTNR_ID_idx on APM_PACKAGE_TYPE_LISTENER_MAP(LISTENER_ID);
 create index CAT_CATCAT_MAP_RLTD_CAT_ID_idx on CAT_CATEGORY_CATEGORY_MAP(RELATED_CATEGORY_ID);
 create index CAT_CAT_PURP_MAP_PURP_ID_idx on CAT_CATEGORY_PURPOSE_MAP(PURPOSE_ID);
 create index BEBOP_COMP_HRCHY_COMP_ID_idx on BEBOP_COMPONENT_HIERARCHY(COMPONENT_ID);

ccm-core/sql/ccm-core/default/kernel/view-object_package_map.sql

@@ -1,28 +0,0 @@
---
--- Copyright (C) 2002-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
---
--- $Id: view-object_package_map.sql 287 2005-02-22 00:29:02Z sskracic $
--- $DateTime: 2004/08/16 18:10:38 $
-
-create view object_package_map as
-select o.object_id, p.package_id
-from acs_objects o, apm_packages p
-where p.package_id=o.object_id 
-   or p.package_id in (select container_id
-                       from object_container_map
-                       start with object_id = o.object_id
-                       connect by prior container_id = object_id);

ccm-core/sql/ccm-core/default/web/index-application_types.sql

@@ -18,5 +18,5 @@
 -- $Id: index-application_types.sql 287 2005-02-22 00:29:02Z sskracic $
 -- $DateTime: 2004/08/16 18:10:38 $
 
-create index appli_typ_package_type_id_idx on application_types(package_type_id);
+-- (pb) create index appli_typ_package_type_id_idx on application_types(package_type_id);
 create index appli_typ_provider_id_idx on application_types(provider_id);

ccm-core/sql/ccm-core/default/web/index-applications.sql

@@ -19,5 +19,5 @@
 -- $DateTime: 2004/08/16 18:10:38 $
 
 create index applicati_applicati_typ_id_idx on applications(application_type_id);
-create index applicati_package_id_idx on applications(package_id);
+-- (pb) create index applicati_package_id_idx on applications(package_id);
 create index applicati_parent_app_id_idx on applications(parent_application_id);

ccm-core/sql/ccm-core/oracle-se-create.sql

@@ -125,19 +125,19 @@
 @@ default/kernel/insert-groups.sql
 @@ default/kernel/insert-permissions.sql
 
-@@ default/kernel/index-site_nodes.sql
-@@ default/kernel/index-apm_packages.sql
-@@ default/kernel/index-apm_package_type_listener_map.sql
-@@ default/kernel/view-object_package_map.sql
+-- (pb) @@ default/kernel/index-site_nodes.sql
+-- (pb) @@ default/kernel/index-apm_packages.sql
+-- (pb) @@ default/kernel/index-apm_package_type_listener_map.sql
+-- (pb) @@ default/kernel/view-object_package_map.sql
 
 -- @@ default/kernel/index-acs_stylesheets.sql
 -- @@ default/kernel/index-acs_stylesheet_type_map.sql
 -- @@ default/kernel/index-acs_stylesheet_node_map.sql
-@@ default/kernel/function-package_id_for_object_id.sql
+-- (pb) @@ default/kernel/function-package_id_for_object_id.sql
 
 @@ default/kernel/constraint-email_addresses.sql
 @@ default/kernel/constraint-group_subgroup_map.sql
-@@ default/kernel/constraint-site_nodes.sql
+-- (pb) @@ default/kernel/constraint-site_nodes.sql
 @@ default/kernel/constraint-roles.sql
 
 @@ default/categorization/index-cat_cat_deflt_ancestors.sql

ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/function-package_id_for_object_id.sql

@@ -1,41 +0,0 @@
---
--- Copyright (C) 2002-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
---
--- $Id: function-package_id_for_object_id.sql 287 2005-02-22 00:29:02Z sskracic $
--- $DateTime: 2004/08/16 18:10:38 $
-
-create or replace function package_id_for_object_id(v_object_id INTEGER)
-return INTEGER
-as
-    v_package_id apm_packages.package_id%TYPE;
-    cursor containers is (select package_id from apm_packages
-        where package_id in (select container_id 
-        from object_container_map
-        start with object_id = v_object_id
-        connect by prior container_id = object_id 
-        union select v_object_id from dual));
-begin
-    open containers;
-    fetch containers into v_package_id;
-    if (containers%NOTFOUND) then
-       return null;
-    else 
-       return v_package_id;
-    end if;
-end;
-/ 
-show errors;

ccm-core/sql/ccm-core/postgres-create.sql

@@ -63,7 +63,7 @@ begin;
 \i default/kernel/index-party_email_map.sql
 \i default/kernel/index-users.sql
 \i default/kernel/index-user_authentication.sql
-\i default/kernel/index-apm_package_type_listener_map.sql
+--   \i default/kernel/index-apm_package_type_listener_map.sql
 
 \i default/kernel/index-group_member_map_group_id_idx.sql
 \i default/kernel/index-group_subgroup_map_grp_id_idx.sql
@@ -120,7 +120,7 @@ begin;
 \i postgres/kernel/function-package_id_for_object_id.sql
 \i default/kernel/constraint-email_addresses.sql
 \i default/kernel/constraint-group_subgroup_map.sql
-\i default/kernel/constraint-site_nodes.sql
+--  \i default/kernel/constraint-site_nodes.sql
 \i default/kernel/constraint-roles.sql
 
 -- XXX

ccm-core/sql/ccm-core/upgrade/default/6.6.4-6.6.5/remove_old_app_entries_applications-table.sql

@@ -1,5 +1,5 @@
 --
--- Copyright (C) 2002-2004 Red Hat Inc. All Rights Reserved.
+-- Copyright (C) 2013 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
@@ -15,7 +15,8 @@
 -- 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: index-acs_stylesheets.sql 287 2005-02-22 00:29:02Z sskracic $
--- $DateTime: 2004/08/16 18:10:38 $
+-- $Id: remove_old_app_entries_applications_table.sql  $
 
-create index acs_stylesheets_locale_id_idx on acs_stylesheets(locale_id);
+
+-- remove column package_id 
+ALTER TABLE ONLY applications DROP COLUMN package_id;

ccm-core/sql/ccm-core/upgrade/default/6.6.4-6.6.5/remove_old_app_entries_applicationtypes-table.sql

@@ -1,5 +1,5 @@
 --
--- Copyright (C) 2002-2004 Red Hat Inc. All Rights Reserved.
+-- Copyright (C) 2013 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
@@ -15,8 +15,8 @@
 -- 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: constraint-site_nodes.sql 287 2005-02-22 00:29:02Z sskracic $
--- $DateTime: 2004/08/16 18:10:38 $
+-- $Id: remove_old_app_entries_applicationtypes_table.sql  $
 
-alter table site_nodes add
-  constraint site_nodes_name_ck check (name not like '%/%');
+
+-- remove column package_id 
+ALTER TABLE ONLY application_types DROP COLUMN package_type_id;

ccm-core/sql/ccm-core/upgrade/default/6.6.4-6.6.5/remove_old_app_entries_catobjectroot-table.sql

@@ -1,5 +1,5 @@
 --
--- Copyright (C) 2002-2004 Red Hat Inc. All Rights Reserved.
+-- Copyright (C) 2013 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
@@ -15,7 +15,8 @@
 -- 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: index-apm_package_type_listener_map.sql 287 2005-02-22 00:29:02Z sskracic $
--- $DateTime: 2004/08/16 18:10:38 $
+-- $Id: remove_old_app_entries_catobjectroot_table.sql  $
 
-create index apm_pac_typ_lis_map_p_t_id_idx on apm_package_type_listener_map(package_type_id);
+
+-- remove column package_id 
+ALTER TABLE ONLY cat_object_root_category_map DROP COLUMN package_id;

ccm-core/sql/ccm-core/upgrade/default/6.6.4-6.6.5/remove_old_style_app_tables.sql

@@ -1,5 +1,5 @@
 --
--- Copyright (C) 2002-2004 Red Hat Inc. All Rights Reserved.
+-- Copyright (C) 2013 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
@@ -15,8 +15,17 @@
 -- 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: index-acs_stylesheet_node_map.sql 287 2005-02-22 00:29:02Z sskracic $
--- $DateTime: 2004/08/16 18:10:38 $
+-- $Id: remove_old_style_app_tables.sql  $
 
-create index acs_stylesheet_node_node_idx on acs_stylesheet_node_map(node_id);
-create index acs_stylesheet_node_sheet_idx on acs_stylesheet_node_map(stylesheet_id);
+-- Old style application code in kernel.Packages etc and kernel.SiteNode
+-- is no longer used and the corresponding tables are to be removed.
+-- This update must be executed AFTER all applications are migrated to new
+-- style.
+
+
+-- drop tables
+drop table apm_package_type_listener_map ;
+drop table apm_listeners ;
+drop table site_nodes;
+drop table apm_packages CASCADE;
+drop table apm_package_types CASCADE;

ccm-core/sql/ccm-core/upgrade/default/6.6.4-6.6.5/remove_sitemap_app_table.sql

@@ -1,5 +1,5 @@
 --
--- Copyright (C) 2002-2004 Red Hat Inc. All Rights Reserved.
+-- Copyright (C) 2013 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
@@ -15,10 +15,13 @@
 -- 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: index-site_nodes.sql 287 2005-02-22 00:29:02Z sskracic $
--- $DateTime: 2004/08/16 18:10:38 $
+-- $Id: remove_old_style_app_tables.sql  $
 
-create index site_nodes_object_id_idx on site_nodes (object_id);
-create index site_nodes_parent_id_idx on site_nodes (parent_id);
+-- Old style application code in kernel.Packages etc and kernel.SiteNode
+-- is no longer used and the corresponding tables are to be removed.
+-- This update must be executed AFTER all applications are migrated to new
+-- style.
 
-create unique index site_nodes_url_idx on site_nodes (url);
+
+-- drop tables
+drop table sitemap_app ;

ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.4-6.6.5.sql

@@ -0,0 +1,37 @@
+--
+-- Copyright (C) 2013 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.4-6.6.5.sql 293 2013-01-31 15:10:39Z pboy $
+
+PROMPT Red Hat Enterprise CORE 6.6.4 -> 6.6.5 Upgrade Script (Oracle)
+
+-- 
+
+-- Remove bebop entries in apm_package* which are not used anymore.
+--@@ default/6.6.3-6.6.4/remove_bebop_legacy_entries.sql
+
+-- Remove DS entries in apm_package* which are not used anymore.
+--@@ default/6.6.3-6.6.4/remove_ds_legacy_entries.sql
+
+-- Remove sitemap entries in apm_package* which are not used anymore.
+--@@ default/6.6.3-6.6.4/remove_sitemap_legacy_entries.sql
+
+-- Remove admin entries in apm_package* which are not used anymore.
+--@@ default/6.6.3-6.6.4/remove_admin_legacy_entries.sql
+
+-- Remove permissions entries in apm_package* which are not used anymore.
+--@@ default/6.6.3-6.6.4/remove_permissions_legacy_entries.sql