Index: openacs-4/packages/dotlrn/tcl/apm-callback-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/apm-callback-procs-oracle.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/tcl/apm-callback-procs-oracle.xql	13 Feb 2009 02:10:13 -0000	1.1
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<queryset>
+  <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+  <fullquery name="dotlrn::apm::after_upgrade.insert_group_rels">
+    <querytext>
+      insert into group_rels
+        (group_rel_id, group_id, rel_type)
+      select nextval(acs_object_id_seq.nextval, a.group_id, g.rel_type
+        from group_type_rels g, application_groups a
+        where g.group_type = 'application_group'
+        and not exists (
+          select 1 from group_rels
+          where group_id = a.group_id
+          and rel_type = g.rel_type
+        )
+    </querytxt>
+  </fullquery>
+
+</queryset>
\ No newline at end of file
Index: openacs-4/packages/dotlrn/tcl/apm-callback-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/apm-callback-procs-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/tcl/apm-callback-procs-postgresql.xql	13 Feb 2009 02:10:13 -0000	1.1
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<queryset>
+  <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+  <fullquery name="dotlrn::apm::after_upgrade.insert_group_rels">
+    <querytext>
+    insert into group_rels
+    (group_rel_id, group_id, rel_type)
+    select nextval('t_acs_object_id_seq'), a.group_id, g.rel_type
+      from group_type_rels g,
+      application_groups a,
+      ( select parent.object_type as parent_type
+        from acs_object_types child, acs_object_types parent
+        where child.object_type <> parent.object_type
+        and child.tree_sortkey between parent.tree_sortkey
+        and tree_right(parent.tree_sortkey)
+        and child.object_type = 'application_group'
+        order by parent.tree_sortkey desc
+      ) types
+     where g.group_type = types.parent_type
+     and not exists
+     ( select 1 from group_rels
+       where group_rels.group_id = a.group_id
+       and group_rels.rel_type = g.rel_type
+     )
+    </querytxt>
+  </fullquery>
+
+</queryset>
\ No newline at end of file
Index: openacs-4/packages/dotlrn/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/apm-callback-procs.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn/tcl/apm-callback-procs.tcl	4 Feb 2009 18:53:31 -0000	1.10
+++ openacs-4/packages/dotlrn/tcl/apm-callback-procs.tcl	13 Feb 2009 02:10:13 -0000	1.11
@@ -282,5 +282,8 @@
             db_dml update_community_supertype {}
             db_dml insert_application_group_rows {}
         }
+        2.5.0d3 2.5.0d4 {
+            db_dml insert_group_rels {}
+        }
     }
 }
Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v
diff -u -r1.203 -r1.204
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl	1 Feb 2009 22:18:46 -0000	1.203
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl	13 Feb 2009 02:10:13 -0000	1.204
@@ -199,7 +199,6 @@
         ns_set put $extra_vars pretty_plural $pretty_name
         ns_set put $extra_vars description $description
         ns_set put $extra_vars context_id $dotlrn_package_id
-        ns_set put $extra_vars package_id $dotlrn_package_id
 
         db_transaction {
             set user_id [ad_conn user_id]
@@ -272,7 +271,7 @@
 
             # Set up the node
             dotlrn_community::set_package_id $community_id $package_id
-
+            
             # update the portal_id and non_member_portal_id
             db_dml update_portal_ids {}
 
@@ -377,6 +376,7 @@
         Update the node ID for the community
     } {
         db_dml update_package_id {}
+        db_dml update_application_group_package_id {}
 	util_memoize_flush "dotlrn_community::get_package_id_not_cached $community_id"
     }
 
Index: openacs-4/packages/dotlrn/tcl/community-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.xql,v
diff -u -r1.89 -r1.90
--- openacs-4/packages/dotlrn/tcl/community-procs.xql	25 Oct 2006 12:53:55 -0000	1.89
+++ openacs-4/packages/dotlrn/tcl/community-procs.xql	13 Feb 2009 02:10:13 -0000	1.90
@@ -32,6 +32,12 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="dotlrn_community::set_package_id.update_application_group_package_id">
+        <querytext>
+            update application_groups set package_id= :package_id where group_id= :community_id
+        </querytext>
+    </fullquery>
+    
     <fullquery name="dotlrn_community::get_parent_id_not_cached.select_parent_id">
         <querytext>
             select dotlrn_communities.parent_community_id