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.5 -r1.6
--- openacs-4/packages/acs-tcl/tcl/site-node-apm-integration-procs.tcl	23 Jan 2003 17:55:24 -0000	1.5
+++ openacs-4/packages/acs-tcl/tcl/site-node-apm-integration-procs.tcl	29 Jan 2003 15:37:13 -0000	1.6
@@ -11,29 +11,23 @@
 
 namespace eval site_node_apm_integration {
 
-    ad_proc -public new_site_node_and_package {
+    ad_proc -public -deprecated -warn 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
-    } {
-        db_transaction {
-            set node_id [site_node::new -name $name -parent_id $parent_id]
+        Create site node, instantiate package, mount package at new site node. Deprecated - 
+        please use site_node::instantiate_and_mount instead.
 
-            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_invoke_callback_proc -package_key $package_key -type "after-instantiate" -arg_list [list package_id $package_id]
-        }
-
-        return $package_id
+        @see site_node::instantiate_and_mount
+    } {
+        return [site_node::instantiate_and_mount -parent_node_id $parent_id \
+                                                 -node_name $name \
+                                                 -package_name $instance_name \
+                                                 -context_id $context_id \
+                                                 -package_key $package_key]
     }
 
     ad_proc -public delete_site_nodes_and_package {