Index: openacs-4/packages/xotcl-core/tcl/cluster-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/cluster-procs.tcl,v
diff -u -r1.13.2.1 -r1.13.2.2
--- openacs-4/packages/xotcl-core/tcl/cluster-procs.tcl	26 Aug 2020 18:50:43 -0000	1.13.2.1
+++ openacs-4/packages/xotcl-core/tcl/cluster-procs.tcl	3 Oct 2021 17:38:49 -0000	1.13.2.2
@@ -1,5 +1,5 @@
 ::xo::library doc {
-  XOTcl cluster support
+  XOTcl cluster support (deprecated code, moved into  ::acs::* namespace)
 
   @author Gustaf Neumann
   @creation-date 2007-07-19
@@ -8,135 +8,27 @@
 
 namespace eval ::xo {
 
-  proc clusterwide args {
-    # first, execute the command on the local server
-    eval $args
-    # then, distribute the command in the cluster
-    ::xo::Cluster broadcast {*}$args
+  ad_proc -deprecated clusterwide args {
+    Execute a command on every machine in a cluster.
+    The command was moved into the ::acs::* namespace.
+  } {
+    ::acs::clusterwide {*}$args
   }
 
-  proc cache_flush_all {cache pattern} {
-    # Provide means to perform a wildcard-based cache flushing on
-    # (cluster) machines.
-    foreach n [ns_cache names $cache $pattern] {ns_cache flush $cache $n}
+  ad_proc -deprecated cache_flush_all {cache pattern} {
+    Provide means to perform a wildcard-based cache flushing on
+    (cluster) machines.
   }
-
-  Class create Cluster -parameter {host {port 80}}
-  Cluster set allowed_host_patterns [list]
-  Cluster set url /xotcl-cluster-do
-  Cluster array set allowed_host {
-    "127.0.0.1" 1
+    ::acs::cache_flush_all $cache $pattern
   }
-  #
-  # The allowed commands are of the form
-  #   - command names followed by
-  #   - optional "except patterns"
-  #
-  Cluster array set allowed_command {
-    set ""
-    unset ""
-    nsv_set ""
-    nsv_unset ""
-    nsv_incr ""
-    bgdelivery ""
-    ns_cache "^ns_cache\s+eval"
-    ns_cache_flush ""
-    xo::cache_flush_all ""
-  }
-  #
-  # Prevent unwanted object generations for unknown
-  # arguments of ::xo::Cluster.
-  #
-  Cluster proc unknown args {
-    error "[self] received unknown method $args"
-  }
-  #
-  # handling the ns_filter methods
-  #
-  Cluster proc trace args {
-    :log ""
-    return filter_return
-  }
-  Cluster proc preauth args {
-    :log ""
-    :incoming_request
-    return filter_return
-  }
-  Cluster proc postauth args {
-    :log ""
-    return filter_return
-  }
-  #
-  # handle incoming request issues
-  #
-  Cluster proc incoming_request {} {
-    set cmd [ns_queryget cmd]
-    set addr [lindex [ns_set iget [ns_conn headers] x-forwarded-for] end]
-    if {$addr eq ""} {set addr [ns_conn peeraddr]}
-    #ns_log notice "--cluster got cmd='$cmd' from $addr"
-    ad_try {
-      set result [::xo::Cluster execute [ns_conn peeraddr] $cmd]
-    } on error {errorMsg} {
-      ns_log notice "--cluster error: $errorMsg"
-      ns_return 417 text/plain $errorMsg
-    } on ok {r} {
-      #ns_log notice "--cluster success $result"
-      ns_return 200 text/plain $result
-    }
-  }
 
-  Cluster proc execute {host cmd} {
-    if {![info exists :allowed_host($host)]} {
-      set ok 0
-      foreach g ${:allowed_host_patterns} {
-        if {[string match $g $host]} {
-          set ok 1
-          break
-        }
-      }
-      if {!$ok} {
-        error "refuse to execute commands from $host (command: '$cmd')"
-      }
-    }
-    set cmd_name [lindex $cmd 0]
-    set key allowed_command($cmd_name)
-    #ns_log notice "--cluster $key exists ? [info exists :$key]"
-    if {[info exists :$key]} {
-      set except_RE [set :$key]
-      #ns_log notice "--cluster [list regexp $except_RE $cmd] -> [regexp $except_RE $cmd]"
-      if {$except_RE eq "" || ![regexp $except_RE $cmd]} {
-        ns_log notice "--cluster executes command '$cmd' from host $host"
-        return [eval $cmd]
-      }
-    }
-    error "command '$cmd' from host $host not allowed"
+  ad_proc -deprecated Cluster args {
+    Create a cluster node. The command was moved into the ::acs::*
+    namespace.
+  } {
+    ::acs::Cluster {*}$args
   }
-  #
-  # handline outgoing request issues
-  #
-  Cluster proc broadcast args {
-    foreach server [:info instances] {
-      $server message {*}$args
-    }
-  }
-  Cluster instproc message args {
-    :log "--cluster outgoing request to [:host]:[:port] // $args"
-    #     set r [::xo::HttpRequest new -volatile \
-    #                -host [:host] -port [:port] \
-    #                -path [Cluster set url]?cmd=[ns_urlencode $args]]
-    #     return [$r set data]
-
-    set r [::xo::AsyncHttpRequest new -volatile \
-               -host [:host] -port [:port] \
-               -path [Cluster set url]?cmd=[ns_urlencode $args]]
-
-    #     ::bgdelivery do ::xo::AsyncHttpRequest new \
-    #         -host [:host] -port [:port] \
-    #         -path [Cluster set url]?cmd=[ns_urlencode $args] \
-    #         -mixin ::xo::AsyncHttpRequest::SimpleListener \
-    #         -proc finalize {obj status value} { :destroy }
-
-  }
+  
 }
 ::xo::library source_dependent