Index: openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl,v
diff -u -r1.38 -r1.39
--- openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl	14 Dec 2007 10:24:51 -0000	1.38
+++ openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl	28 Feb 2008 09:05:41 -0000	1.39
@@ -1,5 +1,5 @@
 ad_library {
-    XoWiki - Notification procs
+    XoWiki - Callback procs
 
     @creation-date 2006-08-08
     @author Gustaf Neumann
@@ -470,6 +470,14 @@
     return $result
   }
 
+  proc unmounted_instances {} {
+    return [db_list unmounted_instances {
+      select package_id from apm_packages p where not exists 
+      (select 1 from site_nodes where object_id = p.package_id) 
+      and p.package_key = 'xowiki'
+    }]
+  }
+
   proc form_upgrade {} {
     db_dml from_upgrade {
       update xowiki_form f set form = xowiki_formi.data from xowiki_formi 
Index: openacs-4/packages/xowiki/www/oacs-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view.adp,v
diff -u -r1.46 -r1.47
--- openacs-4/packages/xowiki/www/oacs-view.adp	8 Jan 2008 16:22:06 -0000	1.46
+++ openacs-4/packages/xowiki/www/oacs-view.adp	28 Feb 2008 09:05:41 -0000	1.47
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Di Jan 08 17:17:19 CET 2008 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Feb 28 09:54:26 +0100 2008 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
Index: openacs-4/packages/xowiki/www/oacs-view2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view2.adp,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/xowiki/www/oacs-view2.adp	8 Jan 2008 16:22:06 -0000	1.25
+++ openacs-4/packages/xowiki/www/oacs-view2.adp	28 Feb 2008 09:05:41 -0000	1.26
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Di Jan 08 17:17:19 CET 2008 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Feb 28 09:54:26 +0100 2008 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
Index: openacs-4/packages/xowiki/www/oacs-view3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view3.adp,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/xowiki/www/oacs-view3.adp	8 Jan 2008 16:22:06 -0000	1.20
+++ openacs-4/packages/xowiki/www/oacs-view3.adp	28 Feb 2008 09:05:41 -0000	1.21
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Di Jan 08 17:17:19 CET 2008 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Feb 28 09:54:26 +0100 2008 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
Index: openacs-4/packages/xowiki/www/view-default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-default.adp,v
diff -u -r1.42 -r1.43
--- openacs-4/packages/xowiki/www/view-default.adp	8 Jan 2008 16:22:06 -0000	1.42
+++ openacs-4/packages/xowiki/www/view-default.adp	28 Feb 2008 09:05:41 -0000	1.43
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Di Jan 08 17:17:19 CET 2008 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Feb 28 09:54:26 +0100 2008 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
Index: openacs-4/packages/xowiki/www/view-links.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-links.adp,v
diff -u -r1.32 -r1.33
--- openacs-4/packages/xowiki/www/view-links.adp	8 Jan 2008 16:22:06 -0000	1.32
+++ openacs-4/packages/xowiki/www/view-links.adp	28 Feb 2008 09:05:41 -0000	1.33
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Di Jan 08 17:17:19 CET 2008 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Feb 28 09:54:26 +0100 2008 -->
 <!-- The following DIV is needed for overlib to function! -->
   <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>	
 <div class='xowiki-content'>
Index: openacs-4/packages/xowiki/www/view-plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-plain.adp,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/xowiki/www/view-plain.adp	8 Jan 2008 16:22:06 -0000	1.28
+++ openacs-4/packages/xowiki/www/view-plain.adp	28 Feb 2008 09:05:41 -0000	1.29
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Di Jan 08 17:17:19 CET 2008 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Feb 28 09:54:26 +0100 2008 -->
 <!-- The following DIV is needed for overlib to function! -->
   <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>	
 <div class='xowiki-content'>
Index: openacs-4/packages/xowiki/www/admin/test.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/test.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/xowiki/www/admin/test.tcl	3 Sep 2007 21:07:53 -0000	1.10
+++ openacs-4/packages/xowiki/www/admin/test.tcl	28 Feb 2008 09:05:41 -0000	1.11
@@ -59,7 +59,7 @@
 test section "Basic Setup"
 
 test hint "Using XOTcl $::xotcl::version$::xotcl::patchlevel"
-? {expr {$::xotcl::version < 1.4}} 0 "XOTcl Version $::xotcl::version >= 1.4"
+? {expr {$::xotcl::version < 1.5}} 0 "XOTcl Version $::xotcl::version >= 1.5"
 
 set ns_cache_version_old [catch {ns_cache names xowiki_cache xxx}]
 if {$ns_cache_version_old} {
@@ -89,6 +89,9 @@
     site_node::unmount -node_id $info(node_id)
   }
   site_node::delete -node_id $info(node_id)
+  # remove the package instance
+  apm_package_instance_delete $info(object_id)
+  
   #test code [array get info]
 }
 
@@ -113,7 +116,7 @@
 site_node::instantiate_and_mount \
     -parent_node_id $node(node_id) \
     -node_name $instance_name \
-    -package_name xowiki \
+    -package_name $instance_name \
     -package_key xowiki
 #test code [array get node]