Index: openacs-4/packages/xowiki/COPYRIGHT
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/COPYRIGHT,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/xowiki/COPYRIGHT	13 Sep 2012 16:05:25 -0000	1.4
+++ openacs-4/packages/xowiki/COPYRIGHT	26 Jun 2018 10:25:29 -0000	1.5
@@ -1,23 +1,24 @@
- *  xowiki
- *
- *  Copyright (C) 2005-2008 Gustaf Neumann, neumann@wu-wien.ac.at
- *
- *  Vienna University of Economics and Business Administration
- *     Institute of Information Systems and New Media
- *     A-1090, Augasse 2-6
- *     Vienna, Austria
- *
- *  This is a BSD-Style license applicable for the files in this
- * directory and below, except when stated explicitly different.
- *
- *  Permission to use, copy, modify, distribute, and sell this
- *  software and its documentation for any purpose is hereby granted
- *  without fee, provided that the above copyright notice appear in
- *  all copies and that both that copyright notice and this permission
- *  notice appear in supporting documentation. We make no
- *  representations about the suitability of this software for any
- *  purpose.  It is provided "as is" without express or implied
- *  warranty.
- *
+#
+#  xowiki
+#  
+#    Copyright (C) 2005-2018 Gustaf Neumann, neumann@wu-wien.ac.at
+#  
+#       Vienna University of Economics and Business
+#       Institute of Information Systems and New Media
+#       A-1020, Welthandelsplatz 1
+#       Vienna, Austria
+#  
+#   This is a BSD-Style license applicable for the files in this
+#   directory and below, except when stated explicitly different.
+# 
+#   Permission to use, copy, modify, distribute, and sell this
+#   software and its documentation for any purpose is hereby granted
+#   without fee, provided that the above copyright notice appear in
+#   all copies and that both that copyright notice and this permission
+#   notice appear in supporting documentation. We make no
+#   representations about the suitability of this software for any
+#   purpose.  It is provided "as is" without express or implied
+#   warranty.
+# 
 
 
Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.167 -r1.168
--- openacs-4/packages/xowiki/xowiki.info	22 Jun 2018 20:11:55 -0000	1.167
+++ openacs-4/packages/xowiki/xowiki.info	26 Jun 2018 10:25:30 -0000	1.168
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="5.10.0d12" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d12.apm">
+    <version name="5.10.0d13" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d13.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>A xotcl-based enterprise wiki system with multiple object types</summary>
         <release-date>2017-08-06</release-date>
@@ -55,11 +55,11 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xowiki" version="5.10.0d12"/>
-        <requires url="xotcl-core" version="5.10.0d9"/>
+        <provides url="xowiki" version="5.10.0d13"/>
+        <requires url="xotcl-core" version="5.10.0d10"/>
 	<requires url="acs-datetime" version="5.9.1"/>
         <requires url="acs-kernel" version="5.9.1"/>
-	<requires url="acs-tcl" version="5.10.0d8"/>
+	<requires url="acs-tcl" version="5.10.0d11"/>
 	<requires url="acs-templating" version="5.10.0d5"/>
         <requires url="acs-subsite" version="5.9.1"/>
 	<requires url="richtext-ckeditor4" version="0.16"/>
Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -r1.322 -r1.323
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	22 Jun 2018 20:11:55 -0000	1.322
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	26 Jun 2018 10:25:30 -0000	1.323
@@ -2413,7 +2413,7 @@
     # Different machines in the cluster might have different entries in their caches.
     # Since we use wild-cards to find these, it has to be done on every machine
     ::xo::clusterwide xo::cache_flush_all xowiki_cache link-*-$name-$parent_id
-    ::xo::xotcl_object_type_cache flush -tree_key $parent_id $parent_id-$name
+    ::xo::xotcl_object_type_cache flush -partition_key $parent_id $parent_id-$name
   }
 
   Package instproc delete_revision {-revision_id:required -item_id:required} {
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.77 -r1.78
--- openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl	22 Jun 2018 20:11:55 -0000	1.77
+++ openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl	26 Jun 2018 10:25:30 -0000	1.78
@@ -54,7 +54,7 @@
     ::xo::xotcl_package_cache flush package_id-$instance_name
     ::xo::xotcl_package_cache flush package_key-$package_id
     ::xo::xotcl_package_cache flush root_folder-$package_id
-    ::xo::xotcl_object_type_cache flush -tree_key -100 -100-$instance_name    
+    ::xo::xotcl_object_type_cache flush -partition_key -100 -100-$instance_name    
 
     ns_log notice "before-uninstantiate DONE"
   }
Index: openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl,v
diff -u -r1.53 -r1.54
--- openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	22 Jun 2018 20:11:55 -0000	1.53
+++ openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	26 Jun 2018 10:25:30 -0000	1.54
@@ -459,7 +459,7 @@
         select item_id from cr_items where name = :name and parent_id = -100
       }]
     }
-    xo::xotcl_object_type_cache flush -tree_key $item_id $item_id
+    xo::xotcl_object_type_cache flush -partition_key $item_id $item_id
     set form_id [::xowiki::Weblog instantiate_forms -forms en:folder.form -package_id $package_id]
 
     if {[::xo::dc 0or1row check {
@@ -489,8 +489,8 @@
     ::xo::xotcl_object_cache flush $revision_id
     ::xo::xotcl_object_type_cache flush 
     ::xo::xotcl_package_cache flush root-folder-$package_id
-    ::xo::xotcl_object_type_cache flush -tree_key $item_id $item_id
-    ::xo::xotcl_object_type_cache flush -tree_key $revision_id $revision_id
+    ::xo::xotcl_object_type_cache flush -partition_key $item_id $item_id
+    ::xo::xotcl_object_type_cache flush -partition_key $revision_id $revision_id
   }
 
   proc ::xowiki::refresh_id_column_fk_constraints {} {