diff --git a/ccm-core/CHANGELOG b/ccm-core/CHANGELOG
new file mode 100644
index 000000000..69db44d41
--- /dev/null
+++ b/ccm-core/CHANGELOG
@@ -0,0 +1,3 @@
+
+Version 6.6.5 r1
+- Removed kernel.SiteNode / kernel.Packages / kernel.PackageTypes
diff --git a/ccm-core/application.xml b/ccm-core/application.xml
index b0ae8de49..f27c6030d 100755
--- a/ccm-core/application.xml
+++ b/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"
diff --git a/ccm-core/pdl/com/arsdigita/kernel/Package.pdl b/ccm-core/pdl/com/arsdigita/kernel/Package.pdl
deleted file mode 100755
index 8da307ee4..000000000
--- a/ccm-core/pdl/com/arsdigita/kernel/Package.pdl
+++ /dev/null
@@ -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
-        }
-
-    }
-}
diff --git a/ccm-core/pdl/com/arsdigita/kernel/SiteNode.pdl b/ccm-core/pdl/com/arsdigita/kernel/SiteNode.pdl
deleted file mode 100755
index 79febec12..000000000
--- a/ccm-core/pdl/com/arsdigita/kernel/SiteNode.pdl
+++ /dev/null
@@ -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
-    }
-}
diff --git a/ccm-core/pdl/com/arsdigita/kernel/Stylesheet.pdl.nolongerInUse b/ccm-core/pdl/com/arsdigita/kernel/Stylesheet.pdl.nolongerInUse
deleted file mode 100755
index 756cc1baf..000000000
--- a/ccm-core/pdl/com/arsdigita/kernel/Stylesheet.pdl.nolongerInUse
+++ /dev/null
@@ -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;
-    }
-}
diff --git a/ccm-core/pdl/com/arsdigita/ui/sitemap/SiteMap.pdl b/ccm-core/pdl/com/arsdigita/ui/sitemap/SiteMap.pdl
deleted file mode 100755
index 56bcaadf4..000000000
--- a/ccm-core/pdl/com/arsdigita/ui/sitemap/SiteMap.pdl
+++ /dev/null
@@ -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);
-}
diff --git a/ccm-core/pdl/com/arsdigita/ui/sitemap/Sitemap.ora.pdl b/ccm-core/pdl/com/arsdigita/ui/sitemap/Sitemap.ora.pdl
deleted file mode 100755
index 073e3fec8..000000000
--- a/ccm-core/pdl/com/arsdigita/ui/sitemap/Sitemap.ora.pdl
+++ /dev/null
@@ -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;
-    }
-}
diff --git a/ccm-core/pdl/com/arsdigita/ui/sitemap/Sitemap.pg.pdl b/ccm-core/pdl/com/arsdigita/ui/sitemap/Sitemap.pg.pdl
deleted file mode 100755
index 8c1c9bba7..000000000
--- a/ccm-core/pdl/com/arsdigita/ui/sitemap/Sitemap.pg.pdl
+++ /dev/null
@@ -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;
-    }
-}
diff --git a/ccm-core/pdl/com/arsdigita/web/Application.pdl b/ccm-core/pdl/com/arsdigita/web/Application.pdl
index f6f09e6fb..eead200a7 100755
--- a/ccm-core/pdl/com/arsdigita/web/Application.pdl
+++ b/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;
+//     }
+// }
diff --git a/ccm-core/pdl/com/arsdigita/web/WebApp.pdl b/ccm-core/pdl/com/arsdigita/web/WebApp.pdl.nolongerInUse
similarity index 94%
rename from ccm-core/pdl/com/arsdigita/web/WebApp.pdl
rename to ccm-core/pdl/com/arsdigita/web/WebApp.pdl.nolongerInUse
index 562375546..fc4f7125f 100755
--- a/ccm-core/pdl/com/arsdigita/web/WebApp.pdl
+++ b/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);
-}
+// }
diff --git a/ccm-core/sql/ccm-core/default/categorization/index-cat_object_root_category_map.sql b/ccm-core/sql/ccm-core/default/categorization/index-cat_object_root_category_map.sql
index 33667c2c5..685cfa878 100755
--- a/ccm-core/sql/ccm-core/default/categorization/index-cat_object_root_category_map.sql
+++ b/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);
diff --git a/ccm-core/sql/ccm-core/default/categorization/table-cat_object_root_category_map.sql b/ccm-core/sql/ccm-core/default/categorization/table-cat_object_root_category_map.sql
index a1002dbf7..497b87287 100755
--- a/ccm-core/sql/ccm-core/default/categorization/table-cat_object_root_category_map.sql
+++ b/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
diff --git a/ccm-core/sql/ccm-core/default/kernel/index-acs_stylesheet_type_map.sql b/ccm-core/sql/ccm-core/default/kernel/index-acs_stylesheet_type_map.sql
deleted file mode 100755
index b58a42dce..000000000
--- a/ccm-core/sql/ccm-core/default/kernel/index-acs_stylesheet_type_map.sql
+++ /dev/null
@@ -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);
diff --git a/ccm-core/sql/ccm-core/default/kernel/index-apm_packages.sql b/ccm-core/sql/ccm-core/default/kernel/index-apm_packages.sql
deleted file mode 100755
index 4a7b81ccc..000000000
--- a/ccm-core/sql/ccm-core/default/kernel/index-apm_packages.sql
+++ /dev/null
@@ -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);
diff --git a/ccm-core/sql/ccm-core/default/kernel/index-foreign_keys.sql b/ccm-core/sql/ccm-core/default/kernel/index-foreign_keys.sql
index 770641987..c4cdc466a 100755
--- a/ccm-core/sql/ccm-core/default/kernel/index-foreign_keys.sql
+++ b/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);
diff --git a/ccm-core/sql/ccm-core/default/kernel/view-object_package_map.sql b/ccm-core/sql/ccm-core/default/kernel/view-object_package_map.sql
deleted file mode 100755
index 5dea7de3f..000000000
--- a/ccm-core/sql/ccm-core/default/kernel/view-object_package_map.sql
+++ /dev/null
@@ -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);
diff --git a/ccm-core/sql/ccm-core/default/web/index-application_types.sql b/ccm-core/sql/ccm-core/default/web/index-application_types.sql
index 58797e0e7..2486693eb 100755
--- a/ccm-core/sql/ccm-core/default/web/index-application_types.sql
+++ b/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);
diff --git a/ccm-core/sql/ccm-core/default/web/index-applications.sql b/ccm-core/sql/ccm-core/default/web/index-applications.sql
index dce37fb6e..f69ddf79e 100755
--- a/ccm-core/sql/ccm-core/default/web/index-applications.sql
+++ b/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);
diff --git a/ccm-core/sql/ccm-core/oracle-se-create.sql b/ccm-core/sql/ccm-core/oracle-se-create.sql
index 7cbfb727e..6af3967b9 100755
--- a/ccm-core/sql/ccm-core/oracle-se-create.sql
+++ b/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
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/function-package_id_for_object_id.sql b/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/function-package_id_for_object_id.sql
deleted file mode 100755
index 5b5c60f5a..000000000
--- a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/function-package_id_for_object_id.sql
+++ /dev/null
@@ -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;
diff --git a/ccm-core/sql/ccm-core/postgres-create.sql b/ccm-core/sql/ccm-core/postgres-create.sql
index aed35dc2e..3b1ebe09a 100755
--- a/ccm-core/sql/ccm-core/postgres-create.sql
+++ b/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
diff --git a/ccm-core/sql/ccm-core/default/upgrade/5.2.0-5.2.1/alter-requests.sql b/ccm-core/sql/ccm-core/upgrade/default/5.2.0-5.2.1/alter-requests.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/default/upgrade/5.2.0-5.2.1/alter-requests.sql
rename to ccm-core/sql/ccm-core/upgrade/default/5.2.0-5.2.1/alter-requests.sql
diff --git a/ccm-core/sql/ccm-core/default/upgrade/5.2.1-6.0.0/add-index-cw_task_listeners_tid_ltid.sql b/ccm-core/sql/ccm-core/upgrade/default/5.2.1-6.0.0/add-index-cw_task_listeners_tid_ltid.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/default/upgrade/5.2.1-6.0.0/add-index-cw_task_listeners_tid_ltid.sql
rename to ccm-core/sql/ccm-core/upgrade/default/5.2.1-6.0.0/add-index-cw_task_listeners_tid_ltid.sql
diff --git a/ccm-core/sql/ccm-core/default/upgrade/5.2.1-6.0.0/alter-categories.sql b/ccm-core/sql/ccm-core/upgrade/default/5.2.1-6.0.0/alter-categories.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/default/upgrade/5.2.1-6.0.0/alter-categories.sql
rename to ccm-core/sql/ccm-core/upgrade/default/5.2.1-6.0.0/alter-categories.sql
diff --git a/ccm-core/sql/ccm-core/default/upgrade/5.2.1-6.0.0/drop-search-test.sql b/ccm-core/sql/ccm-core/upgrade/default/5.2.1-6.0.0/drop-search-test.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/default/upgrade/5.2.1-6.0.0/drop-search-test.sql
rename to ccm-core/sql/ccm-core/upgrade/default/5.2.1-6.0.0/drop-search-test.sql
diff --git a/ccm-core/sql/ccm-core/default/upgrade/5.2.1-6.0.0/insert-vcx_event_types.sql b/ccm-core/sql/ccm-core/upgrade/default/5.2.1-6.0.0/insert-vcx_event_types.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/default/upgrade/5.2.1-6.0.0/insert-vcx_event_types.sql
rename to ccm-core/sql/ccm-core/upgrade/default/5.2.1-6.0.0/insert-vcx_event_types.sql
diff --git a/ccm-core/sql/ccm-core/default/upgrade/5.2.1-6.0.0/insert-vcx_java_classes.sql b/ccm-core/sql/ccm-core/upgrade/default/5.2.1-6.0.0/insert-vcx_java_classes.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/default/upgrade/5.2.1-6.0.0/insert-vcx_java_classes.sql
rename to ccm-core/sql/ccm-core/upgrade/default/5.2.1-6.0.0/insert-vcx_java_classes.sql
diff --git a/ccm-core/sql/ccm-core/default/upgrade/5.2.1-6.0.0/sequence-vcx_id_seq.sql b/ccm-core/sql/ccm-core/upgrade/default/5.2.1-6.0.0/sequence-vcx_id_seq.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/default/upgrade/5.2.1-6.0.0/sequence-vcx_id_seq.sql
rename to ccm-core/sql/ccm-core/upgrade/default/5.2.1-6.0.0/sequence-vcx_id_seq.sql
diff --git a/ccm-core/sql/ccm-core/default/upgrade/5.2.1-6.0.0/sequence-vcx_txns_id_seq.sql b/ccm-core/sql/ccm-core/upgrade/default/5.2.1-6.0.0/sequence-vcx_txns_id_seq.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/default/upgrade/5.2.1-6.0.0/sequence-vcx_txns_id_seq.sql
rename to ccm-core/sql/ccm-core/upgrade/default/5.2.1-6.0.0/sequence-vcx_txns_id_seq.sql
diff --git a/ccm-core/sql/ccm-core/default/upgrade/5.2.1-6.0.0/table-web_hosts-auto.sql b/ccm-core/sql/ccm-core/upgrade/default/5.2.1-6.0.0/table-web_hosts-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/default/upgrade/5.2.1-6.0.0/table-web_hosts-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/default/5.2.1-6.0.0/table-web_hosts-auto.sql
diff --git a/ccm-core/sql/ccm-core/default/upgrade/6.0.1-6.1.0/dot-step-1.sql b/ccm-core/sql/ccm-core/upgrade/default/6.0.1-6.1.0/dot-step-1.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/default/upgrade/6.0.1-6.1.0/dot-step-1.sql
rename to ccm-core/sql/ccm-core/upgrade/default/6.0.1-6.1.0/dot-step-1.sql
diff --git a/ccm-core/sql/ccm-core/default/upgrade/6.0.1-6.1.0/dot-step-2.sql b/ccm-core/sql/ccm-core/upgrade/default/6.0.1-6.1.0/dot-step-2.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/default/upgrade/6.0.1-6.1.0/dot-step-2.sql
rename to ccm-core/sql/ccm-core/upgrade/default/6.0.1-6.1.0/dot-step-2.sql
diff --git a/ccm-core/sql/ccm-core/default/upgrade/6.0.1-6.1.0/insert-cms_mime_extensions.sql b/ccm-core/sql/ccm-core/upgrade/default/6.0.1-6.1.0/insert-cms_mime_extensions.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/default/upgrade/6.0.1-6.1.0/insert-cms_mime_extensions.sql
rename to ccm-core/sql/ccm-core/upgrade/default/6.0.1-6.1.0/insert-cms_mime_extensions.sql
diff --git a/ccm-core/sql/ccm-core/default/upgrade/6.1.0-6.2.0/upgrade-mime-types.sql b/ccm-core/sql/ccm-core/upgrade/default/6.1.0-6.2.0/upgrade-mime-types.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/default/upgrade/6.1.0-6.2.0/upgrade-mime-types.sql
rename to ccm-core/sql/ccm-core/upgrade/default/6.1.0-6.2.0/upgrade-mime-types.sql
diff --git a/ccm-core/sql/ccm-core/default/upgrade/6.3.0-6.3.1/auto-categorization.sql b/ccm-core/sql/ccm-core/upgrade/default/6.3.0-6.3.1/auto-categorization.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/default/upgrade/6.3.0-6.3.1/auto-categorization.sql
rename to ccm-core/sql/ccm-core/upgrade/default/6.3.0-6.3.1/auto-categorization.sql
diff --git a/ccm-core/sql/ccm-core/default/upgrade/6.3.0-6.3.1/preferred-categories.sql b/ccm-core/sql/ccm-core/upgrade/default/6.3.0-6.3.1/preferred-categories.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/default/upgrade/6.3.0-6.3.1/preferred-categories.sql
rename to ccm-core/sql/ccm-core/upgrade/default/6.3.0-6.3.1/preferred-categories.sql
diff --git a/ccm-core/sql/ccm-core/default/upgrade/6.3.2-6.3.3/sso-login.sql b/ccm-core/sql/ccm-core/upgrade/default/6.3.2-6.3.3/sso-login.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/default/upgrade/6.3.2-6.3.3/sso-login.sql
rename to ccm-core/sql/ccm-core/upgrade/default/6.3.2-6.3.3/sso-login.sql
diff --git a/ccm-core/sql/ccm-core/default/upgrade/6.5.3-6.5.4/insert-application-container-group-columns.sql b/ccm-core/sql/ccm-core/upgrade/default/6.5.3-6.5.4/insert-application-container-group-columns.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/default/upgrade/6.5.3-6.5.4/insert-application-container-group-columns.sql
rename to ccm-core/sql/ccm-core/upgrade/default/6.5.3-6.5.4/insert-application-container-group-columns.sql
diff --git a/ccm-core/sql/ccm-core/default/upgrade/6.5.4-6.5.5/delete-object_1_granted_context-entries.sql b/ccm-core/sql/ccm-core/upgrade/default/6.5.4-6.5.5/delete-object_1_granted_context-entries.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/default/upgrade/6.5.4-6.5.5/delete-object_1_granted_context-entries.sql
rename to ccm-core/sql/ccm-core/upgrade/default/6.5.4-6.5.5/delete-object_1_granted_context-entries.sql
diff --git a/ccm-core/sql/ccm-core/default/upgrade/6.6.0-6.6.1/drop_tables_acs_stylesheets.sql b/ccm-core/sql/ccm-core/upgrade/default/6.6.0-6.6.1/drop_tables_acs_stylesheets.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/default/upgrade/6.6.0-6.6.1/drop_tables_acs_stylesheets.sql
rename to ccm-core/sql/ccm-core/upgrade/default/6.6.0-6.6.1/drop_tables_acs_stylesheets.sql
diff --git a/ccm-core/sql/ccm-core/default/upgrade/6.6.0-6.6.1/recreate_users_index.sql b/ccm-core/sql/ccm-core/upgrade/default/6.6.0-6.6.1/recreate_users_index.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/default/upgrade/6.6.0-6.6.1/recreate_users_index.sql
rename to ccm-core/sql/ccm-core/upgrade/default/6.6.0-6.6.1/recreate_users_index.sql
diff --git a/ccm-core/sql/ccm-core/default/upgrade/6.6.1-6.6.2/drop_table_webapps.sql b/ccm-core/sql/ccm-core/upgrade/default/6.6.1-6.6.2/drop_table_webapps.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/default/upgrade/6.6.1-6.6.2/drop_table_webapps.sql
rename to ccm-core/sql/ccm-core/upgrade/default/6.6.1-6.6.2/drop_table_webapps.sql
diff --git a/ccm-core/sql/ccm-core/default/upgrade/6.6.2-6.6.3/remove_legacy_portal.sql b/ccm-core/sql/ccm-core/upgrade/default/6.6.2-6.6.3/remove_legacy_portal.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/default/upgrade/6.6.2-6.6.3/remove_legacy_portal.sql
rename to ccm-core/sql/ccm-core/upgrade/default/6.6.2-6.6.3/remove_legacy_portal.sql
diff --git a/ccm-core/sql/ccm-core/default/kernel/index-acs_stylesheets.sql b/ccm-core/sql/ccm-core/upgrade/default/6.6.4-6.6.5/remove_old_app_entries_applications-table.sql
old mode 100755
new mode 100644
similarity index 75%
rename from ccm-core/sql/ccm-core/default/kernel/index-acs_stylesheets.sql
rename to ccm-core/sql/ccm-core/upgrade/default/6.6.4-6.6.5/remove_old_app_entries_applications-table.sql
index 786d7cd54..278bb9a64
--- a/ccm-core/sql/ccm-core/default/kernel/index-acs_stylesheets.sql
+++ b/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;
diff --git a/ccm-core/sql/ccm-core/default/kernel/constraint-site_nodes.sql b/ccm-core/sql/ccm-core/upgrade/default/6.6.4-6.6.5/remove_old_app_entries_applicationtypes-table.sql
old mode 100755
new mode 100644
similarity index 74%
rename from ccm-core/sql/ccm-core/default/kernel/constraint-site_nodes.sql
rename to ccm-core/sql/ccm-core/upgrade/default/6.6.4-6.6.5/remove_old_app_entries_applicationtypes-table.sql
index 2bc91817a..67fec4f2f
--- a/ccm-core/sql/ccm-core/default/kernel/constraint-site_nodes.sql
+++ b/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;
diff --git a/ccm-core/sql/ccm-core/default/kernel/index-apm_package_type_listener_map.sql b/ccm-core/sql/ccm-core/upgrade/default/6.6.4-6.6.5/remove_old_app_entries_catobjectroot-table.sql
old mode 100755
new mode 100644
similarity index 72%
rename from ccm-core/sql/ccm-core/default/kernel/index-apm_package_type_listener_map.sql
rename to ccm-core/sql/ccm-core/upgrade/default/6.6.4-6.6.5/remove_old_app_entries_catobjectroot-table.sql
index d685b43d2..2d04ddd42
--- a/ccm-core/sql/ccm-core/default/kernel/index-apm_package_type_listener_map.sql
+++ b/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;
diff --git a/ccm-core/sql/ccm-core/default/kernel/index-acs_stylesheet_node_map.sql b/ccm-core/sql/ccm-core/upgrade/default/6.6.4-6.6.5/remove_old_style_app_tables.sql
old mode 100755
new mode 100644
similarity index 59%
rename from ccm-core/sql/ccm-core/default/kernel/index-acs_stylesheet_node_map.sql
rename to ccm-core/sql/ccm-core/upgrade/default/6.6.4-6.6.5/remove_old_style_app_tables.sql
index 707cd5ee3..c5753017e
--- a/ccm-core/sql/ccm-core/default/kernel/index-acs_stylesheet_node_map.sql
+++ b/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;
diff --git a/ccm-core/sql/ccm-core/default/kernel/index-site_nodes.sql b/ccm-core/sql/ccm-core/upgrade/default/6.6.4-6.6.5/remove_sitemap_app_table.sql
old mode 100755
new mode 100644
similarity index 67%
rename from ccm-core/sql/ccm-core/default/kernel/index-site_nodes.sql
rename to ccm-core/sql/ccm-core/upgrade/default/6.6.4-6.6.5/remove_sitemap_app_table.sql
index e04acf1bc..fa8f1f773
--- a/ccm-core/sql/ccm-core/default/kernel/index-site_nodes.sql
+++ b/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 ;
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.4-6.6.5.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.4-6.6.5.sql
new file mode 100644
index 000000000..d29b66f20
--- /dev/null
+++ b/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
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.0.0-5.1.0/categorization.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.0.0-5.1.0/categorization.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.0.0-5.1.0/categorization.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.0.0-5.1.0/categorization.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.0.0-5.1.0/create-fk-indices.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.0.0-5.1.0/create-fk-indices.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.0.0-5.1.0/create-fk-indices.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.0.0-5.1.0/create-fk-indices.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.0.0-5.1.0/drop-sec_session_properties.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.0.0-5.1.0/drop-sec_session_properties.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.0.0-5.1.0/drop-sec_session_properties.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.0.0-5.1.0/drop-sec_session_properties.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.0.0-5.1.0/messaging.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.0.0-5.1.0/messaging.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.0.0-5.1.0/messaging.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.0.0-5.1.0/messaging.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.0.0-5.1.0/objects.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.0.0-5.1.0/objects.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.0.0-5.1.0/objects.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.0.0-5.1.0/objects.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.0.0-5.1.0/permissioning.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.0.0-5.1.0/permissioning.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.0.0-5.1.0/permissioning.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.0.0-5.1.0/permissioning.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.0.0-5.1.0/versioning.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.0.0-5.1.0/versioning.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.0.0-5.1.0/versioning.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.0.0-5.1.0/versioning.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.1-5.1.2/site-nodes-url.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.1-5.1.2/site-nodes-url.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.1-5.1.2/site-nodes-url.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.1-5.1.2/site-nodes-url.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/add-applications.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/add-applications.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/add-applications.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/add-applications.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/add-bebop-object.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/add-bebop-object.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/add-bebop-object.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/add-bebop-object.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/add-forms.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/add-forms.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/add-forms.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/add-forms.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/add-lucene-docs.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/add-lucene-docs.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/add-lucene-docs.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/add-lucene-docs.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/add-portals.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/add-portals.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/add-portals.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/add-portals.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/add-portlet-portals-constraints.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/add-portlet-portals-constraints.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/add-portlet-portals-constraints.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/add-portlet-portals-constraints.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/add-portlets.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/add-portlets.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/add-portlets.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/add-portlets.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/add-search-test.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/add-search-test.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/add-search-test.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/add-search-test.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/categorization.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/categorization.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/categorization.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/categorization.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/drop-category-map-id.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/drop-category-map-id.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/drop-category-map-id.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/drop-category-map-id.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/drop-notes.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/drop-notes.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/drop-notes.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/drop-notes.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/drop-places.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/drop-places.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/drop-places.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/drop-places.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/drop-table-secret-tokens.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/drop-table-secret-tokens.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/drop-table-secret-tokens.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/drop-table-secret-tokens.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/drop-us-addresses.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/drop-us-addresses.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/drop-us-addresses.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/drop-us-addresses.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/function-currentDate.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/function-currentDate.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/function-currentDate.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/function-currentDate.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/function-last_attr_value.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/function-last_attr_value.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/function-last_attr_value.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/function-last_attr_value.sql
diff --git a/ccm-core/sql/ccm-core/default/kernel/function-package_id_for_object_id.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/function-package_id_for_object_id.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/default/kernel/function-package_id_for_object_id.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/function-package_id_for_object_id.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/misc.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/misc.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/misc.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/misc.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/package-hierarchy_denormalization.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/package-hierarchy_denormalization.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/package-hierarchy_denormalization.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/package-hierarchy_denormalization.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/package-parties_denormalization.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/package-parties_denormalization.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/package-parties_denormalization.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/package-parties_denormalization.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/package-permission_denormalization.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/package-permission_denormalization.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/package-permission_denormalization.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/package-permission_denormalization.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/package-search_indexing.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/package-search_indexing.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/package-search_indexing.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/package-search_indexing.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/table-cat_cat_subcat_trans_index.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/table-cat_cat_subcat_trans_index.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/table-cat_cat_subcat_trans_index.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/table-cat_cat_subcat_trans_index.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/trigger-acs_parties.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/trigger-acs_parties.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/trigger-acs_parties.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/trigger-acs_parties.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/trigger-acs_permissions.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/trigger-acs_permissions.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/trigger-acs_permissions.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/trigger-acs_permissions.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/trigger-cat_category_category_map.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/trigger-cat_category_category_map.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/trigger-cat_category_category_map.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/trigger-cat_category_category_map.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/update-constraints.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/update-constraints.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/update-constraints.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/update-constraints.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/update-indexes.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/update-indexes.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.1.2-5.2.0/update-indexes.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.1.2-5.2.0/update-indexes.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.0-5.2.1/add-cat-deflt-ancestors-idx.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.0-5.2.1/add-cat-deflt-ancestors-idx.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.0-5.2.1/add-cat-deflt-ancestors-idx.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.0-5.2.1/add-cat-deflt-ancestors-idx.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/alter-lucene.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/alter-lucene.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/alter-lucene.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/alter-lucene.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/auto-upgrade.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/auto-upgrade.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/auto-upgrade.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/auto-upgrade.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/mime-types.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/mime-types.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/mime-types.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/mime-types.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/misc.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/misc.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/misc.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/misc.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_blob_operations-auto.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/table-vcx_blob_operations-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_blob_operations-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/table-vcx_blob_operations-auto.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_clob_operations-auto.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/table-vcx_clob_operations-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_clob_operations-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/table-vcx_clob_operations-auto.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_event_types-auto.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/table-vcx_event_types-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_event_types-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/table-vcx_event_types-auto.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_generic_operations-auto.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/table-vcx_generic_operations-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_generic_operations-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/table-vcx_generic_operations-auto.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_java_classes-auto.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/table-vcx_java_classes-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_java_classes-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/table-vcx_java_classes-auto.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_obj_changes-auto.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/table-vcx_obj_changes-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_obj_changes-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/table-vcx_obj_changes-auto.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_operations-auto.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/table-vcx_operations-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_operations-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/table-vcx_operations-auto.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_tags-auto.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/table-vcx_tags-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_tags-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/table-vcx_tags-auto.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_txns-auto.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/table-vcx_txns-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/table-vcx_txns-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/table-vcx_txns-auto.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/update-web-hosts.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/update-web-hosts.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/update-web-hosts.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/update-web-hosts.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/vcx_deferred.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/vcx_deferred.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/5.2.1-6.0.0/vcx_deferred.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/5.2.1-6.0.0/vcx_deferred.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.0-6.0.1/function-convert_to_html.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.0-6.0.1/function-convert_to_html.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.0-6.0.1/function-convert_to_html.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.0-6.0.1/function-convert_to_html.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/comment-acs_privilege_hierarchy.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/comment-acs_privilege_hierarchy.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/comment-acs_privilege_hierarchy.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/comment-acs_privilege_hierarchy.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/comment-dnm_permissions.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/comment-dnm_permissions.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/comment-dnm_permissions.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/comment-dnm_permissions.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/comment-dnm_privilege_col_map.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/comment-dnm_privilege_col_map.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/comment-dnm_privilege_col_map.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/comment-dnm_privilege_col_map.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/comment-dnm_privilege_hierarchy.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/comment-dnm_privilege_hierarchy.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/comment-dnm_privilege_hierarchy.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/comment-dnm_privilege_hierarchy.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/comment-dnm_privileges.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/comment-dnm_privileges.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/comment-dnm_privileges.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/comment-dnm_privileges.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/create.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/create.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/create.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/create.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/deferred.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/deferred.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/deferred.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/deferred.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/index-acs_privilege_hierarchy.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/index-acs_privilege_hierarchy.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/index-acs_privilege_hierarchy.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/index-acs_privilege_hierarchy.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/index-dnm_granted_context.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/index-dnm_granted_context.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/index-dnm_granted_context.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/index-dnm_granted_context.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/index-dnm_group_membership.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/index-dnm_group_membership.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/index-dnm_group_membership.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/index-dnm_group_membership.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/index-dnm_object_1_granted_context.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/index-dnm_object_1_granted_context.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/index-dnm_object_1_granted_context.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/index-dnm_object_1_granted_context.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/index-dnm_permissions.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/index-dnm_permissions.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/index-dnm_permissions.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/index-dnm_permissions.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/insert-acs_privilege_hierarchy.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/insert-acs_privilege_hierarchy.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/insert-acs_privilege_hierarchy.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/insert-acs_privilege_hierarchy.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/insert-dnm_context.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/insert-dnm_context.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/insert-dnm_context.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/insert-dnm_context.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/insert-dnm_group_membership.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/insert-dnm_group_membership.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/insert-dnm_group_membership.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/insert-dnm_group_membership.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/package-dnm_context.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/package-dnm_context.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/package-dnm_context.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/package-dnm_context.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/package-dnm_parties.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/package-dnm_parties.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/package-dnm_parties.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/package-dnm_parties.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/package-dnm_privileges.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/package-dnm_privileges.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/package-dnm_privileges.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/package-dnm_privileges.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-acs_privilege_hierarchy.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-acs_privilege_hierarchy.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-acs_privilege_hierarchy.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-acs_privilege_hierarchy.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-admin_app-auto.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-admin_app-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-admin_app-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-admin_app-auto.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-agentportlets-auto.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-agentportlets-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-agentportlets-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-agentportlets-auto.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_granted_context.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-dnm_granted_context.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_granted_context.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-dnm_granted_context.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_group_membership.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-dnm_group_membership.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_group_membership.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-dnm_group_membership.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_object_1_granted_context.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-dnm_object_1_granted_context.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_object_1_granted_context.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-dnm_object_1_granted_context.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_object_grants.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-dnm_object_grants.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_object_grants.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-dnm_object_grants.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_party_grants.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-dnm_party_grants.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_party_grants.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-dnm_party_grants.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_permissions.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-dnm_permissions.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_permissions.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-dnm_permissions.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_privilege_col_map.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-dnm_privilege_col_map.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_privilege_col_map.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-dnm_privilege_col_map.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_privilege_hierarchy.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-dnm_privilege_hierarchy.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_privilege_hierarchy.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-dnm_privilege_hierarchy.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_privilege_hierarchy_map.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-dnm_privilege_hierarchy_map.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_privilege_hierarchy_map.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-dnm_privilege_hierarchy_map.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_privileges.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-dnm_privileges.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-dnm_privileges.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-dnm_privileges.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-forms_lstnr_rmt_svr_post-auto.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-forms_lstnr_rmt_svr_post-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-forms_lstnr_rmt_svr_post-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-forms_lstnr_rmt_svr_post-auto.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-init_requirements-auto.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-init_requirements-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-init_requirements-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-init_requirements-auto.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-inits-auto.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-inits-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-inits-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-inits-auto.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-keystore-auto.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-keystore-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-keystore-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-keystore-auto.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-lucene_ids-auto.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-lucene_ids-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-lucene_ids-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-lucene_ids-auto.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-sitemap_app-auto.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-sitemap_app-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-sitemap_app-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-sitemap_app-auto.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-webapps-auto.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-webapps-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/table-webapps-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/table-webapps-auto.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/triggers-dnm_context.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/triggers-dnm_context.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/triggers-dnm_context.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/triggers-dnm_context.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/triggers-dnm_parties.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/triggers-dnm_parties.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/triggers-dnm_parties.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/triggers-dnm_parties.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/triggers-dnm_privileges.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/triggers-dnm_privileges.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/triggers-dnm_privileges.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/triggers-dnm_privileges.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/update-applications.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/update-applications.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/update-applications.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/update-applications.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/update-cat_root_cat_object_map.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/update-cat_root_cat_object_map.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/update-cat_root_cat_object_map.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/update-cat_root_cat_object_map.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/update-host-unique-index.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/update-host-unique-index.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/update-host-unique-index.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/update-host-unique-index.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/upgrade-dnm_context-quick.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/upgrade-dnm_context-quick.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/upgrade-dnm_context-quick.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/upgrade-dnm_context-quick.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/upgrade-dnm_context.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/upgrade-dnm_context.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/upgrade-dnm_context.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/upgrade-dnm_context.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/upgrade-dnm_parties.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/upgrade-dnm_parties.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/upgrade-dnm_parties.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/upgrade-dnm_parties.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/upgrade-dnm_privileges.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/upgrade-dnm_privileges.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.0.1-6.1.0/upgrade-dnm_privileges.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.0.1-6.1.0/upgrade-dnm_privileges.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.1.0-6.1.1/upgrade-lucene_docs.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.1.0-6.1.1/upgrade-lucene_docs.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.1.0-6.1.1/upgrade-lucene_docs.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.1.0-6.1.1/upgrade-lucene_docs.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.1.0-6.1.1/upgrade-search_content.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.1.0-6.1.1/upgrade-search_content.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.1.0-6.1.1/upgrade-search_content.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.1.0-6.1.1/upgrade-search_content.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.1.1-6.1.2/add_column_ignore_parent_index.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.1.1-6.1.2/add_column_ignore_parent_index.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.1.1-6.1.2/add_column_ignore_parent_index.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.1.1-6.1.2/add_column_ignore_parent_index.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.1.1-6.1.2/trigger-sync_lucene_docs.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.1.1-6.1.2/trigger-sync_lucene_docs.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.1.1-6.1.2/trigger-sync_lucene_docs.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.1.1-6.1.2/trigger-sync_lucene_docs.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.3.0-6.3.1/add_column_catpurpose_lang.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.3.0-6.3.1/add_column_catpurpose_lang.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.3.0-6.3.1/add_column_catpurpose_lang.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.3.0-6.3.1/add_column_catpurpose_lang.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.3.0-6.3.1/add_column_users_banned.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.3.0-6.3.1/add_column_users_banned.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.3.0-6.3.1/add_column_users_banned.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.3.0-6.3.1/add_column_users_banned.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.3.1-6.3.2/add_column_catpurpose_lang_default.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.3.1-6.3.2/add_column_catpurpose_lang_default.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.3.1-6.3.2/add_column_catpurpose_lang_default.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.3.1-6.3.2/add_column_catpurpose_lang_default.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.5.2-6.5.3/clob_message.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.5.2-6.5.3/clob_message.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.5.2-6.5.3/clob_message.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.5.2-6.5.3/clob_message.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.5.4-6.5.5/drop-triggers.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.5.4-6.5.5/drop-triggers.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.5.4-6.5.5/drop-triggers.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.5.4-6.5.5/drop-triggers.sql
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.5.5-6.5.6/create-category_localizations-table.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.5.5-6.5.6/create-category_localizations-table.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/oracle-se/upgrade/6.5.5-6.5.6/create-category_localizations-table.sql
rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.5.5-6.5.6/create-category_localizations-table.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.6.4-6.6.5.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.6.4-6.6.5.sql
new file mode 100644
index 000000000..8fda176db
--- /dev/null
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.6.4-6.6.5.sql
@@ -0,0 +1,47 @@
+--
+-- 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
+--
+-- $DateTime: 2013/01/31 23:15:09 $
+
+\echo Red Hat Enterprise CORE 6.6.4 -> 6.6.5 Upgrade Script (PostgreSQL)
+
+-- 
+-- 
+
+begin;
+
+-- Remove old style application tables, must be the first script executed.
+\i default/6.6.4-6.6.5/remove_old_style_app_tables.sql
+
+-- Adjust table cat_object_root_category_map 
+-- (Constraint cat_obj_package_id_fk already removed in step 1)
+\i default/6.6.4-6.6.5/remove_old_app_entries_catobjectroot_table.sql
+
+-- Adjust table applications
+-- (Constraint apapplication_package_id_f_cdaho already removed in step 1)
+\i default/6.6.4-6.6.5/remove_old_app_entries_applications_table.sql
+
+-- Adjust table application_types
+-- (Constraint applica_typ_pac_typ_id_f_v80ma already removed in step 1)
+\i default/6.6.4-6.6.5/remove_old_app_entries_applicationtypes_table.sql
+
+-- Remove admin.sitemap application table
+-- Check: Already done in 6.6.4
+-- \i default/6.6.4-6.6.5/remove_sitemap_app_table.sql
+
+
+commit;
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/5.2.0-5.2.1/acs_objects-acs_permissions-cascade-workaround.sql b/ccm-core/sql/ccm-core/upgrade/postgres/5.2.0-5.2.1/acs_objects-acs_permissions-cascade-workaround.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/5.2.0-5.2.1/acs_objects-acs_permissions-cascade-workaround.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/5.2.0-5.2.1/acs_objects-acs_permissions-cascade-workaround.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/5.2.0-5.2.1/add-cat-deflt-ancestors-idx.sql b/ccm-core/sql/ccm-core/upgrade/postgres/5.2.0-5.2.1/add-cat-deflt-ancestors-idx.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/5.2.0-5.2.1/add-cat-deflt-ancestors-idx.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/5.2.0-5.2.1/add-cat-deflt-ancestors-idx.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/5.2.0-5.2.1/index-nt_requests.sql b/ccm-core/sql/ccm-core/upgrade/postgres/5.2.0-5.2.1/index-nt_requests.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/5.2.0-5.2.1/index-nt_requests.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/5.2.0-5.2.1/index-nt_requests.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/5.2.0-5.3.0/alter-lucene.sql b/ccm-core/sql/ccm-core/upgrade/postgres/5.2.0-5.3.0/alter-lucene.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/5.2.0-5.3.0/alter-lucene.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/5.2.0-5.3.0/alter-lucene.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/add-permissions-rebuild.sql b/ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/add-permissions-rebuild.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/add-permissions-rebuild.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/add-permissions-rebuild.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/alter-lucene.sql b/ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/alter-lucene.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/alter-lucene.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/alter-lucene.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/auto-upgrade.sql b/ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/auto-upgrade.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/auto-upgrade.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/auto-upgrade.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/drop-ri-triggers.sql b/ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/drop-ri-triggers.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/drop-ri-triggers.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/drop-ri-triggers.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/drop-unique-indexes.sql b/ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/drop-unique-indexes.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/drop-unique-indexes.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/drop-unique-indexes.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/mime-types.sql b/ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/mime-types.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/mime-types.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/mime-types.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/misc.sql b/ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/misc.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/misc.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/misc.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_blob_operations-auto.sql b/ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/table-vcx_blob_operations-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_blob_operations-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/table-vcx_blob_operations-auto.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_clob_operations-auto.sql b/ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/table-vcx_clob_operations-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_clob_operations-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/table-vcx_clob_operations-auto.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_event_types-auto.sql b/ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/table-vcx_event_types-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_event_types-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/table-vcx_event_types-auto.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_generic_operations-auto.sql b/ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/table-vcx_generic_operations-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_generic_operations-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/table-vcx_generic_operations-auto.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_java_classes-auto.sql b/ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/table-vcx_java_classes-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_java_classes-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/table-vcx_java_classes-auto.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_obj_changes-auto.sql b/ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/table-vcx_obj_changes-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_obj_changes-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/table-vcx_obj_changes-auto.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_operations-auto.sql b/ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/table-vcx_operations-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_operations-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/table-vcx_operations-auto.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_tags-auto.sql b/ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/table-vcx_tags-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_tags-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/table-vcx_tags-auto.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_txns-auto.sql b/ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/table-vcx_txns-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/table-vcx_txns-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/table-vcx_txns-auto.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/update-web-hosts.sql b/ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/update-web-hosts.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/update-web-hosts.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/update-web-hosts.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/vcx_deferred.sql b/ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/vcx_deferred.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/5.2.1-6.0.0/vcx_deferred.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/5.2.1-6.0.0/vcx_deferred.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/comment-acs_privilege_hierarchy.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/comment-acs_privilege_hierarchy.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/comment-acs_privilege_hierarchy.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/comment-acs_privilege_hierarchy.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/comment-dnm_permissions.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/comment-dnm_permissions.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/comment-dnm_permissions.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/comment-dnm_permissions.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/comment-dnm_privilege_col_map.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/comment-dnm_privilege_col_map.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/comment-dnm_privilege_col_map.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/comment-dnm_privilege_col_map.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/comment-dnm_privilege_hierarchy.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/comment-dnm_privilege_hierarchy.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/comment-dnm_privilege_hierarchy.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/comment-dnm_privilege_hierarchy.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/comment-dnm_privileges.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/comment-dnm_privileges.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/comment-dnm_privileges.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/comment-dnm_privileges.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/deferred.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/deferred.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/deferred.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/deferred.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/index-acs_privilege_hierarchy.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/index-acs_privilege_hierarchy.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/index-acs_privilege_hierarchy.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/index-acs_privilege_hierarchy.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/index-dnm_granted_context.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/index-dnm_granted_context.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/index-dnm_granted_context.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/index-dnm_granted_context.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/index-dnm_group_membership.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/index-dnm_group_membership.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/index-dnm_group_membership.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/index-dnm_group_membership.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/index-dnm_object_1_granted_context.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/index-dnm_object_1_granted_context.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/index-dnm_object_1_granted_context.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/index-dnm_object_1_granted_context.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/index-dnm_permissions.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/index-dnm_permissions.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/index-dnm_permissions.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/index-dnm_permissions.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/index-dnm_ungranted_context.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/index-dnm_ungranted_context.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/index-dnm_ungranted_context.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/index-dnm_ungranted_context.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/insert-acs_privilege_hierarchy.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/insert-acs_privilege_hierarchy.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/insert-acs_privilege_hierarchy.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/insert-acs_privilege_hierarchy.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/insert-dnm_context.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/insert-dnm_context.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/insert-dnm_context.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/insert-dnm_context.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/insert-dnm_group_membership.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/insert-dnm_group_membership.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/insert-dnm_group_membership.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/insert-dnm_group_membership.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/package-dnm_context.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/package-dnm_context.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/package-dnm_context.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/package-dnm_context.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/package-dnm_parties.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/package-dnm_parties.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/package-dnm_parties.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/package-dnm_parties.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/package-dnm_privileges.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/package-dnm_privileges.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/package-dnm_privileges.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/package-dnm_privileges.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-acs_privilege_hierarchy.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-acs_privilege_hierarchy.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-acs_privilege_hierarchy.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-acs_privilege_hierarchy.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-admin_app-auto.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-admin_app-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-admin_app-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-admin_app-auto.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-agentportlets-auto.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-agentportlets-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-agentportlets-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-agentportlets-auto.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_granted_context.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-dnm_granted_context.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_granted_context.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-dnm_granted_context.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_group_membership.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-dnm_group_membership.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_group_membership.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-dnm_group_membership.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_object_1_granted_context.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-dnm_object_1_granted_context.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_object_1_granted_context.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-dnm_object_1_granted_context.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_object_grants.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-dnm_object_grants.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_object_grants.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-dnm_object_grants.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_party_grants.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-dnm_party_grants.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_party_grants.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-dnm_party_grants.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_permissions.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-dnm_permissions.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_permissions.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-dnm_permissions.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_privilege_col_map.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-dnm_privilege_col_map.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_privilege_col_map.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-dnm_privilege_col_map.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_privilege_hierarchy.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-dnm_privilege_hierarchy.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_privilege_hierarchy.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-dnm_privilege_hierarchy.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_privilege_hierarchy_map.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-dnm_privilege_hierarchy_map.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_privilege_hierarchy_map.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-dnm_privilege_hierarchy_map.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_privileges.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-dnm_privileges.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_privileges.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-dnm_privileges.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_ungranted_context.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-dnm_ungranted_context.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-dnm_ungranted_context.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-dnm_ungranted_context.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-forms_lstnr_rmt_svr_post-auto.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-forms_lstnr_rmt_svr_post-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-forms_lstnr_rmt_svr_post-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-forms_lstnr_rmt_svr_post-auto.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-init_requirements-auto.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-init_requirements-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-init_requirements-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-init_requirements-auto.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-inits-auto.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-inits-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-inits-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-inits-auto.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-keystore-auto.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-keystore-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-keystore-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-keystore-auto.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-lucene_ids-auto.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-lucene_ids-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-lucene_ids-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-lucene_ids-auto.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-sitemap_app-auto.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-sitemap_app-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-sitemap_app-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-sitemap_app-auto.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-webapps-auto.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-webapps-auto.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/table-webapps-auto.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/table-webapps-auto.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/triggers-dnm_context.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/triggers-dnm_context.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/triggers-dnm_context.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/triggers-dnm_context.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/triggers-dnm_parties.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/triggers-dnm_parties.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/triggers-dnm_parties.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/triggers-dnm_parties.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/triggers-dnm_privileges.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/triggers-dnm_privileges.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/triggers-dnm_privileges.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/triggers-dnm_privileges.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/update-applications.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/update-applications.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/update-applications.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/update-applications.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/update-cat_root_cat_object_map.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/update-cat_root_cat_object_map.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/update-cat_root_cat_object_map.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/update-cat_root_cat_object_map.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/update-host-unique-index.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/update-host-unique-index.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/update-host-unique-index.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/update-host-unique-index.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_context.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/upgrade-dnm_context.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_context.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/upgrade-dnm_context.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_parties.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/upgrade-dnm_parties.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_parties.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/upgrade-dnm_parties.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_privileges.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/upgrade-dnm_privileges.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_privileges.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.0.1-6.1.0/upgrade-dnm_privileges.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.1.0-6.1.1/upgrade-lucene_docs.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.1.0-6.1.1/upgrade-lucene_docs.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.1.0-6.1.1/upgrade-lucene_docs.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.1.0-6.1.1/upgrade-lucene_docs.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.1.1-6.1.2/add_column_ignore_parent_index.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.1.1-6.1.2/add_column_ignore_parent_index.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.1.1-6.1.2/add_column_ignore_parent_index.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.1.1-6.1.2/add_column_ignore_parent_index.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.1.1-6.1.2/trigger-sync_lucene_docs.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.1.1-6.1.2/trigger-sync_lucene_docs.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.1.1-6.1.2/trigger-sync_lucene_docs.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.1.1-6.1.2/trigger-sync_lucene_docs.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.3.0-6.3.1/add_column_catpurpose_lang.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.3.0-6.3.1/add_column_catpurpose_lang.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.3.0-6.3.1/add_column_catpurpose_lang.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.3.0-6.3.1/add_column_catpurpose_lang.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.3.0-6.3.1/add_column_users_banned.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.3.0-6.3.1/add_column_users_banned.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.3.0-6.3.1/add_column_users_banned.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.3.0-6.3.1/add_column_users_banned.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.3.1-6.3.2/add_column_catpurpose_lang_default.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.3.1-6.3.2/add_column_catpurpose_lang_default.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.3.1-6.3.2/add_column_catpurpose_lang_default.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.3.1-6.3.2/add_column_catpurpose_lang_default.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.5.2-6.5.3/clob_message.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.5.2-6.5.3/clob_message.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.5.2-6.5.3/clob_message.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.5.2-6.5.3/clob_message.sql
diff --git a/ccm-core/sql/ccm-core/postgres/upgrade/6.5.5-6.5.6/create-category_localizations-table.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.5.5-6.5.6/create-category_localizations-table.sql
similarity index 100%
rename from ccm-core/sql/ccm-core/postgres/upgrade/6.5.5-6.5.6/create-category_localizations-table.sql
rename to ccm-core/sql/ccm-core/upgrade/postgres/6.5.5-6.5.6/create-category_localizations-table.sql
diff --git a/ccm-core/src/ccm-core.upgrade b/ccm-core/src/ccm-core.upgrade
index 587c4b9c5..a61f9eabc 100755
--- a/ccm-core/src/ccm-core.upgrade
+++ b/ccm-core/src/ccm-core.upgrade
@@ -54,4 +54,8 @@
     <!-- Second:reinstall WebDS as a new style legacy free app  -->
     <script class="com.arsdigita.core.upgrade.Upgrade664"/>
   </version>
+  <version from="6.6.4" to="6.6.5">
+    <!-- Remove old style application code (SiteNode/Packages)  -->
+    <script sql="ccm-core/upgrade/::database::-6.6.4-6.6.5.sql"/> 
+  </version>
 </upgrade>
diff --git a/ccm-core/src/com/arsdigita/core/Loader.java b/ccm-core/src/com/arsdigita/core/Loader.java
index ffec89160..f1c7dc2fc 100755
--- a/ccm-core/src/com/arsdigita/core/Loader.java
+++ b/ccm-core/src/com/arsdigita/core/Loader.java
@@ -26,10 +26,10 @@ import com.arsdigita.kernel.Group;
 import com.arsdigita.kernel.GroupCollection;
 import com.arsdigita.kernel.Kernel;
 import com.arsdigita.kernel.KernelExcursion;
-import com.arsdigita.kernel.PackageInstance;
-import com.arsdigita.kernel.PackageType;
+// import com.arsdigita.kernel.PackageInstance;
+// import com.arsdigita.kernel.PackageType;
 import com.arsdigita.kernel.ResourceType;
-import com.arsdigita.kernel.SiteNode;
+// import com.arsdigita.kernel.SiteNode;
 import com.arsdigita.kernel.User;
 import com.arsdigita.kernel.UserAuthentication;
 import com.arsdigita.kernel.permissions.PermissionService;
@@ -301,10 +301,11 @@ public class Loader extends PackageLoader {
                 s_log.debug("CoreLoader: Going to execute loadHost().");
                 loadHost();
 
-                // Note: Loading of Subsite is currently required by Login
-                //       module otherwise Login doesn't work!
-                s_log.debug("CoreLoader: Going to execute loadSubsite().");
-                loadSubsite(loadKernel());
+            //  s_log.debug("CoreLoader: Going to execute loadSubsite().");
+            //  loadSubsite(loadKernel());
+
+                s_log.debug("CoreLoader: Going to create System Administrator.");
+                createSystemAdministrator();
 
                 s_log.debug("CoreLoader: Going to execute loadLoginApp().");
                 loadLoginApp();
@@ -367,9 +368,9 @@ public class Loader extends PackageLoader {
      *         module otherwise Login doesn't work!
      *
      * @param rootNode
-     * @deprecated will be removed without replacement. Naot needed anymore
+//   * @deprecated will be removed without replacement. Naot needed anymore
      */
-    private void loadSubsite(SiteNode rootNode) {
+/*  private void loadSubsite(SiteNode rootNode) {
         s_log.debug("CoreLoader: Going to execute method loadSubsite().");
         String sDispatcher = "";
 
@@ -392,20 +393,18 @@ public class Loader extends PackageLoader {
 
         // Set subsite dispatcher class.
         subsite.setDispatcherClass(getDispatcher());
-    }
+    }  */
 
-    /**
-     * Create Root Site Node for loadSubsite()
-     * @return root node
-     * @deprecated will be removed without replacement. Naot needed anymore
-     */
-    private SiteNode loadKernel() {
+//  /**
+//   * Create Root Site Node for loadSubsite()
+//   * @return root node
+//   * @deprecated will be removed without replacement. Naot needed anymore
+//   */
+/*  private SiteNode loadKernel() {
         // Create Root Site Node
         s_log.debug("CoreLoader: Going to execute method loadKernel().");
 
         final SiteNode rootNode = SiteNode.createSiteNode(null, null);
-        s_log.debug("loadKernel: creating system administrator.");
-        createSystemAdministrator();
 
         // Create Package Types and Instances
         s_log.debug("loadKernel: creating Package Types and Instances.");
@@ -420,7 +419,7 @@ public class Loader extends PackageLoader {
 
         s_log.debug("CoreLoader: Going to complete method loadKernel().");
         return rootNode;
-    }
+    } */
 
 
 
diff --git a/ccm-core/src/com/arsdigita/kernel/BaseInitializer.java.nolongerInUse b/ccm-core/src/com/arsdigita/kernel/BaseInitializer.java.nolongerInUse
deleted file mode 100755
index 862952e23..000000000
--- a/ccm-core/src/com/arsdigita/kernel/BaseInitializer.java.nolongerInUse
+++ /dev/null
@@ -1,108 +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
- *
- */
-package com.arsdigita.kernel;
-
-import com.arsdigita.initializer.Configuration;
-import com.arsdigita.initializer.InitializationException;
-import com.arsdigita.kernel.permissions.PermissionManager;
-import com.arsdigita.persistence.OID;
-
-import java.math.BigDecimal;
-
-
-// ////////////////////////////////////////////////////////////////
-//
-// Part of the old initializer system based on enterprise.ini file
-// Deprecated and removed.
-//
-// ////////////////////////////////////////////////////////////////
-
-
-/**
- * Base initializer for all WAF applications. Extend this class to
- * implement your own initializer. Runs each initializer in a
- * KernelExcursion with system privileges.
- *
- * @author Richard Li
- */
-public abstract class BaseInitializer
-    implements com.arsdigita.initializer.Initializer {
-
-    public void startup() throws InitializationException {
-        if (Kernel.getSystemParty() == null) {
-            final DatabaseTransaction transaction = new DatabaseTransaction();
-
-            transaction.begin();
-
-            setupSystemParty();
-
-            transaction.end();
-        }
-
-        KernelExcursion rootExcursion = new KernelExcursion() {
-                public void excurse() {
-                    setTransaction(new DatabaseTransaction());
-                    setEffectiveParty(Kernel.getSystemParty());
-                    doStartup();
-                }
-            };
-        rootExcursion.run();
-    }
-
-    public void shutdown() throws InitializationException {
-        KernelExcursion rootExcursion = new KernelExcursion() {
-                public void excurse() {
-                    setEffectiveParty(Kernel.getSystemParty());
-                    doShutdown();
-                }
-            };
-        rootExcursion.run();
-    }
-
-    public abstract Configuration getConfiguration();
-
-    /**
-     * Code that should be executed at initializer startup should go
-     * inside this method.
-     */
-    protected abstract void doStartup();
-
-    /**
-     * Code that should be executed at initializer shutdown should go
-     * inside this method.
-     */
-    protected abstract void doShutdown();
-
-    private void setupSystemParty() {
-        Party party;
-
-        party = new Party
-                (new OID(Party.BASE_DATA_OBJECT_TYPE,
-                        new BigDecimal(PermissionManager.SYSTEM_PARTY))) {
-            public String getName() {
-                return "ACS System Party";
-            }
-        };
-
-        party.disconnect();
-
-        Kernel.setSystemParty(party);
-    }
-
-}
diff --git a/ccm-core/src/com/arsdigita/kernel/KernelHelper.java.nolongerInUse b/ccm-core/src/com/arsdigita/kernel/KernelHelper.java.nolongerInUse
deleted file mode 100755
index 6fdf71713..000000000
--- a/ccm-core/src/com/arsdigita/kernel/KernelHelper.java.nolongerInUse
+++ /dev/null
@@ -1,248 +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
- *
- */
-package com.arsdigita.kernel;
-
-import com.arsdigita.dispatcher.DispatcherHelper;
-import com.arsdigita.dispatcher.RequestContext;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * Provides static methods for accessing kernel-specific data.
- *
- * $Id: KernelHelper.java 699 2005-08-12 12:35:18Z sskracic $
- */
-public class KernelHelper {
-
-//  /**
-//   * Extracts the KernelRequestContext from the given request.
-//   *
-//   * @return the KernelRequestContext.
-//   *
-//   * @throws IllegalStateException if the current request context does not
-//   * subclass KernelRequestContext.
-//   */
-//  public static KernelRequestContext getKernelRequestContext
-//                                              (HttpServletRequest req) {
-//      RequestContext rctx = DispatcherHelper.getRequestContext(req);
-//      try {
-//          return (KernelRequestContext)rctx;
-//      } catch (ClassCastException e) {
-//          throw new IllegalStateException
-//              ("Request context does not subclass KernelRequestContext: "
-//               + rctx.getClass().getName());
-//      }
-//  }
-
-//  /**
-//   * Returns the current HTTP request.
-//   *
-//   * @return the current HTTP request.
-//   *
-//   * @deprecated Use {@link DispatcherHelper#getRequest()}.
-//   */
-//  public static HttpServletRequest getRequest() {
-//      HttpServletRequest r = DispatcherHelper.getRequest();
-//      if (r == null) {
-//          throw new IllegalStateException("Request is not set");
-//      }
-//      return r;
-//  }
-
-//  /**
-//   * Returns the name or IP address of the server, for example
-//   * "www.redhat.com".  This may be different from the host name
-//   * the server runs on.  It is intended for use in constructing
-//   * URLs that refer back to the server but must be constructed
-//   * outside of an HTTP request context where this information is
-//   * known explicitly.
-//   *
-//   * <p>The value of serverName is controlled by enterprise.init:
-//   * <pre>
-//   * init com.arsdigita.kernel.Initializer {
-//   *     hostName   = "prd001.redhat.com";
-//   *     serverName = "www.redhat.com";
-//   *     serverPort = "80";
-//   * }
-//   * </pre>
-//   *
-//   * <p>If serverName is not defined in enterprise.init, this method
-//   * will return hostName.   If hostName is not defined it will
-//   * return null.
-//   *
-//   * @version $Id: KernelHelper.java 699 2005-08-12 12:35:18Z sskracic $
-//   * @deprecated This method now delegates to WebConfig.  Use {@link
-//   * com.arsdigita.web.WebConfig#getServer()} and the object it returns instead of this method.
-//   */
-//  public synchronized static String getServerName() {
-//      return Web.getConfig().getServer().getName();
-//  }
-
-//  /**
-//   * Returns the port number the server is running on, or null if
-//   * not defined.
-//   *
-//   * @deprecated This method now delegates to WebConfig.  Use {@link
-//   * com.arsdigita.web.WebConfig#getServer()} and the object it
-//   * returns instead of this method.
-//   */
-//  public synchronized static String getServerPort() {
-//      return new Integer(Web.getConfig().getServer().getPort()).toString();
-//  }
-
-//  /**
-//   * Returns a canonical URL for accessing the server, constructed
-//   * from the values of {@link #getServerName} and {@link
-//   * #getServerPort}.  If the server port is not defined or set to
-//   * the standard HTTP port 80 it will not be included in the
-//   * URL. If neither the server name nor port are defined, the return
-//   * value is simply "http://localhost/".
-//   *
-//   * @ deprecated Use <code>"http://" + Web.getConfig().getServer() +
-//   * "/"</code> instead.
-//   */
-//  public synchronized static String getServerURL() {
-//      StringBuffer sb = new StringBuffer();
-//      sb.append("http://");
-//
-//      String serverName = getServerName();
-//      if (null == serverName) {
-//          sb.append("localhost");
-//      } else {
-//          sb.append(serverName);
-//      }
-//
-//      String serverPort = getServerPort();
-//      if (serverPort != null && !serverPort.equals("80")) {
-//          sb.append(':').append(serverPort);
-//      }
-//
-//      return sb.toString();
-//  }
-
-
-//  /**
-//   * Retrieves the host name for this server (for example, "arsDigita.com").
-//   * The value is controlled by enterprise.init:
-//   * <pre>
-//   * init com.arsdigita.kernel.Initializer {
-//   * hostName = "redhat.com";
-//   * siteName = "Red Hat Web Site";
-//   * }
-//   * </pre>
-//   *
-//   * @return the host name.
-//   * @deprecated This method will no longer exist in an upcoming
-//   * release.
-//   */
-//  public synchronized static String getHostName() {
-//      return Web.getConfig().getHost().getName();
-//  }
-
-//  /**
-//   * Retrieves the site name for this server (for example, "Red Hat Web Site").
-//   * The value is controlled by enterprise.init:
-//   * <pre>
-//   * init com.arsdigita.kernel.Initializer {
-//   * hostName = "redhat.com";
-//   * siteName = "Red Hat Web Site";
-//   * }
-//   * </pre>
-//   *
-//    * @return the site name.
-//   * @deprecated Use <code>Web.getConfig().getSiteName()</code>
-//   * instead.
-//   */
-//  public synchronized static String getSiteName() {
-//      return Web.getConfig().getSiteName();
-//  }
-
-//  /**
-//   * Get the system administrator's email address.  It returns the
-//   * email address specified in kernel initializer as
-//   * systemAdministratorEmailAddress.  This method is only to be
-//   * used to obtain a reply-to address for notifications.  <b>The
-//   * return value may or may not correspond to an actual user
-//   * account on the system.</b>.
-//   *
-//   * <p>For example, when a user tries to change their password,
-//   * they receive confirmation via email.  This email must appear to
-//   * originate from a valid email address on the system.  Ideally it
-//   * will also correspond to a real person who can be replied to for
-//   * help.
-//   *
-//   * @return email address suitable for reply-to in system notifications
-//   * @deprecated Use <code>Kernel.getSecurityConfig().getAdminContactEmail()</code>
-//   */
-//  public static synchronized String getSystemAdministratorEmailAddress() {
-//      return Kernel.getSecurityConfig().getAdminContactEmail();
-//  }
-
-//  /**
-//   * Fetches the currently logged in user, or null.  This is a
-//   * convenience wrapper around {@link #getCurrentUser()}.  In the
-//   * general case, those are preferrable.
-//   *
-//   * @param request The HTTP request
-//   * @return The currently logged-in user, or null if there is none.
-//   * @throws RuntimeException if the logged-in user doesn't exist in
-//   * the database
-//   * @ deprecated See getCurrentUser()
-//   **/
-//  public static User getCurrentUser(HttpServletRequest request) {
-//      return getCurrentUser();
-//  }
-
-//  /**
-//   * Returns the current user.
-//   *
-//   * @deprecated Call {@link KernelContext#getParty()} e.g.,
-//   * Kernel.getContext().getUser().
-//   */
-//  public static User getCurrentUser() {
-//      KernelContext kernelContext = Kernel.getContext();
-//      if ( kernelContext.getParty() instanceof User ) {
-//          return (User) kernelContext.getParty();
-//      } else {
-//          return null;
-//      }
-//  }
-
-//  /**
-//   * Returns the current party.
-//   *
-//   * @deprecated Call {@link KernelContext#getParty()} e.g.,
-//   * Kernel.getContext().getParty().
-//   */
-//  public static Party getCurrentParty() {
-//      KernelContext kernelContext = Kernel.getContext();
-//      return kernelContext.getParty();
-//  }
-
-//  /**
-//   * Returns the current effective party.
-//   *
-//   * @deprecated Call {@link KernelContext#getParty()} e.g.,
-//   * Kernel.getContext().getEffectiveParty().
-//   */
-//  public static Party getCurrentEffectiveParty() {
-//      KernelContext kernelContext = Kernel.getContext();
-//      return kernelContext.getEffectiveParty();
-//  }
-}
diff --git a/ccm-core/src/com/arsdigita/kernel/LegacyInitializer.java.nolongerInUse b/ccm-core/src/com/arsdigita/kernel/LegacyInitializer.java.nolongerInUse
deleted file mode 100644
index 53a0fcabf..000000000
--- a/ccm-core/src/com/arsdigita/kernel/LegacyInitializer.java.nolongerInUse
+++ /dev/null
@@ -1,129 +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
- *
- */
-package com.arsdigita.kernel;
-
-import com.arsdigita.domain.DomainObject;
-import com.arsdigita.domain.DomainObjectFactory;
-import com.arsdigita.domain.DomainObjectInstantiator;
-import com.arsdigita.initializer.Configuration;
-import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
-import com.arsdigita.persistence.DataObject;
-import com.arsdigita.persistence.SessionManager;
-import com.arsdigita.persistence.TransactionContext;
-
-
-import org.apache.log4j.Logger;
-
-/**
- * Initializes the Kernel and bootstraps the rest of the system.
- *
- * @version $Revision: #39 $ $Date: 2004/08/16 $
- * @version $Id: Initializer.java 1169 2006-06-14 13:08:25Z fabrice $
- */
-// BaseInitializer set System Party, required for permission critical actions!
-public class LegacyInitializer extends BaseInitializer {
-
-    private static final Logger s_log = Logger.getLogger(LegacyInitializer.class);
-
-    private Configuration m_conf = new Configuration();
-
-    public Configuration getConfiguration() {
-        return m_conf;
-    }
-
-    protected void doStartup() {
-
-        // MOVED to new type Initializer
-        // setupDomainFactory();
-        // setupURLService();
-
-//      TransactionContext txn = SessionManager.getSession()
-//                                             .getTransactionContext();
-//      txn.beginTxn();
-
-//      s_log.debug("Initializing privilege descriptors...");
-        s_log.error("kernel LegacyInitializer: Initializing privilege descriptors...");
-        // Initialize privilege descriptors used in permissions service
-        // Recurring task, reads from database and stores in an internal Map
-        // field.
-//      PrivilegeDescriptor.initialize();
-        s_log.error("kernel LegacyInitializer: Done.");
-
-//      txn.commitTxn();
-    }
-
-    private void setupDomainFactory() {
-        
-        DomainObjectInstantiator instantiator;
-
-        /*** ACSObject ***/
-        // register instantiator for ACSObject data object type
-        instantiator = new ACSObjectInstantiator();
-        DomainObjectFactory.registerInstantiator(ACSObject.BASE_DATA_OBJECT_TYPE,
-                                                 instantiator);
-
-        /*** Party ***/
-        // We use the same instantiator as for ACSObject because party is
-        // abstract so we don't need to override doNewInstance().
-        DomainObjectFactory.registerInstantiator(Party.BASE_DATA_OBJECT_TYPE,
-                                                 instantiator);
-
-        /*** User ***/
-        instantiator = new ACSObjectInstantiator() {
-                public DomainObject doNewInstance(DataObject dataObject) {
-                    return new User(dataObject);
-                }
-            };
-        DomainObjectFactory.registerInstantiator
-            (User.BASE_DATA_OBJECT_TYPE, instantiator);
-
-        /*** Group ***/
-        instantiator = new ACSObjectInstantiator() {
-                public DomainObject doNewInstance(DataObject dataObject) {
-                    return new Group(dataObject);
-                }
-            };
-        DomainObjectFactory.registerInstantiator(Group.BASE_DATA_OBJECT_TYPE,
-                                                 instantiator);
-
-        /*** Role ***/
-        instantiator = new DomainObjectInstantiator() {
-                public DomainObject doNewInstance(DataObject dataObject) {
-                    return new Role(dataObject);
-                }
-            };
-        DomainObjectFactory.registerInstantiator(Role.BASE_DATA_OBJECT_TYPE,
-                                                 instantiator);
-    }
-
-    /* Register URLFinders with the URLService */
-    private void setupURLService() {
-        // PackageInstance is the only kernel object type for which kernel
-        // can provide a URLFinder.  Other object types could have
-        // finders registered for them by other initializers (in UI packages).
-        // For PackageInstance, urls are determined from the mount points on
-        // the site map.
-        URLService.registerFinder(PackageInstance.BASE_DATA_OBJECT_TYPE,
-                                  new GenericURLFinder(""));
-    }
-
-    protected void doShutdown() {
-        // Empty
-    }
-}
diff --git a/ccm-core/src/com/arsdigita/kernel/PackageEventListener.java b/ccm-core/src/com/arsdigita/kernel/PackageEventListener.java
deleted file mode 100755
index 870a876f5..000000000
--- a/ccm-core/src/com/arsdigita/kernel/PackageEventListener.java
+++ /dev/null
@@ -1,82 +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
- *
- */
-package com.arsdigita.kernel;
-
-
-/**
- * An interface for listening to the events of a package listener.
- * Package Listeners are registered according to PackageTypes using
- * the <code>addListener()</code> method.
- *
- * <font color="ff0000">
- * Note: The APIs for this class have not been reviewed and are
- * subject to change after review.
- * </font>
- *
- * @see PackageType#addListener
- * @since ACS 5.0
- * @version $Revision: #7 $, $Date: 2004/08/16 $
- * @version $Id: PackageEventListener.java 287 2005-02-22 00:29:02Z sskracic $
- * @deprecated without direct replacement. Refactor to use
- *             {@link com.arsdigita.web.Application} instead.
- */
-public interface PackageEventListener {
-
-    /**
-     * Called when a package instance is mounted on a
-     * siteNode.
-     *
-     * @param siteNode the SiteNode where the instance is mounted
-     * @param pkg the instance being mounted
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public void onMount(SiteNode siteNode, PackageInstance pkg);
-
-    /**
-     * Called when a package instance is unmounted from a
-     * siteNode.
-     *
-     * @param siteNode the SiteNode where the instance is mounted
-     * @param pkg the instance being unmounted
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public void onUnmount(SiteNode siteNode, PackageInstance pkg);
-
-
-    /**
-     * Called when a new package instance is created.
-     *
-     * @param pkg a PackageInstance value
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public void onCreate(PackageInstance pkg);
-
-    /**
-     * Describe onDelete method here.
-     *
-     * @param pkg a PackageInstance value
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public void onDelete(PackageInstance pkg);
-
-}
diff --git a/ccm-core/src/com/arsdigita/kernel/PackageInstance.java b/ccm-core/src/com/arsdigita/kernel/PackageInstance.java
deleted file mode 100755
index 831c66438..000000000
--- a/ccm-core/src/com/arsdigita/kernel/PackageInstance.java
+++ /dev/null
@@ -1,351 +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
- *
- */
-package com.arsdigita.kernel;
-
-// For Id.
-import java.math.BigDecimal;
-
-// Persistence Support.
-import com.arsdigita.domain.DataObjectNotFoundException;
-import com.arsdigita.persistence.DataAssociation;
-import com.arsdigita.persistence.DataAssociationCursor;
-import com.arsdigita.persistence.DataObject;
-import com.arsdigita.persistence.OID;
-
-// Globalization
-import com.arsdigita.globalization.Locale;
-
-// Logging
-import org.apache.log4j.Logger;
-
-/**
- * Represents an object that corresponds to a package type.
- * A package instance can have its own content, presentation,
- * and parameters associated with it.
- *
- * @since ACS 5.0
- * @see PackageType
- * @version $Revision: #14 $, $Date: 2004/08/16 $
- * @version $Id: PackageInstance.java 287 2005-02-22 00:29:02Z sskracic $
- * @deprecated without direct replacement. Refactor to use
- *             {@link com.arsdigita.web.Application} instead.
- */
-public class PackageInstance extends ACSObject {
-
-    private static final Logger s_log =
-        Logger.getLogger(PackageInstance.class.getName());
-    public static final String BASE_DATA_OBJECT_TYPE =
-        "com.arsdigita.kernel.PackageInstance";
-
-    protected String getBaseDataObjectType() {
-        return BASE_DATA_OBJECT_TYPE;
-    }
-
-    // the package type for this package instance
-    // this will only be cached for the lifetime of the domain
-    // object.
-    private PackageType m_packageType;
-
-    /**
-     * Constructs a new PackageInstance with no values set.
-     * Use <code>PackageType.createInstance</code> to create
-     * a new instance, or <code>PackageInstance(OID oid)</code>
-     * to retrieve an existing one.<p>
-     * This is for use only by subclasses of PackageInstance.
-     *
-     * @see com.arsdigita.domain.DomainObject#DomainObject(String)
-     * @see PackageType#createInstance
-     * @see #PackageInstance(OID)
-     *
-     * @param objectType The object type which the instance will be created
-     *                   as.
-     */
-    protected PackageInstance( String objectType ) {
-        super( objectType );
-    }
-
-    /**
-     * Constructs a new PackageInstance with no values set.
-     * Use <code>PackageType.createInstance</code> to create
-     * a new instance, or <code>PackageInstance(OID oid)</code>
-     * to retrieve an existing one.
-     *
-     * @see com.arsdigita.domain.DomainObject#DomainObject(String)
-     * @see PackageType#createInstance
-     * @see #PackageInstance(OID)
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    protected PackageInstance() {
-        super(BASE_DATA_OBJECT_TYPE);
-    }
-
-    /**
-     * Constructs a PackageInstance domain object from a package instance
-     * data object.
-     *
-     * @param dataObject a PackageInstance data object
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public PackageInstance(DataObject dataObject) {
-        super(dataObject);
-    }
-
-    /**
-     * Retrieves the PackageInstance domain object with the specified ID.
-     *
-     * @param id the primary key of the package instance
-     * @exception DataObjectNotFoundException if the id does not
-     * correspond to an existing package instance.
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public PackageInstance(BigDecimal id) throws DataObjectNotFoundException {
-        super(new OID(BASE_DATA_OBJECT_TYPE, id));
-    }
-
-    /**
-     * Retrieves the PackageInstance domain object with the specified OID.
-     *
-     * @param oid the objectID of the package instance
-     * @exception DataObjectNotFoundException If the OID does not
-     * correspond to an existing package instance.
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public PackageInstance(OID oid) throws DataObjectNotFoundException {
-        super(oid);
-    }
-
-    public PackageType getType() {
-        // cache the package type for the lifetime of the package instance
-        // object.
-        if (m_packageType == null) {
-            DataObject dobj = (DataObject)get("packageType");
-            m_packageType = new PackageType(dobj);
-            dobj.disconnect();
-        }
-        return m_packageType;
-    }
-
-    /**     
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    protected void setType(PackageType type) {
-        setAssociation("packageType", type);
-        m_packageType = type;
-    }
-
-    /**
-     *
-     * Returns the first site node on which this package instance is mounted.
-     * Currently, the order is determined by the site node's ID property.
-     * In the future, an explicit sort key may be introduced on the links
-     * between a package instance and its mount points.  Returns null
-     * if this package instance is not mounted.
-     * @return the first site node on which this package instance is mounted,
-     * or null if this package instance is not mounted.
-     * 
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     **/
-    public SiteNode getDefaultMountPoint() {
-        SiteNode defaultMountPoint = null;
-        DataAssociationCursor nodes =
-            ((DataAssociation) get("mountPoint")).cursor();
-        nodes.addOrder("id");
-        if (nodes.next()) {
-            defaultMountPoint = new SiteNode(nodes.getDataObject());
-            nodes.close();
-        }
-        return defaultMountPoint;
-    }
-
-    /**
-     * @deprecated use getType() instead
-     * @see com.arsdigita.kernel.PackageInstance#getType()
-     */
-    public PackageType getPackageType() {
-        return getType();
-    }
-
-    /**
-     * @deprecated
-     */
-    public String getPackageKey() {
-        return getKey();
-    }
-
-    /**
-     * Gets the name of this package.
-     * @return the package key.
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public String getKey() {
-        return getType().getKey();
-    }
-
-    /**
-     * Sets the package key.
-     * @param key the key for this package
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public void setKey(String key) {
-        set("packageKey", key);
-    }
-
-    /**
-     * Gets the package name.
-     * @return the package's name.
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public String getName() {
-        return (String)get("prettyName");
-    }
-
-    /**
-     * Returns a display name for this package instance.
-     *
-     * @see ACSObject#getDisplayName()
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    @Override
-    public String getDisplayName() {
-        return getName();
-    }
-
-    public void setName(String prettyName) {
-        set("prettyName", prettyName);
-    }
-
-    public String getParameter(String v) {
-        return getParameter(v, null);
-    }
-    public String getParameter(String v, String y) {
-        throw new UnsupportedOperationException("Not implemented yet.");
-    }
-    public int getParameter(String v,  int x) {
-        throw new UnsupportedOperationException("Not implemented yet.");
-    }
-
-    /**
-     * <p>
-     * The name of a resource bundle, suitable for passing as the first
-     * parameter to ResourceBundle.getBundle(String, Locale).  Should
-     * be a fully qualified Java resource name.
-     * </p>
-     *
-     * <p>
-     * TODO: For now we calculate the name based on the name of the
-     * Dispatcher for this package, using a hardcoded algorithm.
-     * Specifically, we replace "Dispatcher" with "Resources"
-     * (the corresponding bundle name for "MyDispatcher" would be
-     * "MyResources"). Eventually, we will do away with this algorithm
-     * and replace it with another attribute of a Package.
-     * </p>
-     *
-     * @return the name of the resource bundle we should try loading
-     * for ResourceBundle.
-     */
-    public String getTargetBundle() {
-        String dispatcherClass = getType().getDispatcherClass();
-        if (dispatcherClass.endsWith("Dispatcher")) {
-            return dispatcherClass.substring(
-                                             0,
-                                             dispatcherClass.length() - "Dispatcher".length()
-                                             ) + "Resources";
-        } else {
-            String key = getKey();
-            return "com.arsdigita." + key + "." + key + "Resources";
-        }
-    }
-
-    /**
-     * Gets all the site nodes where this instance is mounted.
-     * @return all the site nodes where this instance is mounted.
-     */
-    public SiteNodeCollection getMountPoints() {
-        DataAssociation mountAssociation = (DataAssociation)(get("mountPoint"));
-        return new SiteNodeCollection(mountAssociation);
-    }
-
-    /**
-     * <p>
-     * Returns the locale that is associated with this PackageInstance.
-     * </p>
-     *
-     * @return java.util.Locale.
-     */
-    public java.util.Locale getLocale() {
-        java.util.Locale locale = null;
-        DataObject localeDataObject = (DataObject) get("locale");
-
-        if (localeDataObject != null) {
-            Locale localeObject = new Locale(localeDataObject);
-
-            if (localeObject != null) {
-                locale = localeObject.toJavaLocale();
-            }
-        }
-
-        return locale;
-    }
-
-    /**
-     * <p>
-     * Sets the locale to be associated with this PackageInstance.
-     * </p>
-     *
-     * @param locale java.util.Locale
-     */
-    public void setLocale(java.util.Locale locale) {
-        Locale localeObject = Locale.fromJavaLocaleBestMatch(locale);
-        setLocale(localeObject);
-    }
-
-    /**
-     * <p>
-     * Set the locale to be associated with this PackageInstance.
-     * </p>
-     *
-     * @param locale com.arsdigita.globalization.Locale
-     */
-    private void setLocale(Locale locale) {
-        setAssociation("locale", locale);
-    }
-
-    protected ACSObject getContainer() {
-        return null;
-    }
-
-    public void delete() {
-        PackageEventListener pels[] = getType().getListeners();
-        for (int i = 0; i < pels.length; i++) {
-            PackageEventListener listener = pels[i];
-            listener.onDelete(this);
-        }
-        super.delete();
-    }
-}
diff --git a/ccm-core/src/com/arsdigita/kernel/PackageInstanceCollection.java b/ccm-core/src/com/arsdigita/kernel/PackageInstanceCollection.java
deleted file mode 100755
index 4fe259944..000000000
--- a/ccm-core/src/com/arsdigita/kernel/PackageInstanceCollection.java
+++ /dev/null
@@ -1,48 +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
- *
- */
-package com.arsdigita.kernel;
-
-import com.arsdigita.domain.DomainObject;
-
-import com.arsdigita.persistence.DataCollection;
-
-/**
- * Represents collection of PackageInstances.
- *
- * @author Bryan Quinn 
- * @since ACS 5.0
- * @version $Revision: #8 $ $Date: 2004/08/16 $
- * @version $Id: PackageInstanceCollection.java 287 2005-02-22 00:29:02Z sskracic $
- */
-
-public class PackageInstanceCollection extends ACSObjectCollection {
-
-    public PackageInstanceCollection(DataCollection dataCollection) {
-        super(dataCollection);
-    }
-
-    public PackageInstance getPackageInstance() {
-        return new PackageInstance(m_dataCollection.getDataObject());
-    }
-
-    public DomainObject getDomainObject() {
-        return (DomainObject)getPackageInstance();
-    }
-
-}
diff --git a/ccm-core/src/com/arsdigita/kernel/PackageType.java b/ccm-core/src/com/arsdigita/kernel/PackageType.java
deleted file mode 100755
index f02d11227..000000000
--- a/ccm-core/src/com/arsdigita/kernel/PackageType.java
+++ /dev/null
@@ -1,804 +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
- *
- */
-package com.arsdigita.kernel;
-
-import com.arsdigita.db.Sequences;
-import com.arsdigita.dispatcher.Dispatcher;
-import com.arsdigita.domain.DataObjectNotFoundException;
-import com.arsdigita.persistence.DataAssociation;
-import com.arsdigita.persistence.DataAssociationCursor;
-import com.arsdigita.persistence.DataCollection;
-import com.arsdigita.persistence.DataObject;
-import com.arsdigita.persistence.OID;
-import com.arsdigita.persistence.PersistenceException;
-import com.arsdigita.persistence.SessionManager;
-import com.arsdigita.util.UncheckedWrapperException;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.math.BigDecimal;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-
-/**
- * Represents a package type.
- *
- * @since ACS 5.0
- * @version $Revision: #15 $, $Date: 2004/08/16 $
- * @version $Id: PackageType.java 287 2005-02-22 00:29:02Z sskracic $
- * @deprecated without direct replacement. Refactor to use
- *             {@link com.arsdigita.web.ApplicationType} instead.
- */
-
-public class PackageType extends com.arsdigita.domain.DomainObject {
-
-    /** The logging object for this class. */
-    private static final Logger s_log =
-        Logger.getLogger(PackageType.class.getName());
-
-    // Used for caching dispatchers
-    private static java.util.HashMap s_dispatchers = new java.util.HashMap();
-
-    public static final String BASE_DATA_OBJECT_TYPE =
-        "com.arsdigita.kernel.PackageType";
-
-    protected String getBaseDataObjectType() {
-        return BASE_DATA_OBJECT_TYPE;
-    }
-
-    /**
-     * Default constructor. The contained <code>DataObject</code> is
-     * initialized with a new <code>DataObject</code> with an
-     * <code>ObjectType</code> of "PackageType".
-     *
-     * @see com.arsdigita.persistence.DataObject
-     * @see com.arsdigita.persistence.metadata.ObjectType
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.ApplicationType} instead.
-     */
-    public PackageType() {
-        super(BASE_DATA_OBJECT_TYPE);
-    }
-
-    /**
-     * Constructor in which the contained <code>DataObject</code> is
-     * initialized with a new <code>DataObject</code> with an
-     * <code>ObjectType</code> specified by the string
-     * <i>typeName</i>.
-     *
-     * @param typeName the name of the <code>ObjectType</code> of the
-     * contained <code>DataObject</code>
-     *
-     * @see Party#Party(ObjectType)
-     * @see com.arsdigita.persistence.DataObject
-     * @see com.arsdigita.persistence.metadata.ObjectType
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.ApplicationType} instead.
-     */
-    public PackageType(DataObject dataObject) {
-        super(dataObject);
-    }
-
-    /**
-     * Constructor in which th contained <code>DataObject</code> is retrieved
-     * from the persistent storage mechanism with an <code>OID</code>
-     * specified by <i>oid</i>.
-     *
-     * @param oid the <code>OID</code> for the retrieved
-     * <code>DataObject</code>
-     *
-     * @see com.arsdigita.domain.ObservableDomainObject#ObservableDomainObject(OID)
-     * @see com.arsdigita.persistence.DataObject
-     * @see com.arsdigita.persistence.OID
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.ApplicationType} instead.
-     */
-    public PackageType(OID oid) throws DataObjectNotFoundException {
-        super(oid);
-    }
-
-    protected void initialize() {
-        super.initialize();
-        if (isNew()) {
-            if (get("id") == null) {
-                setID(generateID());
-            }
-        }
-    }
-
-    protected void beforeSave() throws PersistenceException {
-        super.beforeSave();
-        if (isNew()) {
-            if (getDispatcherClass() == null) {
-                setDispatcherClass("com.arsdigita.dispatcher.JSPApplicationDispatcher");
-            }
-        }
-    }
-
-    /**
-     * Gets the value of the ID property.
-     *
-     * @return the value of the ID property.
-     */
-    public BigDecimal getID() {
-        return (BigDecimal) get("id");
-    }
-
-    /**
-     * Sets the value of the ID property only if this is new.
-     * Returns the value that the ID is set to.
-     *
-     * @param id the value to try to set the ID property to
-     * @return the value that the ID property is set to.
-     */
-    private BigDecimal setID(BigDecimal id) {
-        if (isNew()) {
-            set("id", id);
-            return id;
-        } else {
-            return getID();
-        }
-    }
-
-    private BigDecimal generateID() throws PersistenceException {
-        try {
-            return Sequences.getNextValue();
-        } catch (SQLException e) {
-            final String errorMsg = "Unable to generate a unique " +
-                "id.";
-            s_log.error(errorMsg);
-            throw new PersistenceException(errorMsg);
-        }
-    }
-
-    /**
-     * Gets the key of the package type.
-     *
-     * @return the key of the package.  This will never be null.
-     * @see #setKey(String)
-     */
-    public String getKey() {
-        return (String)get("packageKey");
-    }
-
-    /**
-     * Sets the key of the package type.  The key is an abbreviation of the
-     * package name and is a unique String representation of it.
-     * An example key for the "ACS Kernel" is "acs-kernel."
-     * <P>
-     * This method
-     * can only be called when the package type is intially created.  After
-     * it is saved, calling this method will cause an exception to be thrown.
-     *
-     * @param key the key of the package
-     * @throws RuntimeException if setKey() is called after the package
-     * type has been persisted by calling the save() method.
-     * @see #getKey()
-     */
-    public void setKey(String key) {
-        if (getKey() == null) {
-            set("packageKey", key);
-        } else if (!isNew()) {
-            throw new RuntimeException
-                ("setKey() cannot be called with a new key" +
-                 "once the packageType is persisted.");
-        }
-    }
-
-    public String getDisplayName() {
-        return (String)get("prettyName");
-    }
-
-    /**
-     * Sets the display name of the package type.
-     * The value of this method is used by UIs to provide a human-readable
-     * display for a package type.
-     *
-     * @param displayName the display name of the package type
-     */
-    public void setDisplayName(String displayName) {
-        set("prettyName", displayName);
-    }
-
-    /**
-     * Returns the plural version of the display name.
-     *
-     * @return the plural version of the display name.
-     * @see #setDisplayPlural(String)
-     */
-    public String getDisplayPlural() {
-        return (String)get("prettyPlural");
-    }
-
-    /**
-     * Sets the displayPlural of the package type.
-     * The value is used by UIs to provide a human-readable
-     * display for a package type.
-     *
-     * @param displayPlural the plural form of the display name
-     * @see #getDisplayPlural()
-     */
-    public void setDisplayPlural(String displayPlural) {
-        set("prettyPlural", displayPlural);
-    }
-
-    /**
-     * Gets the Unique Resource Identifier (URI) for the package.
-     *
-     * @return the Unique Resource Identifier for this package.
-     * @see #setURI(String)
-     */
-    public String getURI() {
-        return (String)get("packageURI");
-    }
-
-    /**
-     * Sets a Unique Resource Identifier (URI) for the package.
-     * The URI is used to provide a completely unique identification
-     * for this package.  The URI typically identifies a company
-     * name and the package key (for example, http://www.arsdigita.com/acs-java).
-     *
-     * @param URI a Unique Resource Identifier for the package
-     * @see #getURI()
-     */
-    public void setURI(String URI) {
-        set("packageURI", URI);
-    }
-
-    /**
-     * Gets the name of the dispatcher class for this package
-     * type.
-     *
-     * @return the name of this package type's dispatcher class.
-     * @see #setDispatcherClass(String)
-     * @see #getDispatcher()
-     */
-    public String getDispatcherClass() {
-        return (String)get("dispatcherClass");
-    }
-
-    /**
-     * Sets the dispatcher class for this package type.
-     * When an instance of this package is mounted at a site node,
-     * the dispatcher becomes active for the URL for that node.
-     * The dispatcher must implement the
-     * {@link com.arsdigita.dispatcher.Dispatcher} interface.
-     *
-     * @param dispatcherClass the string name of a dispatcher implementation
-     * @see #getDispatcherClass()
-     */
-    public void setDispatcherClass(String dispatcherClass) {
-        set("dispatcherClass", dispatcherClass);
-    }
-
-    /**
-     * Gets an instance of the dispatcher registered for this class.
-     * package.  The {@link #setDispatcherClass(String)} method is used
-     * to set which dispatcher will be returned.
-     *
-     * @return a dispatcher for this ACS package.
-     * @see #setDispatcherClass(String)
-     * @see #getDispatcher()
-     */
-    public Dispatcher getDispatcher()
-        throws ClassNotFoundException, InstantiationException,
-               IllegalAccessException, InvocationTargetException
-    {
-        Object dis;
-        synchronized(s_dispatchers) {
-            dis = s_dispatchers.get(getOID());
-            if ( dis == null ) {
-                Class dispatcherClass = Class.forName(getDispatcherClass());
-                try {
-                    java.lang.reflect.Method method =
-                        dispatcherClass.getMethod("newInstance",null);
-                    dis = method.invoke(null, new Object[] {});
-                } catch (NoSuchMethodException e) {
-                    dis = dispatcherClass.newInstance();
-                }
-                s_dispatchers.put(getOID(), dis);
-            }
-        }
-        // If the dispatcher is still null, we need to throw an exception.
-        if (dis == null) {
-            throw new InstantiationException
-                ("Unable to instantiate dispatcher: " + getDispatcherClass() + ".");
-        }
-        return (Dispatcher) dis;
-    }
-
-    /**
-     * This convenience method is used to create an instance of this
-     * package type.  The package instance that is returned is persisted
-     * so the {@link #save()} method only needs to be called if it is changed.
-     *
-     * @param displayName the display name for the package instance
-     * @return a persisted package instance.
-     */
-    public PackageInstance createInstance(String displayName) {
-        PackageInstance pkg = new PackageInstance();
-        return initInstance( pkg, displayName );
-    }
-
-
-    /**
-     * This convenience method is used to create an instance of this
-     * package type.  The package instance that is returned is persisted
-     * so the {@link #save()} method only needs to be called if it is changed.
-     *
-     * @param displayName the display name for the package instance
-     * @return a persisted package instance.
-     */
-    public PackageInstance createInstance(Class instanceClass,
-                                          String displayName) {
-        PackageInstance pkg;
-        try {
-            Constructor constructor =
-                instanceClass.getConstructor( new Class[]{} );
-            pkg = (PackageInstance) constructor.newInstance( new Object[]{} );
-        } catch( NoSuchMethodException ex ) {
-            throw new UncheckedWrapperException( ex );
-        } catch( InstantiationException ex ) {
-            throw new UncheckedWrapperException( ex );
-        } catch( IllegalAccessException ex ) {
-            throw new UncheckedWrapperException( ex );
-        } catch( InvocationTargetException ex ) {
-            throw new UncheckedWrapperException( ex );
-        }
-
-        return initInstance( pkg, displayName );
-    }
-
-    private PackageInstance initInstance( PackageInstance pkg,
-                                          String displayName ) {
-        pkg.setName(displayName);
-        pkg.setType(this);
-        pkg.save();
-        // Fire Event to Listeners
-        PackageEventListener pels[] = getListeners();
-        for (int i = 0; i < pels.length; i++) {
-            PackageEventListener listener = pels[i];
-            listener.onCreate(pkg);
-        }
-        return pkg;
-    }
-
-
-    /**
-     * Adds a stylesheet for this package type.  When any component
-     * of this package is rendered from XML, the stylesheet will be used.
-     *
-     * @param sheet a stylesheet used for rendering this package
-     */
-/*  public void addStylesheet(Stylesheet sheet) {
-        sheet.addToAssociation((DataAssociation) get("defaultStyle"));
-    }
-*/
-    /**
-     * Gets all the stylesheets used for rendering this package.
-     *
-     * @param locale the locale being used for rendering the package
-     * @param outputType an identification of output type, such as
-     * "text/html"
-     * @return an array of stylesheets for the specificed locale and
-     * output type.
-     * @see #addStylesheet(Stylesheet)
-     *
-     * @deprecated without direct replacement. It is designed to work with
-     * {@link com.arsdigita.templating.LegacyStylesheetResolver} which is
-     * replaced by {@link com.arsdigita.templating.PatternStylesheetResolver}.
-     * So thes method is just not used anymore. (pboy)
-     */
-/*    public Stylesheet[] getStylesheets(Locale locale, String outputType) {
-        return StyleAssociation
-            .getStylesheets(get("defaultStyle"), locale, outputType);
-    }
-*/
-    /**
-     * Gets the first stylesheet (best match) associated with this package.
-     * @param locale the locale being used for rendering the package
-     * @param outputType an identification of output type, such as
-     * "text/html"
-     * @return the best match stylesheet for this package.
-     * @see #addStylesheet(Stylesheet)
-     *
-     * @deprecated without direct replacement. It is designed to work with
-     * {@link com.arsdigita.templating.LegacyStylesheetResolver} which is
-     * replaced by {@link com.arsdigita.templating.PatternStylesheetResolver}.
-     * So thes method is just not used anymore. (pboy)
-     */
-/*    public Stylesheet getStylesheet(Locale locale, String outputType) {
-        return StyleAssociation
-            .getStylesheet(get("defaultStyle"), locale, outputType);
-    }
-*/
-    /**
-     * Removes a stylesheet from the set of stylesheets used for rendering
-     * this package.
-     *
-     * @param sheet the stylesheet to be removed
-     */
-/*  public void removeStylesheet(Stylesheet sheet) {
-        sheet.removeFromAssociation((DataAssociation)get("defaultStyle"));
-    }
-*/
-    /**
-     * Adds a listener to the events for this package.
-     *
-     * @param listenerClass the name of a listener instance
-     */
-    public void addListener(String listenerClass) {
-        // To add a listener, first see if it is already there.
-        // If not, create a data object and add to the association.
-        if (!hasListener(listenerClass)) {
-            try {
-                instantiateListener(listenerClass);
-            } catch (InstantiationException e) {
-                s_log.error("Unable to add listener because it cannot be "+
-                            "instantiated.  Error: " + e.getMessage());
-            }
-            ((DataAssociation)get("listener")).add
-                (createListener(listenerClass));
-        }
-    }
-
-    /**
-     * Removes a listener from the events for this package.
-     *
-     * @param listenerClass the name of the listener instance
-     */
-    public void removeListener(String listenerClass) {
-        DataAssociationCursor cursor = getListenerCursor();
-        cursor.addFilter(cursor.getFilterFactory().equals("listenerClass",
-                                                          listenerClass));
-        if (cursor.next()) {
-            DataObject listener = cursor.getDataObject();
-            ((DataAssociation)get("listener")).remove(listener);
-        }
-
-        cursor.close();
-    }
-
-    /**
-     * Checks if this package has a listener of the specified class.
-     *
-     * @param listenerClass the name of a listener registered on this class
-     * @return <code>true</code> if the specified listener is registered,
-     * <code>false</code> otherwise.
-     */
-    public boolean hasListener(String listenerClass) {
-        DataAssociationCursor cursor = getListenerCursor();
-        while (cursor.next()) {
-            if (((String)cursor.get("listenerClass")).equals(listenerClass)) {
-                cursor.close();
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * A convenience method for creating a listener data object.
-     *
-     */
-    private DataObject createListener(String listenerClass) {
-        DataObject listener;
-        // See if the listener exists.
-        DataCollection dc = SessionManager.getSession().retrieve
-            ("com.arsdigita.kernel.PackageListener");
-        dc.addFilter(dc.getFilterFactory().equals("listenerClass",
-                                                  listenerClass));
-        if (dc.next()) {
-            DataObject dataObject = dc.getDataObject();
-            dc.close();
-            return dataObject;
-        } else {
-            listener = SessionManager.getSession().create
-                ("com.arsdigita.kernel.PackageListener");
-            listener.set("id", generateID());
-            listener.set("listenerClass", listenerClass);
-            listener.save();
-            return listener;
-        }
-    }
-
-    /**
-     * Finds all the package event listeners registered to this
-     * class.
-     *
-     * @return the package event listeners.
-     */
-    protected PackageEventListener[] getListeners() {
-        List list = new ArrayList();
-
-        // cursor of listeners for this package.
-        DataAssociationCursor cursor = getListenerCursor();
-        while (cursor.next()) {
-            try {
-                list.add(instantiateListener
-                         (((String)cursor.get("listenerClass"))));
-            } catch (InstantiationException e) {
-                // We couldn't instaniate one.
-                s_log.error(e.getMessage());
-            }
-        }
-
-        // create the array.
-        PackageEventListener[] listeners =
-            new PackageEventListener[list.size()];
-        for (int i = 0; i < listeners.length; i++) {
-            listeners[i] = ((PackageEventListener)list.get(i));
-        }
-        return listeners;
-    }
-
-    /**
-     * @return A cursor of listeners for this package.
-     */
-    private DataAssociationCursor getListenerCursor() {
-        return ((DataAssociation) get("listener")).cursor();
-    }
-
-    /**
-     * Convenience method for instantiating a class from a String className.
-     *
-     * @param className a <code>String</code> value for a class name.
-     */
-    private PackageEventListener instantiateListener(String className)
-        throws InstantiationException
-    {
-        try {
-            PackageEventListener pel =
-                (PackageEventListener)Class.forName(className).newInstance();
-            return pel;
-        } catch (IllegalAccessException e) {
-            String errorMsg = "Unable to access " + className + ":" +
-                e.getMessage();
-            s_log.error(errorMsg);
-            throw new InstantiationException(errorMsg);
-        } catch (ClassNotFoundException e) {
-            String errorMsg = "Unable to find " + className + ":" +
-                e.getMessage();
-            s_log.error(errorMsg);
-            throw new InstantiationException(errorMsg);
-        }
-    }
-
-    /**
-     * Returns a collection of all the instances of
-     * package type.
-     *
-     * @return all the instances of this package type.
-     */
-    public PackageInstanceCollection getInstances() {
-        DataAssociation instanceAssociation =
-            (DataAssociation)(get("packageInstance"));
-        return new PackageInstanceCollection(instanceAssociation);
-    }
-
-    /**
-     * Finds the package type of the specified key.
-     *
-     * @param key the package key for the package
-     * @return the package type with the specified key.
-     * @exception DataObjectNotFoundException if the key does not correspond
-     * to an existing package type.
-     * @see #setKey(String)
-     * @see #getKey()
-     */
-    public static PackageType findByKey(String key)
-        throws DataObjectNotFoundException
-    {
-
-        PackageType pt = getTypeByKey(key);
-
-        if (pt == null) {
-            throw new DataObjectNotFoundException
-                ("No package type matching the key '" + key + "' was found.");
-        }
-
-        return pt;
-    }
-
-    public static boolean typeExists(String key) {
-        return getTypeByKey(key) != null;
-    }
-
-    private static PackageType getTypeByKey(String key) {
-        DataCollection dc = SessionManager.getSession().retrieve
-            (BASE_DATA_OBJECT_TYPE);
-        dc.addFilter(dc.getFilterFactory().equals("packageKey", key));
-        PackageType pt = null;
-        try {
-            if (dc.next()) {
-                pt = new PackageType(dc.getDataObject());
-            }
-
-        } finally {
-            dc.close();
-        }
-
-        return pt;
-    }
-    /**
-     * Creates a package type with the specified key, display name, display
-     * plural, and URI.  This is a convenience method for having
-     * to create an empty packageType followed by all of the set methods.
-     *
-     * The example below creates a package type for subsites.
-     *
-     * <pre>
-     * PackageType subsite = PackageType.create
-     *       ("acs-subsite", "ACS Subsite", "ACS Subsites",
-     *        "http://arsdigita.com/acs-subsite/");
-     * </pre>
-     *
-     * @param key the key for the package type
-     * @param displayName the display name for the package type
-     * @param displayPlural the plural form of the display name
-     * @param URI the Unique Resource Identifier for this package
-     * @return A persisted packageType.  The save() method is automatically
-     * called.
-     * @see #setKey(String)
-     * @see #setDisplayName(String)
-     * @see #setDisplayPlural(String)
-     * @see #setURI(String)
-     */
-    public static PackageType create(String key,
-                                     String displayName,
-                                     String displayPlural,
-                                     String URI) {
-        PackageType pt = new PackageType();
-        pt.setKey(key);
-        pt.setDisplayName(displayName);
-        pt.setDisplayPlural(displayPlural);
-        pt.setURI(URI);
-        pt.save();
-        return pt;
-    }
-
-    /**
-     * Returns a list of all available package keys.
-     *
-     * @return a list of all PackageKeys in the system.
-     */
-    public static List getAllPackageKeys() {
-        List keyList = new ArrayList();
-        DataCollection dc =
-            SessionManager.getSession().retrieve(BASE_DATA_OBJECT_TYPE);
-        while (dc.next()) {
-            keyList.add((String)dc.get("packageKey"));
-        }
-        return keyList;
-    }
-
-    /**
-     * Returns a collection of all defined package types.
-     *
-     * @return A PackageTypeCollection with all package types.
-     */
-    public static PackageTypeCollection retrieveAll() {
-        DataCollection dataCollection =
-            SessionManager.getSession().retrieve(BASE_DATA_OBJECT_TYPE);
-        PackageTypeCollection packageTypeCollection = new PackageTypeCollection
-            (dataCollection);
-
-        return packageTypeCollection;
-    }
-
-    /**
-     * Returns a list of all available package ID values.
-     *
-     * @deprecated
-     * @see #getAllPackageKeys()
-     */
-    public static List getAllPackageIds() {
-        List keyList = new ArrayList();
-        DataCollection dc = SessionManager.getSession().retrieve
-            (BASE_DATA_OBJECT_TYPE);
-        while (dc.next()) {
-            keyList.add((BigDecimal)dc.get("id"));
-        }
-        return keyList;
-    }
-
-
-    /**
-     * @deprecated Use {@link #getKey()}
-     */
-    public String getPackageKey() {
-        return getKey();
-    }
-
-    /**
-     *
-     * @return the package of Java servlets that are bundled with this
-     * package.
-     * @deprecated This information is no longer used.
-     */
-    public String getServletPackage() {
-        return (String)get("servletPackage");
-    }
-
-    /**
-     * @return the package of Java servlets that are bundled with this
-     * package.
-     * @deprecated This information is no longer used.
-     */
-    public void setServletPackage(String servletPackage) {
-        set("servletPackage", servletPackage);
-    }
-
-    /**
-     * @deprecated Use {@link #getDisplayName()}
-     */
-    public String getPrettyName() {
-        return getDisplayName();
-    }
-
-    /**
-     * @deprecated
-     * @see #setDisplayName(String)
-     */
-    public void setPrettyName(String displayName) {
-        setDisplayName(displayName);
-    }
-
-    /**
-     * @deprecated
-     * @see #getDisplayPlural()
-     */
-    public String getPrettyPlural() {
-        return (String)get("prettyPlural");
-    }
-
-    /**
-     * @deprecated
-     * @see #setDisplayPlural(String)
-     */
-    public void setPrettyPlural(String prettyPlural) {
-        set("prettyPlural", prettyPlural);
-    }
-
-    /**
-     * Finds the package type of the specified key.
-     * @deprecated
-     * @see #findByKey(String)
-     */
-    public static PackageType findPackageTypeByKey(String key)
-        throws DataObjectNotFoundException {
-        return findByKey(key);
-    }
-
-    /**
-     * Creates a package type and persists it to the database.
-     * @deprecated
-     * @see #create(String, String, String, String)
-     */
-    public static PackageType createPackageType(String key,
-                                                String displayName,
-                                                String displayPlural,
-                                                String URI) {
-        return create(key, displayName, displayPlural, URI);
-    }
-
-}
diff --git a/ccm-core/src/com/arsdigita/kernel/PackageTypeCollection.java b/ccm-core/src/com/arsdigita/kernel/PackageTypeCollection.java
deleted file mode 100755
index adbcf3577..000000000
--- a/ccm-core/src/com/arsdigita/kernel/PackageTypeCollection.java
+++ /dev/null
@@ -1,73 +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
- *
- */
-package com.arsdigita.kernel;
-
-import com.arsdigita.domain.DomainCollection;
-import com.arsdigita.domain.DomainObject;
-import com.arsdigita.persistence.DataCollection;
-import com.arsdigita.persistence.DataObject;
-
-/**
- * Represents a collection of package types.
- *
- * @since ACS 5.0
- * @version $Revision: #15 $, $Date: 2004/08/16 $
- * @version $Id: PackageTypeCollection.java 287 2005-02-22 00:29:02Z sskracic $
-
- * @deprecated without direct replacement. Refactor to use
- *             {@link com.arsdigita.web.ApplicationTypeCollection} instead.
- */
-public class PackageTypeCollection extends DomainCollection {
-
-    /**
-     * 
-     * @param dataCollection 
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.ApplicationTypeCollection} instead.
-     */
-    protected PackageTypeCollection(DataCollection dataCollection) {
-        super(dataCollection);
-    }
-
-    /**
-     * 
-     * @return 
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.ApplicationTypeCollection} instead.
-     */
-    public DomainObject getDomainObject() {
-        DomainObject domainObject = getPackageType();
-
-        return domainObject;
-    }
-
-    /**
-     * 
-     * @return 
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.ApplicationTypeCollection} instead.
-     */
-    public PackageType getPackageType() {
-        DataObject dataObject = m_dataCollection.getDataObject();
-
-        PackageType packageType = new PackageType(dataObject);
-
-        return packageType;
-    }
-}
diff --git a/ccm-core/src/com/arsdigita/kernel/SiteNode.java b/ccm-core/src/com/arsdigita/kernel/SiteNode.java
deleted file mode 100755
index 84671f8a2..000000000
--- a/ccm-core/src/com/arsdigita/kernel/SiteNode.java
+++ /dev/null
@@ -1,681 +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
- *
- */
-package com.arsdigita.kernel;
-
-import com.arsdigita.domain.DataObjectNotFoundException;
-import com.arsdigita.persistence.DataAssociation;
-import com.arsdigita.persistence.DataCollection;
-import com.arsdigita.persistence.DataObject;
-import com.arsdigita.persistence.OID;
-import com.arsdigita.persistence.Session;
-import com.arsdigita.persistence.SessionManager;
-import com.arsdigita.util.HierarchyDenormalization;
-import com.arsdigita.web.PathMapCache;
-
-import java.math.BigDecimal;
-// import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.log4j.Logger;
-
-/**
- * A SiteNode represents a part of the URL hierarchy on a server.  Each instance
- * of a SiteNode may be mapped to an application instance for the purpose of
- * providing access to that application.
- *
- * <p>For example, the URL "http://www.example.com/news/" can be broken down
- * into:</p>
- *
- * <ul>
- *   <li>the protocol, which is <code><http://</code> </li>
- *   <li>the server, which is <code>www.example.com</code>. </li>
- *   <li>the hierarchy on the server, which is <code>/news/</code></li>
- * </ul>
- *
- * <p>The hierarchy is delimited by slashes (/).</p>
- *
- * <ul>
- *   <li>The first "/" indicates the root <code>SiteNode</code>, the parent of
- *   all other site nodes on the system.</li>
- *
- *   <li>The next token ("news/") indicates a <code>SiteNode</code> that is a
- *   child of the root <code>SiteNode</code> with a name of "news."</li>
- * </ul>
- *
- * @version 1.0
- * @version $Id: SiteNode.java 287 2005-02-22 00:29:02Z sskracic $
- * @since ACS 5.0
- * @deprecated Refactor to use {@link com.arsdigita.web.Application} instead.
- * The class is due to completly be removed.
- */
-public class SiteNode extends ACSObject {
-
-    private static final String s_typeName = "com.arsdigita.kernel.SiteNode";
-    private static final Logger s_log =
-        Logger.getLogger(SiteNode.class.getName());
-
-    private static final Cache s_cache = new Cache();
-
-    protected String getBaseDataObjectType() {
-        return s_typeName;
-    }
-
-    private static SiteNode s_rootSiteNode;
-
-    // This holds the class that maintains the hierarchy for the site node
-    private HierarchyDenormalization m_hierarchy;
-
-    /**
-     * Default constructor. The contained <code>DataObject</code> is
-     * initialized with a new <code>DataObject</code> with an
-     * <code>ObjectType</code> of "SiteNode".
-     *
-     * @see com.arsdigita.persistence.DataObject
-     * @see com.arsdigita.persistence.metadata.ObjectType
-     * @deprecated see above
-     */
-    public SiteNode() {
-        super(s_typeName);
-    }
-
-    /**
-     * Creates a new DomainObject instance to encapsulate a given
-     * data object.
-     *
-     * @param dataObject the data object to encapsulate in the new domain
-     * object
-     * @see com.arsdigita.persistence.Session#retrieve(String)
-     * @deprecated see above
-     */
-    public SiteNode(DataObject dataObject) {
-        super(dataObject);
-    }
-
-    @Override
-    @Deprecated
-    protected void initialize() {
-        super.initialize();
-        if (isNew()) {
-            set("isDirectory", Boolean.TRUE);
-            set("isPattern", Boolean.FALSE);
-        }
-        m_hierarchy = new HierarchyDenormalization
-            ("com.arsdigita.kernel.updateSiteNodeDescendants", this, "url") {};
-    }
-
-    /**
-     * Retrieves the SiteNode with the specified ID.
-     *
-     * @param id a SiteNode ID
-     * @exception DataObjectNotFoundException if the ID does not match
-     *     a SiteNode in the system.
-     * @deprecated see above
-     */
-    public SiteNode(BigDecimal id) throws DataObjectNotFoundException {
-        super(new OID(s_typeName, id));
-    }
-
-    /**
-     * Retrieves a SiteNode that corresponds to the specified OID.
-     *
-     * @param oid the OID for the retrieved instance
-     * @see com.arsdigita.domain.DomainObject#DomainObject(OID)
-     * @see com.arsdigita.persistence.OID
-     * @deprecated see above
-     */
-    public SiteNode(OID oid) throws DataObjectNotFoundException {
-        super(oid);
-    }
-
-    /**
-     * Gets the URL of the site note.
-     * @return the URL of the site node, <em>not</em> the URL requested by the
-     * user!
-     *
-     * @param req Servlet request.  This is needed to get the context
-     * path, in case the servlet is not mounted at /.
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public String getURL(HttpServletRequest req) {
-        return getURL(req==null ? (String) null : req.getContextPath());
-    }
-
-
-    /**
-     * Gets the URL of the site note.
-     *
-     * @param req Servlet request.  This is needed to get the context
-     * path, in case the servlet is not mounted at /.
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public String getUrl(HttpServletRequest req) {
-        return getURL(req);
-    }
-
-    /**
-     * @return the URL of the site node, <em>not</em> the URL requested by the
-     * user!
-     *
-     * @param ContextPath in case the servlet is not mounted at /
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public String getURL(String contextPath) {
-        if (contextPath != null) {
-            return contextPath + getURLNoContext();
-        } else {
-            return getURLNoContext();
-        }
-    }
-
-    /**
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public String getUrl(String contextPath) {
-        return getURL(contextPath);
-    }
-
-    /**
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public String getURL() {
-        return getURLNoContext();
-    }
-
-    /**
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    private void setURL() {
-        s_log.debug("Setting url: " + getURLFromParent());
-        set("url", getURLFromParent());
-    }
-
-    /**
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    private String getURLFromParent() {
-        SiteNode parent = getParent();
-        if (parent != null) {
-            return parent.getURL() + getName() + "/";
-        } else {
-            return getName() + "/";
-        }
-    }
-
-    /**
-     * @return the URL of the site node, <em>not</em> the URL
-     * requested by the user!
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public String getURLNoContext() {
-        String value = (String)get("url");
-        if (value == null) {
-            return "/";
-        } else {
-            return value;
-        }
-    }
-
-    /**
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public BigDecimal getNodeId() {
-        return (BigDecimal) get("id");
-    }
-
-    /**
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public void setName(String name) {
-        set("name", name);
-        setURL();
-    }
-
-    /**
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public void setParent(SiteNode siteNode) {
-        // Should throw an Exception if parent is not a directory.
-
-        if (siteNode == null) {
-            set("parent", null);
-        } else {
-            if (((Boolean) (siteNode.get("isDirectory"))).booleanValue()) {
-                setAssociation("parent", siteNode);
-            }
-        }
-
-        setURL();
-    }
-
-    /**
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public String getName() {
-        String name = (String) get("name");
-
-        if (name == null) {
-            return "";
-        } else {
-            return name;
-        }
-    }
-
-    /**
-     * Returns a display name for this site node.
-     *
-     * @see ACSObject#getDisplayName()
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    @Override
-    public String getDisplayName() {
-        return getURL();
-    }
-
-    /**
-     * @return <code>true</code> if this SiteNode can have children;
-     * <code>false</code> otherwise.
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public boolean isDirectory() {
-        return ((Boolean) (get("isDirectory"))).booleanValue();
-    }
-
-    /**
-     * @return <code>true</code> if the SiteNode supports patterns;
-     * <code>false</code> otherwise.
-     * @deprecated
-     */
-    public boolean isPattern() {
-        return ((Boolean)(get("isPattern"))).booleanValue();
-    }
-
-    /**
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public PackageInstance getPackageInstance() {
-        DataObject dataObject = (DataObject)get("mountedObject");
-        if (dataObject != null) {
-            return new PackageInstance(dataObject);
-        } else {
-            if (s_log.isDebugEnabled()) {
-                s_log.debug("No package mounted; returning null");
-            }
-            return null;
-        }
-    }
-
-    /**
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public void mountPackage(PackageInstance pkg) {
-        unMountPackage();
-
-        setAssociation("mountedObject", pkg);
-
-        PackageEventListener pels[] = pkg.getType().getListeners();
-
-        for (int i = 0; i < pels.length; i++) {
-            PackageEventListener listener = pels[i];
-            listener.onMount(this, pkg);
-        }
-    }
-
-    /**
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public void unMountPackage() {
-        PackageInstance pkg = getPackageInstance();
-
-        if (pkg != null) {
-            PackageEventListener pels[] = pkg.getType().getListeners();
-
-            for (int i = 0; i < pels.length; i++) {
-                PackageEventListener listener = pels[i];
-                listener.onUnmount(this, pkg);
-            }
-
-            set("mountedObject", null);
-        }
-    }
-
-    /**
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public SiteNode getParent() {
-        DataObject dataObject = (DataObject)get("parent");
-
-        if (dataObject == null || dataObject.get("id") == null) {
-            return null;
-        } else {
-            return new SiteNode(dataObject);
-        }
-    }
-
-    /**
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public SiteNodeCollection getChildren() {
-        DataAssociation childAssociation = (DataAssociation) get("children");
-        return new SiteNodeCollection(childAssociation);
-    }
-
-    /**
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public static SiteNode getRootSiteNode() {
-        // cache the site node statically
-        // note lack of synchronization.  worst case:
-        // two different threads concurrently query for the root
-        // site node and one gets garbage collected.  BFD.
-        if (s_rootSiteNode == null || !s_rootSiteNode.isValid()) {
-            // Retrieve read-only copy in new transaction context to
-            // guarantee validity.
-
-            Session ssn = SessionManager.getSession();
-
-            DataCollection rootSiteNode = SessionManager.getSession().retrieve
-                ("com.arsdigita.kernel.SiteNode");
-            rootSiteNode.addEqualsFilter("name", null);
-            rootSiteNode.addEqualsFilter("parent.id", null);
-
-            if (rootSiteNode.next()) {
-                try {
-                    DataObject dobj =
-                        ssn.retrieve(new OID(s_typeName,
-                                             rootSiteNode.get("id")));
-                    dobj.disconnect();
-                    s_rootSiteNode = new SiteNode(dobj);
-                } finally {
-                    rootSiteNode.close();
-                }
-            } else {
-                throw new DataObjectNotFoundException
-                    ("getRootSiteNode: Root site node not found.");
-            }
-
-            rootSiteNode.close();
-        }
-
-        return s_rootSiteNode;
-    }
-
-    /**
-     * for testing, it is necessary to remove all statically
-     * cached site nodes. Call this method AFTER creating
-     * any new site nodes as part of your unit test's
-     * setup method
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public static void repopulateCache() {
-        s_cache.refresh();
-    }
-
-    /**
-     * Finds the site node corresponding to the largest portion
-     * of the specified path. The path must begin with '/'.
-     * Any trailing slashes are ignored.
-     *
-     * @param path an absolute path to find the site node of
-     * @param readOnly if true, we return a read-only site node
-     * from our cache, which may be disconnected from a db session and
-     * can't be modified or deleted.  (This is the desired behavior
-     * the majority of the time.)
-     *
-     * @return the site node corresponding to the path, or
-     *         null if no matching site node can be found.
-     * @throws DataObjectNotFoundException if the path does not start
-     *         with a slash (probably the wrong behavior) or if the
-     *         RootSiteNode was requested but couldn't be found (also
-     *         probably wrong).
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public static SiteNode getSiteNode(final String path, boolean readOnly)
-            throws DataObjectNotFoundException {
-        if (s_log.isDebugEnabled()) {
-            s_log.debug("Finding the site node for path '" + path + "'");
-        }
-
-        final SiteNode siteNode = s_cache.getNode(path);
-
-        if (siteNode == null) {
-            throw new DataObjectNotFoundException
-                ("RootSiteNode not available." +
-                 "  The data model is not properly loaded.");
-        }
-
-        return readOnly ? siteNode : new SiteNode(siteNode.getOID());
-    }
-
-    /**
-     * Finds the site node corresponding to the largest portion
-     * of the specified path. The path must begin with '/'.
-     * Any trailing slashes are ignored.
-     *
-     * @param path an absolute path to find the site node of
-     * @return the site node corresponding to the path, or
-     *         null if no matching site node can be found.
-     * @throws DataObjectNotFoundException if the path does not start
-     *         with a slash (probably the wrong behavior) or if the
-     *         RootSiteNode was requested but couldn't be found (also
-     *         probably wrong).
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    public static SiteNode getSiteNode(String path)
-        throws DataObjectNotFoundException {
-        return getSiteNode(path, false);
-    }
-
-    @Deprecated
-    public static SiteNode createSiteNode(String name) {
-        return createSiteNode(name, getRootSiteNode());
-    }
-
-    /**
-     * Overrides the default save method.  If we've changed the
-     * URL of this site node (either by changing its name or its parent),
-     * we need to also update the URL for all descendants of this site node.
-     * @deprecated without direct replacement. Refactor to use
-     *             {@link com.arsdigita.web.Application} instead.
-     */
-    protected void beforeSave() {
-        if (isPropertyModified("url") || isNew()) {
-            s_cache.scheduleRefresh();
-        }
-
-        super.beforeSave();
-    }
-
-    @Deprecated
-    public void afterDelete() {
-        s_cache.scheduleRefresh();
-    }
-
-    @Deprecated
-    public static SiteNode createSiteNode(String name, SiteNode parent) {
-        SiteNode siteNode = new SiteNode();
-        siteNode.setName(name);
-        siteNode.setParent(parent);
-        siteNode.save();
-        return siteNode;
-    }
-
-    @Override
-    @Deprecated
-    public String toString() {
-        return "[url: " + getURL() + "]";
-    }
-
-/*    public void addStylesheet(Stylesheet sheet) {
-        sheet.addToAssociation((DataAssociation)get("defaultStyle"));
-    }
-*/
-
-//  /**
-//   *
-//   * @param locale
-//   * @param outputType
-//   * @return
-//   * @deprecated without direct replacement. It is designed to work with
-//   * {@link com.arsdigita.templating.LegacyStylesheetResolver} which is
-//   * replaced by {@link com.arsdigita.templating.PatternStylesheetResolver}.
-//   * So thes method is just not used anymore. (pboy)
-//   */
-//    public Stylesheet[] getStylesheets(Locale locale, String outputType) {
-//      return StyleAssociation
-//          .getStylesheets(get("defaultStyle"), locale, outputType);
-//  }
-  
-    /**
-     * 
-     * @param locale
-     * @param outputType
-     * @return
-     * @deprecated without direct replacement. It is design wo work with
-     * {@link com.arsdigita.templating.LegacyStylesheetResolver} which is
-     * replaced by {@link com.arsdigita.templating.PatternStylesheetResolver}.
-     * So this method is just not used anymore. (pboy)
-     */
-/*    public Stylesheet getStylesheet(Locale locale, String outputType) {
-        return StyleAssociation
-            .getStylesheet(get("defaultStyle"), locale, outputType);
-    }
-*/
-/*    public void removeStylesheet(Stylesheet sheet) {
-        sheet.removeFromAssociation((DataAssociation)get("defaultStyle"));
-    }
-*/
-    // the sole purpose of this class is to make site nodes hash the same across
-    // multiple server instances.
-    private static class SiteNodeWrapper {
-        final SiteNode m_node;
-
-        SiteNodeWrapper(SiteNode node) {
-            if (node==null) { throw new NullPointerException("node"); }
-
-            m_node = node;
-        }
-
-        @Override
-        @Deprecated
-        public boolean equals(Object obj) {
-            if (obj==null) { return false; }
-
-            SiteNodeWrapper snw = (SiteNodeWrapper) obj;
-            return m_node.getID().equals(snw.m_node.getID()) &&
-                m_node.getURL().equals(snw.m_node.getURL());
-        }
-
-        @Override
-        @Deprecated
-        public int hashCode() {
-            return m_node.getID().hashCode() + m_node.getURL().hashCode();
-        }
-
-        @Override
-        @Deprecated
-        public String toString() {
-            return m_node.toString();
-        }
-    }
-
-    // Caching of Site Nodes
-    // Stores the cached (url, siteNode) mappings.
-    @Deprecated
-    private static class Cache extends PathMapCache {
-
-        @Deprecated
-        public Cache() {
-            super("SiteNodeCache");
-        }
-
-        // implements the PathMapCache interface
-        @Deprecated
-        public String normalize(String path) {
-            if ( path==null ) { throw new NullPointerException("path"); }
-            if ( !path.startsWith("/") ) {
-                throw new DataObjectNotFoundException
-                    ("The URL path specified must begin with a '/'.");
-            }
-            return path.endsWith("/") ? path : (path + "/");
-        }
-
-        // implements the PathMapCache interface
-        @Deprecated
-        public Object retrieve(String path) {
-            DataCollection dc = SessionManager.getSession().retrieve
-                ("com.arsdigita.kernel.SiteNode");
-
-            dc.addEqualsFilter("url", path);
-
-            SiteNode siteNode = null;
-            if (dc.next()) {
-                DataObject dobj = dc.getDataObject();
-                dobj.disconnect();
-                siteNode = new SiteNode(dobj);
-                if (dc.next()) {
-                    s_log.error("More than one site node found for url " +
-                                path + " ids: " + siteNode.getID() +
-                                " and " + dc.get("id"));
-                }
-                dc.close();
-            }
-            return siteNode==null ? null : new SiteNodeWrapper(siteNode);
-        }
-
-        // implements the PathMapCache interface
-        @Deprecated
-        public void refresh() {
-            clearAll();
-        }
-
-        @Deprecated
-        void scheduleRefresh() {
-            super.refreshAfterCommit();
-        }
-
-        @Deprecated
-        synchronized SiteNode getNode(String path) {
-            SiteNodeWrapper snw = (SiteNodeWrapper) super.get(path);
-            return snw.m_node;
-        }
-    }
-}
diff --git a/ccm-core/src/com/arsdigita/kernel/SiteNodeCollection.java b/ccm-core/src/com/arsdigita/kernel/SiteNodeCollection.java
deleted file mode 100755
index e32fde90c..000000000
--- a/ccm-core/src/com/arsdigita/kernel/SiteNodeCollection.java
+++ /dev/null
@@ -1,49 +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
- *
- */
-package com.arsdigita.kernel;
-
-import com.arsdigita.domain.DomainObject;
-
-import com.arsdigita.persistence.DataCollection;
-
-/**
- * Represents a collection of SiteNodes.
- *
- * @author Bryan Quinn 
- * @version $Revision: #8 $ $Date: 2004/08/16 $
- * @since ACS 5.0
- */
-
-public class SiteNodeCollection extends ACSObjectCollection {
-
-    public static final String versionId = "$Id: SiteNodeCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
-
-    public SiteNodeCollection(DataCollection dataCollection) {
-        super(dataCollection);
-    }
-
-    public SiteNode getSiteNode() {
-        return new SiteNode(m_dataCollection.getDataObject());
-    }
-
-    public DomainObject getDomainObject() {
-        return (DomainObject)getSiteNode();
-    }
-
-}
diff --git a/ccm-core/src/com/arsdigita/kernel/StyleAssociation.java.nolongerInUse b/ccm-core/src/com/arsdigita/kernel/StyleAssociation.java.nolongerInUse
deleted file mode 100755
index c0c07b1cb..000000000
--- a/ccm-core/src/com/arsdigita/kernel/StyleAssociation.java.nolongerInUse
+++ /dev/null
@@ -1,157 +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
- *
- */
-package com.arsdigita.kernel;
-
-import com.arsdigita.persistence.DataAssociation;
-import com.arsdigita.persistence.DataAssociationCursor;
-import com.arsdigita.persistence.DataObject;
-import com.arsdigita.persistence.CompoundFilter;
-import com.arsdigita.persistence.FilterFactory;
-
-// Stylesheets
-import java.util.Locale;
-import java.util.ArrayList;
-
-import org.apache.log4j.Logger;                // for logging
-
-/**
- * 
- * @version $Id: StyleAssociation.java 287 2005-02-22 00:29:02Z sskracic $ 
- *
- * @deprecated without direct replacement. It is designed to work with
- * {@link com.arsdigita.templating.LegacyStylesheetResolver} which is
- * replaced by {@link com.arsdigita.templating.PatternStylesheetResolver}.
- * So thes method is just not used anymore. (pboy) 
- */
-public class StyleAssociation {
-
-    /** this class is static-only */
-    private StyleAssociation() {};
-
-    private static final Logger s_cat =
-        Logger.getLogger(StyleAssociation.class.getName());
-
-    /**
-     * Gets an array with all applicable stylesheets.
-     * @param style a DataAssociation that is the result from get("defaultStylesheet")
-     * @param locale the locale of the request
-     * @param outputType  the desired type of output (HTML, WML, XML, and so on)
-     *
-     * @return an array with all applicable stylesheets.
-     *
-     * @pre style != null && style instanceof DataAssociation
-     * @deprecated  see above
-     */
-    public static Stylesheet[] getStylesheets(Object style,
-                                              Locale locale,
-                                              String outputType) {
-        DataAssociationCursor da = ((DataAssociation)style).cursor();
-
-        // DA can be both an iterator and a collection, so we make
-        // sure that no one has iterated on it. This should go away
-        // once persistence has been refactored to make DA just a
-        // collection. -RDL, 17 July 2001
-        da.reset();
-
-        if (outputType == null) {
-            outputType = Stylesheet.getDefaultOutputType();
-        }
-
-        com.arsdigita.globalization.Locale localeObject = null;
-
-        if (locale != null) {
-            localeObject = com.arsdigita.globalization.Locale
-                .fromJavaLocaleBestMatch(locale);
-        }
-
-        ArrayList stylesheetList = new ArrayList();
-
-        // we start with the requested locale (e.g., en_US) and find
-        // stylesheets for this object {site node, package type} in
-        // that locale/output type combination.  We add to the list
-        // stylesheets in the same language but a different location
-        // (e.g., en), and stylesheets that have no default language.
-        //
-        // This allows us to write stylesheets in a way such that we
-        // factor out all of the common components for an application
-        // that are constant across locales, so they don't have to be
-        // duplicated verbatim for each language.
-
-        // regardless of requested locale, everyone gets the default
-        // no-locale sheet
-        FilterFactory factory = da.getFilterFactory();
-        CompoundFilter firstFilter = factory.or().addFilter
-            (factory.equals("localeID", null));
-        com.arsdigita.globalization.Locale localeObjectIter = localeObject;
-
-        int counter = 0;
-        while (localeObjectIter != null) {
-            firstFilter
-                .addFilter(factory.simple("localeID = :locale" + counter));
-            firstFilter.set("locale" + counter, localeObjectIter.getID());
-            localeObjectIter = localeObjectIter.fallback();
-            counter++;
-        }
-        da.addFilter(factory.and()
-                     .addFilter(firstFilter)
-                     .addFilter(factory.equals
-                                ("outputType", outputType)));
-
-        // WRS 5/29: the stylesheet for a packageType might actually be
-        // several stylesheets. Glom them all together and  return the
-        // composed stylesheet.
-        while (da.next()) {
-            DataObject obj = da.getDataObject();
-            boolean dup = false;
-            for (int i = 0; i < stylesheetList.size() && !dup; i++) {
-                Stylesheet test = (Stylesheet)stylesheetList.get(i);
-                if (test.getPath().equals(obj.get("pathName"))) {
-                    dup = true;
-                }
-            }
-            if (!dup) {
-                stylesheetList.add(new Stylesheet(obj));
-            }
-        }
-        Stylesheet[] ss = new Stylesheet[stylesheetList.size()];
-        return (Stylesheet[])stylesheetList.toArray(ss);
-    }
-
-    /** Gets the first stylesheet (best match) associated with this object.
-     *  @param style  a DataAssociation that is the result from get("defaultStylesheet")
-     *  @param locale the locale of the request
-     *  @param outputType  the desired type of output (HTML, WML, XML, and so on)
-     *
-     *  @return the first stylesheet associated with this object.
-     *
-     *  @pre style != null && style instanceof DataAssociation
-     * @deprecated see above
-     */
-    public static Stylesheet getStylesheet(Object style,
-                                           Locale locale,
-                                           String outputType) {
-        Stylesheet[] sslist = getStylesheets(style, locale, outputType);
-        if (sslist.length > 0) {
-            return sslist[0];
-        } else {
-            return null;
-        }
-    }
-
-}
diff --git a/ccm-core/src/com/arsdigita/kernel/Stylesheet.java.nolongerInUse b/ccm-core/src/com/arsdigita/kernel/Stylesheet.java.nolongerInUse
deleted file mode 100755
index 40332d685..000000000
--- a/ccm-core/src/com/arsdigita/kernel/Stylesheet.java.nolongerInUse
+++ /dev/null
@@ -1,976 +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
- *
- */
-package com.arsdigita.kernel;
-
-import com.arsdigita.domain.DataObjectNotFoundException;
-import com.arsdigita.globalization.GlobalizationException;
-import com.arsdigita.globalization.Locale;
-import com.arsdigita.persistence.DataObject;
-import com.arsdigita.persistence.OID;
-import com.arsdigita.util.ResourceManager;
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-import java.util.jar.JarEntry;
-import java.util.jar.JarOutputStream;
-import javax.servlet.ServletContext;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.ErrorListener;
-import javax.xml.transform.Source;
-import javax.xml.transform.Templates;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamSource;
-import org.apache.log4j.Logger;
-import org.apache.oro.text.perl.Perl5Util;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-/**
- * 
- * @version $Id: Stylesheet.java 287 2005-02-22 00:29:02Z sskracic $
- */
-public class Stylesheet extends ACSObject implements Templates {
-
-    /** Composite of a String and a boolean.  The boolean defaults to false.
-     *  We use it to keep track of all XSL Files and which of them are valid.
-     */
-    public static class FileSource {
-        private String  m_name;
-        private boolean m_valid = false;
-
-        /** construct from a String and a boolean
-         */
-        public FileSource(String name) { m_name  = name; }
-
-        /** @return the String member
-         */
-        public String  getName() { return m_name; }
-
-        /** change the boolean member to true
-         */
-        public void makeValid() { m_valid = true;}
-
-        /** @return the boolean member
-         */
-        public boolean isValid() { return m_valid;}
-    }
-
-    // XXX: this is a kludge for persistence's lack of domain
-    // object caching.
-    private String m_path;
-
-    // TODO: transformers are not threadsafe.  Fix this.
-    private ThreadLocal m_stylesheet = new ThreadLocal();
-
-    private Templates m_trax_templates;
-
-    private synchronized void setTemplates(Templates t) {
-        m_trax_templates = t;
-    }
-
-    private synchronized Templates getTemplates() {
-        return m_trax_templates;
-    }
-
-    private Document m_stylesheetDOM;
-    private static final Logger s_cat =
-        Logger.getLogger(Stylesheet.class.getName());
-    private static DocumentBuilderFactory s_dbFactory;
-    private final static String XSL_NAMESPACE_URI =
-        "http://www.w3.org/1999/XSL/Transform";
-    private static final String SAXON = "SAXON";
-    private static final String XSLTC = "XSLTC";
-
-    private static ThreadLocal s_transformerFactory = new ThreadLocal();
-
-    private long m_lastModified = 0;
-    // timeout in milliseconds
-    private static long s_ttl = 30000;
-    private boolean m_valid = true;
-    private List m_fileSources = new ArrayList(); // of FileSource
-    private List m_imports = new ArrayList(); // for imports
-
-    // TODO: keep a list of sources used to build the stylesheet
-    // so we can improve up-to-date checking.
-
-    private static final String s_typeName = "com.arsdigita.kernel.Stylesheet";
-
-    // Define defaults for new stylesheets
-    private static final String s_defaultOutputType = "text/html";
-
-    protected String getBaseDataObjectType() {
-        return s_typeName;
-    }
-
-    // Constructors
-
-    /**
-     * Creates an instance of a stylesheet.
-     *
-     * @see com.arsdigita.domain.DomainObject#DomainObject(String)
-     **/
-    public Stylesheet() {
-        super(s_typeName);
-    }
-
-    public Stylesheet(DataObject dataObject) {
-        super(dataObject);
-    }
-
-    public Stylesheet(OID oid) throws DataObjectNotFoundException {
-        super(oid);
-    }
-
-    public Stylesheet(BigDecimal id) throws DataObjectNotFoundException {
-        super(new OID(s_typeName, id));
-    }
-
-    public void initialize() {
-        super.initialize();
-        m_lastModified = System.currentTimeMillis();
-        if (isNew()) {
-            set("outputType", s_defaultOutputType);
-        }
-    }
-
-    // for stylesheets in the file system
-    // we propagate exceptions upwards, because it's not very helpful
-    // to log an error here if we don't know what file is associated with.
-    private Stylesheet loadStylesheet(InputStream is)
-        throws ParserConfigurationException, SAXException, IOException {
-        // The file is modified
-        m_lastModified = System.currentTimeMillis();
-        createFactories();
-        DocumentBuilder db = null;
-
-        db = s_dbFactory.newDocumentBuilder();
-        m_stylesheetDOM = db.parse(is);
-        return this;
-    }
-
-    /**
-     * Determines whether this stylesheet is newer than the specified stylesheet.
-     * @param s the stylesheet to compare against
-     *
-     * @return <code>true</code> if this stylesheet's last modified time is after
-     * s's or if s is null; <code>false</code> otherwise.
-     */
-    public boolean isNewerThan(Stylesheet s) {
-        if (s == null) {
-            // trivial: this is always newer than undefined.
-            return true;
-        }
-        return (m_lastModified >= s.m_lastModified ) ;
-    }
-
-    /**
-     * Gets the last modified time of this stylesheet, in Java system
-     * time (ms since 1970).
-     * @return the last modified time of this stylesheet.
-     */
-    public long getLastModified() {
-        return m_lastModified;
-    }
-
-    /**
-     * Marks this stylesheet as invalid. Subsequent calls to isValid()
-     * will return false.
-     */
-    public void invalidate() {
-        m_valid = false;
-    }
-
-    /**
-     * Indicates whether this stylesheet is still "fresh" and valid.
-     *
-     * @return <code>true</code> if this stylesheet has not been invalidated and
-     * the file sources on disk are all up-to-date.  We only check the files
-     * on disk every (s_ttl) milliseconds because we don't want to
-     * constantly check the filesystem for file modifications.
-     */
-    public boolean isValid() {
-        return (m_valid &&
-                (m_lastModified + s_ttl > System.currentTimeMillis() ||
-                 sourcesUpToDate()));
-    }
-
-    /**
-     * returns true if all files in m_fileSources have last modified
-     * times <= m_lastModified.
-     */
-    private boolean sourcesUpToDate() {
-        ResourceManager rm = ResourceManager.getInstance();
-        for (Iterator i = m_fileSources.iterator(); i.hasNext(); ) {
-            // check all FileSources, regardless of whether they
-            // parsed ok last time
-            String sourceName = ((FileSource)i.next()).getName();
-            long lastMod = rm.getLastModified(sourceName);
-            final boolean isOutOfDate = lastMod > m_lastModified;
-            if (isOutOfDate) {
-                return false;
-            }
-        }
-        for (Iterator i = m_imports.iterator(); i.hasNext(); ) {
-            // check all Imports, regardless of whether they
-            // parsed ok last time
-            File source = (File)i.next();
-            long lastMod = source.lastModified();
-            final boolean isOutOfDate = lastMod > m_lastModified;
-            if (isOutOfDate) {
-                return false;
-            }
-        }
-        m_lastModified = System.currentTimeMillis();
-        return true;
-    }
-
-    /**
-     * Sets the global lifetime for stylesheets before they are re-read.
-     * Default is 30 seconds.  Production systems should bump this up to
-     * a longer duration.
-     */
-    public static void setTimeout(long ttl) {
-        if (ttl < 0 ) {
-            throw new IllegalArgumentException("Timeout must be positive");
-        }
-        s_ttl = ttl;
-    }
-
-    // public methods
-    /**
-     * Loads a set of stylesheets and combines them into a single stylesheet.
-     *
-     * @param ssList the list of stylesheets to combine
-     * @return the combined stylesheet.
-     */
-    public static Stylesheet combineStylesheets(Stylesheet[] ssList) {
-        // WRS 5/29: the stylesheet for a packageType might actually be
-        // several stylesheets. Glom them all together and  return the
-        // composed stylesheet.
-
-        Stylesheet ss = null;
-        List fileSources = new ArrayList(); // of FileSource
-        ResourceManager rm = ResourceManager.getInstance();
-        for (int i = 0; i < ssList.length; i++) {
-            Stylesheet tmpSS = ssList[i];
-            String path = tmpSS.getPath();
-            FileSource src = new FileSource(path); // born invalid
-            InputStream is = rm.getResourceAsStream(path);
-            if (is == null) {
-                s_cat.warn("Could not find stylesheet " + path);
-            } else {
-                try {
-                    tmpSS.loadStylesheet(is);
-                    src.makeValid();                // no Exception => approve
-                    if (ss == null) {
-                        ss = tmpSS;
-                    } else {
-                        ss = ss.composeStylesheet(tmpSS);
-                    }
-                    is.close();
-                } catch (Exception ex) {
-                    s_cat.error("error parsing stylesheet " + path, ex);
-                }
-            }
-            fileSources.add(src);                // accumulate in list
-        }
-        if (ss != null) {
-            ss.m_lastModified = System.currentTimeMillis();
-            ss.m_fileSources = fileSources;
-        }
-        return ss;
-    }
-
-    public void setPath(String path) {
-        m_path = path;
-        set("pathName", path);
-    }
-
-    /**
-     * Returns the pathname that was originally associated
-     * with this stylesheet object in the database.  Will not
-     * fully reflect the DOM/Transformer contents of the stylesheet
-     * if it is composed with other stylesheets.
-     *
-     * @return the pathname originally associated with this stylesheet.
-     */
-    public String getPath() {
-        // this is a kludge for persistence's lack of domain
-        // object caching.
-        if (m_path == null) {
-            m_path = (String)get("pathName");
-        }
-        return m_path;
-    }
-
-    /**
-     * Returns a display name for this stylesheet.
-     *
-     * @see ACSObject#getDisplayName()
-     */
-    public String getDisplayName() {
-        return getPath();
-    }
-
-    /**
-     * Returns the list of all Filesources (with filenames relative to
-     * the context root) that should have contributed some part to
-     * this stylesheet. Attempt to keep them in priority order, but
-     * no guarantees.
-     *
-     * @see FileSource
-     * @see FileSource#isValid()
-     * @return the list of filesources that should have contributed to
-     * this stylesheet.
-     */
-    public List getSources() {
-        return m_fileSources;
-    }
-
-    public void setOutputType(String type) {
-        set("outputType", type);
-    }
-
-    public String getOutputType(String type) {
-        return (String)get("outputType");
-    }
-
-    public Locale getLocale() {
-        return (Locale)get("locale");
-    }
-
-    public void setLocale(Locale locale) {
-        setAssociation("locale", locale);
-    }
-
-    public void setLocale(java.util.Locale locale) {
-        try {
-            setLocale(Locale.fromJavaLocale(locale));
-        } catch (GlobalizationException ge) {
-            s_cat.error(
-                        "Locale " + locale.toString() + " is not supported.", ge
-                        );
-        }
-    }
-
-    /**
-     * Producer method that adds the rules of a specified stylesheet
-     * to the existing stylesheet object and returns the composed
-     * moby-stylesheet.  Gives precedence to the rules in the existing
-     * stylesheet object (this) over the input object (s).
-     *
-     * @param s an XSL stylesheet object
-     * @return a moby-stylesheet with the template rules from this and
-     * the template rules from s.  */
-    public Stylesheet composeStylesheet(Stylesheet s) {
-        // create a new stylesheet object
-        Stylesheet newSS = new Stylesheet();
-
-        // maintain the list of file sources for a stylesheet
-        // the things I'll do to avoid cut-and-paste programming.  Sigh.
-        Stylesheet[] tmp = {this, s};
-        for (int i = 0; i < tmp.length; i++) {
-            if (tmp[i] != null) {
-                Iterator it = tmp[i].m_fileSources.iterator();
-                while (it.hasNext()) {
-                    newSS.m_fileSources.add(it.next());
-                }
-                if (tmp[i].m_stylesheetDOM == null) {
-                    // read it in, in case it was a single-file SS before
-                    // (now we need the DOM for composing)
-                    String path = tmp[i].getPath();
-                    ResourceManager rm = ResourceManager.getInstance();
-                    try {
-                        tmp[i].loadStylesheet(rm.getResourceAsStream(path));
-                    } catch (Exception pce) {
-                        s_cat.error("error in compose", pce);
-                    }
-                }
-            }
-        }
-
-        newSS.setTemplates(null);
-        newSS.m_stylesheet.set(null);
-
-        if (s != null && s.m_stylesheetDOM != null
-            && this.m_stylesheetDOM != null) {
-            newSS.m_stylesheetDOM = composeStylesheet(new Document[] {
-                s.m_stylesheetDOM, this.m_stylesheetDOM
-            });
-        } else if (s != null && s.m_stylesheetDOM != null) {
-            // our current SS is empty and we're composing with
-            // a non-empty SS
-            newSS.m_stylesheetDOM = s.m_stylesheetDOM;
-        } else {
-            newSS.m_stylesheetDOM = this.m_stylesheetDOM;
-        }
-        newSS.m_lastModified = System.currentTimeMillis();
-        return newSS;
-    }
-
-    private static boolean usingSaxon() {
-        final String trans = System.getProperty
-            ("javax.xml.transform.TransformerFactory");
-
-        if (trans == null) {
-            return false;
-        } else {
-            return trans.indexOf("saxon") != -1;
-        }
-    }
-
-    private static boolean usingXSLTC() {
-        final String trans = System.getProperty
-            ("javax.xml.transform.TransformerFactory");
-
-        if (trans == null) {
-            return false;
-        } else {
-            return trans.indexOf("xsltc") != -1;
-        }
-    }
-
-    public synchronized Transformer newTransformer()
-        throws TransformerConfigurationException {
-
-        Source ssSource = null;
-
-        if ( getTemplates() == null && m_stylesheetDOM != null) {
-            // no template; need to rebuild from composite DOM.
-            ssSource = new DOMSource(m_stylesheetDOM);
-            // Saxon requires full path info
-            if(usingSaxon())
-                {
-                    ResourceManager rm = ResourceManager.getInstance();
-                    String pathn = rm.getResourceAsFile(getPath()).getAbsolutePath();
-                    ssSource.setSystemId(pathn);
-                }
-            else
-                {
-                    // dummy value to keep non-Saxon xmfr's happy
-                    //Eventually, as xmfr's besides Saxon approach the spec closer,
-                    //This if/else will probably go away, but right now
-                    //we must explicitly set via cases...
-                    ssSource.setSystemId("DOMSource");
-                }
-        } else if (m_stylesheetDOM == null) {
-            // we have no DOM, so we're dealing with a one-file
-            // stylesheet.  Use a StreamSource instead of a DOM
-            // so relative URLs will work.
-            if (!isValid() || getTemplates() == null) {
-                if (m_fileSources.size() == 0) {
-                    FileSource src = new FileSource(getPath());
-                    src.makeValid();
-                    m_fileSources.add(src);
-                }
-                ResourceManager rm = ResourceManager.getInstance();
-                ssSource = new StreamSource(rm.getResourceAsFile(getPath()));
-                // Saxon requires full path info
-                if(usingSaxon())
-                    {
-                        String pathname = rm.getResourceAsFile(getPath())
-                                            .getAbsolutePath();
-                        ssSource.setSystemId(pathname);
-                    }
-                m_lastModified = System.currentTimeMillis();
-                // read in imports
-                m_imports = getImports();
-            }
-        }
-        if (ssSource != null) {
-            // one way or the other, we have to re-set the Templates
-            // object that we cached previously.  maybe even build
-            // a factory first.
-
-            // TODO:
-            // instead of synchronized(this.getClass()),
-            // we could call createFactories, which is
-            // static synchronized
-            TransformerFactory tfact = null;
-            synchronized(this.getClass()) {
-                tfact = (TransformerFactory)s_transformerFactory.get();
-                if (tfact == null) {
-                    tfact = TransformerFactory.newInstance();
-                    if (usingXSLTC()) {
-                        //disable template inlining, otherwise xsltc might generate 
-                        //methods that are too long, or contain jump offsets that
-                        //are too large for the JVM to handle.
-                        //For more details see "Known problems for XSLTC Translets - 
-                        //http://xml.apache.org/xalan-j/xsltc_constraints.html#xsltcknownproblems
-                        tfact.setAttribute("disable-inlining", new Boolean(true));
-                        s_cat.info("set disable-inlining to true for XSLSTC");
-                        tfact.setErrorListener(new ErrorListener() {
-                            public void warning(TransformerException transformerException) throws TransformerException {
-                                s_cat.warn("Transformer warning: " + transformerException.getMessage(), transformerException);
-                            }
-
-                            public void error(TransformerException transformerException) throws TransformerException {
-                                s_cat.error("Transformer error: " + transformerException.getMessage(), transformerException);
-
-                            }
-
-                            public void fatalError(TransformerException transformerException) throws TransformerException {
-                                s_cat.fatal("Transformer FATAL: " + transformerException.getMessage(), transformerException);
-
-                            }
-                        });
-
-                    }
-
-                    s_transformerFactory.set(tfact);
-                }
-            }
-            setTemplates(tfact.newTemplates(ssSource));
-            // also have to clear the transformer to force rebuild
-            // below
-            m_stylesheet.set(null);
-        }
-
-        Object transformer = m_stylesheet.get();
-        if (transformer == null) {
-            transformer = getTemplates().newTransformer();
-            m_stylesheet.set(transformer);
-        }
-        return (Transformer)transformer;
-    }
-
-    public java.util.Properties getOutputProperties() {
-        // return m_stylesheet.getOutputProperties();
-        return getTemplates().getOutputProperties();
-    }
-
-    // private helper methods below
-
-    private synchronized static void createFactories() {
-        TransformerFactory tfact =
-            (TransformerFactory)s_transformerFactory.get();
-        if (tfact == null) {
-            tfact = TransformerFactory.newInstance();
-            if (usingXSLTC()) {
-                //disable template inlining, otherwise xsltc might generate methods
-                //that are too long, or contain jump offsets that are too large for
-                //the JVM to handle for more details see "Known problems for XSLTC
-                //Translets - http://xml.apache.org/xalan-j/xsltc_constraints.html#xsltcknownproblems
-                tfact.setAttribute("disable-inlining", new Boolean(true));
-                s_cat.info("set disable-inlining to true for XSLSTC");
-            }
-
-            s_transformerFactory.set(tfact);
-        }
-
-        if ( s_dbFactory == null ) {
-            s_dbFactory = DocumentBuilderFactory.newInstance();
-            s_dbFactory.setNamespaceAware(true);
-        }
-    }
-
-    /**
-     * Creates a new Stylesheet document using all of the transformation
-     * rules that comprise the list of input stylesheets.
-     *
-     * @param stylesheetList a list of input stylesheets.
-     * @return a Document that is an XSL styleshet containing all of
-     * the template rules in the list of input stylesheets.  The
-     * template rules in the returned Document will be in the same
-     * order they were supplied, with the ones in the lower-indexed
-     * stylesheets appearing first; this means that input[1] will take
-     * precedence over input[0] if two identical rules match, etc.
-     */
-    private static Document composeStylesheet(Document[] stylesheetList) {
-
-        createFactories();
-        Document result = null;
-
-        try {
-            result = s_dbFactory.newDocumentBuilder().newDocument();
-        } catch (ParserConfigurationException e) {
-            s_cat.error("error in Stylesheet", e);
-        }
-
-        Element stylesheetElement = result.createElementNS
-            (XSL_NAMESPACE_URI, "xsl:stylesheet");
-        // Element stylesheetElement = result.createElement("xsl:stylesheet");
-
-        result.appendChild(stylesheetElement);
-
-        for (int j = 0; j < stylesheetList.length; j++) {
-            Document thisSS = stylesheetList[j];
-
-            // iterate over all the nodes under d1's <xsl:stylesheet>
-
-            NodeList nl = thisSS.getElementsByTagNameNS
-                (XSL_NAMESPACE_URI, "stylesheet");
-            if (nl == null) {
-                s_cat.error("badly formed stylesheet, missing xsl:stylesheet");
-                return result;
-            }
-
-            // NodeList nl = thisSS.getElementsByTagName("xsl:stylesheet");
-            Node n = nl.item(0);
-            if (n == null) {
-                s_cat.error("badly formed stylesheet, missing xsl:stylesheet");
-                return result;
-            }
-
-            // n is <xsl:stylesheet>
-            // iterate over all attributes and set them in stylesheetElement
-            NamedNodeMap ssAttributes = n.getAttributes();
-            for (int i = 0; i < ssAttributes.getLength(); i++) {
-                Attr attr = (Attr)ssAttributes.item(i);
-                String name = attr.getName(), value = attr.getValue();
-
-                // normal attributes from n override those in stylesheetElement
-                // but exclude-result-prefixes must be joined with spaces
-                if (name.equals("exclude-result-prefixes")) {
-                    String oldValue = stylesheetElement.getAttribute(name);
-                    StringTokenizer st = new StringTokenizer(oldValue);
-                    boolean duplicate = false;
-                    while (st.hasMoreTokens()) {
-                        if (st.nextToken().equals(value)) {
-                            duplicate = true;
-                            break;
-                        }
-                    }
-                    if (!duplicate) {
-                        // no duplicate, so we need to add.
-                        if (oldValue != null && oldValue.length() > 0) {
-                            // something already there; add to it
-                            value += " " + oldValue;
-                        } // else nothing to add to.  set value = newValue
-                    } else {
-                        // we have a duplicate.. so set value to
-                        // ever it was before.
-                        value = oldValue;
-                    }
-                }
-
-                stylesheetElement.setAttribute(name, value);
-            }
-
-            // now we want all child nodes (<xsl:template>) for the stylesheet
-            nl = n.getChildNodes();
-            for (int i = 0; i < nl.getLength(); i++) {
-                Node thisNode = nl.item(i);
-
-                // iterate over existing rules.
-                // if we find a duplicate rule, remove the old one
-                // to make room for the new one (thisNode has precedence
-                // over existingRules).
-                NodeList existingRules = stylesheetElement.getChildNodes();
-                if (existingRules != null) {
-                    for (int z = 0; z < existingRules.getLength(); z++) {
-                        Node testNode = existingRules.item(z);
-                        if (duplicateTemplateRule(thisNode, testNode)) {
-                            // we have a match, remove rule!
-                            stylesheetElement.removeChild(testNode);
-                        }
-                    }
-                }
-
-                Node tmp = result.importNode(thisNode, true);
-
-                // need to special-case xsl:import, because they
-                // must all come before the first xsl:template
-                if (tmp.getNodeName().equals("xsl:import")) {
-                    NodeList tmpNodeList = stylesheetElement.getChildNodes();
-                    for (int ii = 0; ii < tmpNodeList.getLength(); ii++) {
-                        Node testForTemplate = tmpNodeList.item(ii);
-                        if (testForTemplate.getNodeName()
-                            .equals("xsl:template")) {
-                            stylesheetElement.insertBefore
-                                (tmp, testForTemplate);
-                            break;
-                        }
-                    }
-                } else {
-                    stylesheetElement.appendChild(tmp);
-                }
-
-            }
-        }
-        return result;
-    }
-
-    /**
-     * @return true if we should consider the template rules denoted
-     * by node1 and node2 a duplicate.  Note this isn't perfect, because
-     *  we don't try to understand XPath and XSLT here exactly.
-     * We consider a rule to be duplicate iff
-     * node1.name == node2.name == "xsl:template"
-     * AND names empty AND node1[@match] == node2[@match]
-     *     OR names non-empty AND node1[@name] == node2[@name]
-     */
-    private static boolean duplicateTemplateRule(Node node1, Node node2) {
-        String nodeName1 = node1.getNodeName();
-        String nodeName2 = node2.getNodeName();
-        if ("xsl:template".equals(nodeName1)
-            && "xsl:template".equals(nodeName2)
-            && (node1 instanceof Element)
-            && (node2 instanceof Element)) {
-            Element e1 = (Element) node1;
-            Element e2 = (Element) node2;
-            String match1 = e1.getAttribute("match");
-            String match2 = e2.getAttribute("match");
-            String name1 = e1.getAttribute("name");
-            String name2 = e2.getAttribute("name");
-            if (name1 != null && name1.length() > 0) {
-                // at least one @name not empty.
-                // consider duplicate if names match.
-                // (allow duplicate @match attrs. with different names)
-                if (name1.equals(name2)) {
-                    return true;
-                }
-            } else {
-                // at least one @name is empty.
-                // if the other @name is empty, then the names don't match
-                // so here we check the match rule.
-                if (match1.equals(match2)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    public static Stylesheet createStylesheet(String path) {
-        Stylesheet sheet = new Stylesheet();
-        sheet.setPath(path);
-        sheet.save();
-        return sheet;
-    }
-
-    public static Stylesheet createStylesheet(
-                                              String path, java.util.Locale locale
-                                              ) {
-        Stylesheet sheet = new Stylesheet();
-        sheet.setPath(path);
-        sheet.setLocale(locale);
-        sheet.save();
-        return sheet;
-    }
-
-    public String toString() {
-        if (m_stylesheetDOM == null) {
-            // see if we read from a file
-            if (m_fileSources != null && m_fileSources.size() > 0) {
-                String path = ((FileSource)m_fileSources.get(0)).getName();
-                return "[contents of " + path + "]";
-            } else {
-                return "null Stylesheet";
-            }
-        }
-        return com.arsdigita.xml.Document.toString(m_stylesheetDOM);
-    }
-
-    /**
-     * Gets the default output type for new stylesheets.
-     * @return the default output type for new stylesheets
-     **/
-    public static String getDefaultOutputType() {
-        return s_defaultOutputType;
-    }
-
-    /**
-     * Returns a string representation of the primary stylesheet.
-     * @param ctx the current servlet context
-     * @return a string representation of the primary stylesheet.
-     */
-    public String getPrimaryStylesheetContents(ServletContext ctx) throws IOException
-    {
-        File f;
-        FileReader in = null;
-        String path = getPath();
-        String realPath = ctx.getRealPath(path);
-        f = new File(realPath);
-        in = new FileReader(f);
-        int size = (int) f.length();
-        char[] data = new char[size];
-        int chars_read = 0;
-
-        while (chars_read < size)
-            chars_read += in.read(data, chars_read, size - chars_read);
-
-        String returnstring = new String(data);
-        return (returnstring);
-    }
-
-    /**
-     * Returns a byte array that is the contents of a JAR file
-     * containing all the XSL stylesheets imported by this stylesheet
-     * plus the primary stylesheet (the root of the import
-     * tree).
-     * @param ctx the current servlet context
-     * @return a byte[] consisting of a JAR file contents
-     * that contains all the XSL stylesheets imported by this stylesheet.
-     */
-    public byte[] getAllStylesheetContents(ServletContext ctx)
-        throws IOException {
-
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        JarOutputStream jos = new JarOutputStream(baos);
-
-        List l = new ArrayList();
-        String path = getPath();
-        String realPath = ctx.getRealPath(path);
-
-        File file = new File(realPath);
-        l.add(file);
-
-        importRecurseHelper(file, l, jos, true);
-        jos.finish();
-        return(baos.toByteArray());
-    }
-
-    /**
-     * Returns a list of all stylesheet files that this stylesheet
-     * uses, including imported stylesheets (through xsl:import and
-     * xsl:include).
-     * @param ctx the current servlet context
-     * @return a list of file objects.
-     */
-    public List getStylesheetList(ServletContext ctx) throws IOException {
-        List l = new ArrayList();
-        String path = getPath();
-        String realPath = ctx.getRealPath(path);
-
-        File file = new File(realPath);
-        l.add(file);
-        importRecurseHelper(file, l, null, true);
-
-        return(l);
-
-    }
-
-    /**
-     *
-     * Recurses the list of all stylesheets imported from this stylesheet,
-     * and returns a list of files.
-     * @return the list of stylesheet files (File objects) that are
-     *  imported by this <code>Stylesheet</code>.
-     */
-    public List getImports() {
-        FileSource fs = (FileSource)m_fileSources.get(0);
-        ResourceManager rm = ResourceManager.getInstance();
-        ServletContext sctx = rm.getServletContext();
-        File file = new File(sctx.getRealPath(fs.getName()));
-        List result = new ArrayList();
-        try {
-            importRecurseHelper(file, result, null, true);
-        } catch (IOException ioe) {
-            s_cat.error("getImports", ioe);
-        }
-        return result;
-    }
-
-    /**
-     *
-     * Helper function for findImports()
-     * @param file the stylesheet file to recurse imports for; must
-     * correspond to physical location on disk
-     * @param l the list to append imported files to
-     * @param buf a string buffer to write the stylesheet
-     * with all imports unrolled / expanded
-     * @param isFirst indicates whether importRecurseHelper has been
-     * called already
-     */
-
-    // FIXME: the parameter isFirst is passed in but never used. -- 2002-11-26
-    private void importRecurseHelper(File file,
-                                     List l,
-                                     JarOutputStream jos,
-                                     boolean isFirst)
-        throws IOException
-    {
-        String line;
-        Perl5Util re = new Perl5Util();
-
-        ResourceManager rm = ResourceManager.getInstance();
-        String root = rm.getWebappRoot().getCanonicalPath();
-        if (jos != null) {
-            String entryName = file.getCanonicalPath()
-                .substring(root.length() + 1);
-            JarEntry jent = new JarEntry(entryName);
-            jos.putNextEntry(jent);
-        }
-
-        BufferedReader bufRead = new BufferedReader(new FileReader(file));
-        ArrayList recurselist = new ArrayList();
-
-        while ((line = bufRead.readLine()) != null) {
-            if (re.match("m$<xsl:import\\s+href=\"([^\"]+)\"[^>]*>$", line)) {
-                String href = re.group(1);
-
-                // take the import href and treat it as a path
-                // relative to the current file's directory
-                //
-                // note, we need to compensate for the fact that
-                // we're not really dealing with relative PATHS
-                // here but relative URLs.
-                File newFile = new File(file.getParent(), href);
-                // definition of "file equality" means we can't use
-                // file.equals(), since we want to define files as equal
-                // if their *canonical* paths are the same
-                String canonical = newFile.getCanonicalPath();
-                boolean dup = false;
-                for (int i = 0; i < l.size(); i++) {
-                    File testFile = (File)l.get(i);
-                    if (canonical.equals(testFile.getCanonicalPath())) {
-                        dup = true;
-                        break;
-                    }
-                }
-                if (!dup) {
-                    l.add(newFile);
-                    recurselist.add(newFile);
-                }
-            }
-            if (jos != null) {
-                jos.write(line.getBytes());
-                jos.write("\n".getBytes());
-            }
-        } // end (for each line)
-        bufRead.close();
-        if (jos != null) {
-            jos.closeEntry();
-        }
-        for (Iterator i = recurselist.iterator(); i.hasNext(); ) {
-            File f = (File)i.next();
-            importRecurseHelper(f, l, jos, false);
-        }
-    }
-}
diff --git a/ccm-core/src/com/arsdigita/ui/login/LoginServlet.java b/ccm-core/src/com/arsdigita/ui/login/LoginServlet.java
index fa38e5e93..b54158dc1 100644
--- a/ccm-core/src/com/arsdigita/ui/login/LoginServlet.java
+++ b/ccm-core/src/com/arsdigita/ui/login/LoginServlet.java
@@ -26,9 +26,9 @@ import com.arsdigita.bebop.Page;
 import com.arsdigita.bebop.PageFactory;
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.SimpleContainer;
-import com.arsdigita.bebop.page.BebopApplicationServlet;
-import com.arsdigita.bebop.event.ActionListener;
 import com.arsdigita.bebop.event.ActionEvent;
+import com.arsdigita.bebop.event.ActionListener;
+import com.arsdigita.bebop.page.BebopApplicationServlet;
 import com.arsdigita.dispatcher.DispatcherConfig;
 import com.arsdigita.dispatcher.DispatcherHelper;
 import com.arsdigita.kernel.Kernel;
@@ -36,8 +36,8 @@ import com.arsdigita.ui.UI;
 import com.arsdigita.web.ReturnSignal;
 import com.arsdigita.web.URL;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
 
 import org.apache.log4j.Logger;