Index: openacs-4/packages/dotlrn-bboard/tcl/dotlrn-bboard-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bboard/tcl/dotlrn-bboard-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn-bboard/tcl/dotlrn-bboard-procs.tcl	1 Nov 2001 23:12:46 -0000	1.4
+++ openacs-4/packages/dotlrn-bboard/tcl/dotlrn-bboard-procs.tcl	10 Nov 2001 18:45:38 -0000	1.5
@@ -45,13 +45,9 @@
     } {
 	Add the bboard applet
     } {
-	# Callback to get node_id from community
-	# REVISIT this (ben)
-	set node_id [site_node_id [ad_conn url]]
-
-	# create the bboard package instance (all in one, I've mounted it)
+	# Create and Mount
 	set package_key [package_key]
-	set package_id [site_node_mount_application -return package_id $node_id "$package_key" $package_key $package_key]
+	set package_id [dotlrn::instantiate_and_mount $community_id $package_key]
 
 	# set up a forum inside that instance
 	bboard_forum_new -bboard_id $package_id -short_name "Discussions"
Index: openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl	1 Nov 2001 23:12:53 -0000	1.3
+++ openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl	10 Nov 2001 18:45:58 -0000	1.4
@@ -43,13 +43,9 @@
     } {
 	Add the calendar applet
     } {
-	# Callback to get node_id from community
-	# REVISIT this (ben)
-	set node_id [site_node_id [ad_conn url]]
-
 	# create the calendar package instance (all in one, I've mounted it)
 	set package_key [package_key]
-	set package_id [site_node_mount_application -return package_id $node_id $package_key $package_key $package_key]
+	set package_id [dotlrn::instantiate_and_mount $community_id $package_key]
 
 	# XXX - set up a public calendar inside that instance
 #	 
Index: openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl	1 Nov 2001 23:13:30 -0000	1.4
+++ openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl	10 Nov 2001 18:45:47 -0000	1.5
@@ -45,13 +45,9 @@
     } {
 	Add the faq applet
     } {
-	# Callback to get node_id from community
-	# REVISIT this (ben)
-	set node_id [site_node_id [ad_conn url]]
-
-	# create the faq package instance (all in one, I've mounted it)
+	# create the calendar package instance (all in one, I've mounted it)
 	set package_key [package_key]
-	set package_id [site_node_mount_application -return package_id $node_id $package_key $package_key $package_key]
+	set package_id [dotlrn::instantiate_and_mount $community_id $package_key]
 
 	# return the package_id
 	return $package_id
Index: openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl	1 Nov 2001 23:13:37 -0000	1.5
+++ openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl	10 Nov 2001 18:45:52 -0000	1.6
@@ -45,19 +45,17 @@
     } {
 	Add the fs applet
     } {
-	# Callback to get node_id from community
-	# REVISIT this (ben)
-	set node_id [site_node_id [ad_conn url]]
-
-	# create the fs package instance (all in one, I've mounted it)
+	# create the calendar package instance (all in one, I've mounted it)
 	set package_key [package_key]
-	set package_id [site_node_mount_application -return package_id $node_id $package_key $package_key $package_key]
+	set package_id [dotlrn::instantiate_and_mount $community_id $package_key]
 
 	# set up a forum inside that instance
 	set folder_id [db_exec_plsql fs_root_folder "
 	begin
         :1 := file_storage.new_root_folder(:package_id);
 	end;"]
+
+	# FIXME: set up a public folder and a private folder
 	
 	# return the package_id
 	return $package_id