Index: openacs-4/packages/acs-tcl/tcl/site-node-apm-integration-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-node-apm-integration-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-tcl/tcl/site-node-apm-integration-procs.tcl	11 Jul 2002 00:57:13 -0000	1.1
+++ openacs-4/packages/acs-tcl/tcl/site-node-apm-integration-procs.tcl	11 Jul 2002 04:30:28 -0000	1.2
@@ -11,6 +11,29 @@
 
 namespace eval site_node_apm_integration {
 
+    ad_proc -public new_site_node_and_package {
+        {-name:required}
+        {-parent_id:required}
+        {-package_key:required}
+        {-instance_name:required}
+        {-context_id:required}
+    } {
+        create site node, instantiate package, mount package at new site node
+    } {
+        set node_id [site_node::new -name $name -parent_id $parent_id]
+
+        set package_id [apm_package_create_instance $instance_name $context_id $package_key]
+
+        site_node::mount -node_id $node_id -object_id $package_id
+
+        site_node::update_cache -node_id $node_id
+
+        # call post instantiation proc for the package
+        apm_package_call_post_instantiation_proc $package_id $package_key
+
+        return $package_id
+    }
+
     ad_proc -public get_child_package_id {
         {-package_id ""}
         {-package_key:required}
@@ -32,7 +55,7 @@
         Returns 1 if there exists a child package with the given package_key, 
         or 0 if not.
     } {
-        set child_package_id [site_node_apm_integration::get_child_package_id \
+        set child_package_id [get_child_package_id \
             -package_id $package_id \
             -package_key $package_key
         ]
@@ -43,4 +66,5 @@
             return 1 
         }
     }
+
 }
Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl	22 Jun 2002 20:09:31 -0000	1.10
+++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl	11 Jul 2002 04:30:28 -0000	1.11
@@ -32,29 +32,6 @@
         return $node_id
     }
 
-    ad_proc -public new_with_package {
-        {-name:required}
-        {-parent_id:required}
-        {-package_key:required}
-        {-instance_name:required}
-        {-context_id:required}
-    } {
-        create site node, instantiate package, mount package at new site node
-    } {
-        set node_id [new -name $name -parent_id $parent_id]
-
-        set package_id [apm_package_create_instance $instance_name $context_id $package_key]
-
-        mount -node_id $node_id -object_id $package_id
-
-        update_cache -node_id $node_id
-
-        # call post instantiation proc for the package
-        apm_package_call_post_instantiation_proc $package_id $package_key
-
-        return $package_id
-    }
-
     ad_proc -public delete {
         {-node_id:required}
     } {
@@ -389,7 +366,7 @@
         set context_id $parent_node_id
     }
 
-    return [site_node::new_with_package \
+    return [site_node_apm_integration::new_site_node_and_package \
         -name $instance_name \
         -parent_id $parent_node_id \
         -package_key $package_key \
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.155 -r1.156
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl	9 Jul 2002 22:16:38 -0000	1.155
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl	11 Jul 2002 04:30:33 -0000	1.156
@@ -88,7 +88,7 @@
             # Create the class directly using PL/SQL API
             set community_type_key [db_exec_plsql create_community_type {}]
 
-            set package_id [site_node::new_with_package \
+            set package_id [site_node_apm_integration::new_site_node_and_package \
                 -name [ad_decode $url_part "" $community_type_key $url_part] \
                 -parent_id $parent_node_id \
                 -package_key [one_community_type_package_key] \
@@ -222,7 +222,7 @@
                 set parent_node_id [get_community_node_id $parent_community_id]
             }
 
-            set package_id [site_node::new_with_package \
+            set package_id [site_node_apm_integration::new_site_node_and_package \
                 -name $community_key \
                 -parent_id $parent_node_id \
                 -package_key [one_community_package_key] \
@@ -1557,7 +1557,7 @@
                 set parent_node_id [get_type_node_id $community_type]
             }
 
-            set package_id [site_node::new_with_package \
+            set package_id [site_node_apm_integration::new_site_node_and_package \
                 -name $key \
                 -parent_id $parent_node_id \
                 -package_key [one_community_package_key] \
Index: openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl,v
diff -u -r1.60 -r1.61
--- openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl	22 Jun 2002 20:11:03 -0000	1.60
+++ openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl	11 Jul 2002 04:30:33 -0000	1.61
@@ -149,7 +149,7 @@
                 set pretty_name $package_key
             }
 
-            set package_id [site_node::new_with_package \
+            set package_id [site_node_apm_integration::new_site_node_and_package \
                 -name $url \
                 -parent_id $parent_node_id \
                 -package_key $package_key \
@@ -324,7 +324,7 @@
 	# we have a problem here.
 	set parent_node_id [db_string select_node_id {}]
 
-        set new_package_id [site_node::new_with_package \
+        set new_package_id [site_node_apm_integration::new_site_node_and_package \
             -name $mount_point \
             -parent_id $parent_node_id \
             -package_key $package_key \