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.332.2.102 -r1.332.2.103
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	27 Dec 2021 17:03:22 -0000	1.332.2.102
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	31 Dec 2021 11:26:31 -0000	1.332.2.103
@@ -151,9 +151,9 @@
     {-user_id -1}
     {-parameter ""}
   } {
-    Instantiate a page in situations, where the context is not set up
-    (e.g. we have no package object). This call is convenient
-    when testing e.g. from the developer shell
+    Instantiate a page in situations, where the connection context is
+    not set up (e.g. we have no package object). This call is
+    convenient when testing e.g. from the developer shell.
   } {
     set package_id [:get_package_id_from_page_id \
                         -item_id $item_id \
@@ -686,10 +686,10 @@
       set folder_path [:folder_path -parent_id $parent_id -folder_ids $folder_ids -path_encode $path_encode]
       set pkg [::$parent_id package_id]
       if {![nsf::is object ::$pkg]} {
-        ::xowiki::Package initialize -package_id $pkg -init_url false -keep_cc true
+        ::xowiki::Package require $pkg
       }
-      set package_prefix [$pkg get_parameter package_prefix [$pkg package_url]]
-      set default_lang [$pkg default_language]
+      set package_prefix [::$pkg get_parameter package_prefix [$pkg package_url]]
+      set default_lang [::$pkg default_language]
     }
     #:msg "folder_path = $folder_path, -parent_id $parent_id -folder_ids $folder_ids // default_lang [:default_language]"
 
@@ -1549,7 +1549,7 @@
 
   Package instproc package_path {} {
     #
-    # Compute a list fo package objects which should be used for
+    # Compute a list of package objects which should be used for
     # resolving ("inheritance of objects from other instances").
     #
     set packages [list]
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.57.2.26 -r1.57.2.27
--- openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	15 Nov 2021 17:23:29 -0000	1.57.2.26
+++ openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	31 Dec 2021 11:26:31 -0000	1.57.2.27
@@ -228,7 +228,7 @@
     #
     #    select hkey from xowiki_page_instance where hkey is not null;
     #
-    ::xowf::Package initialize -package_id $package_id
+    ::xo::Package require $package_id
     #
     # We get all revisions, so use the lower level interface
     #
@@ -270,10 +270,10 @@
     set t0 [clock clicks -milliseconds]
     ns_log notice "start to work on -package_id $package_id"
 
-    ::xo::Package initialize -package_id $package_id -init_url false -user_id 0
+    ::xo::Package require $package_id
 
     set t1 [clock clicks -milliseconds]
-    ns_log notice "$package_id: ::xo::Package initialize took [expr {$t1-$t0}]ms"
+    ns_log notice "$package_id: ::xo::Package require took [expr {$t1-$t0}]ms"
     set t0 $t1
 
     if {![::xo::dc has_hstore] && [::$package_id get_parameter use_hstore 0] } {
@@ -317,7 +317,7 @@
   proc ::xowiki::hstore::update_update_all_form_instances {} {
     #::xo::db::select_driver DB
     foreach package_id [lsort [::xowiki::Package instances -closure true]] {
-      ::xo::Package initialize -package_id $package_id -init_url false -user_id 0
+      ::xo::Package require $package_id
       if {[::$package_id get_parameter use_hstore 0] == 0} {
         continue
       }
@@ -556,7 +556,7 @@
 
 
   proc ::xowiki::transform_root_folder {package_id} {
-    ::xo::Package initialize -package_id $package_id
+    ::xo::Package require $package_id
     set item_id [::$package_id folder_id]
 
     if {$item_id == 0} {
@@ -630,7 +630,7 @@
     return the page_url for an object of type tasks_task
   } {
     ns_log notice "got package_id=$package_id, object_id=$object_id, type=$type"
-    ::xowiki::Package initialize -package_id $package_id
+    ::xowiki::Package require $package_id
     if {[nsf::is object ::$package_id]} {
       return [::$package_id package_url]
     } else {
Index: openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl,v
diff -u -r1.1.2.52 -r1.1.2.53
--- openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl	31 Dec 2021 11:22:34 -0000	1.1.2.52
+++ openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl	31 Dec 2021 11:26:31 -0000	1.1.2.53
@@ -814,7 +814,7 @@
                            _nls_language $locale
                            number a
                        }]]
-            
+
             #ns_log notice "::xowiki::test::create_form_page returns $d"
             acs::test::reply_has_status_code $d 200