The Great Renaming broker -> server, part 2

syndicate/broker.rkt

@@ -1,5 +0,0 @@
-#lang imperative-syndicate
-
-(provide (all-from-out "broker/main.rkt"))
-(require/activate "broker/main.rkt")
-(module+ main (require (submod "broker/main.rkt" main)))

syndicate/distributed.rkt

@@ -0,0 +1,5 @@
+#lang imperative-syndicate
+
+(provide (all-from-out "distributed/main.rkt"))
+(require/activate "distributed/main.rkt")
+(module+ main (require (submod "distributed/main.rkt" main)))

syndicate/distributed/client.rkt

@@ -6,7 +6,7 @@
 (require "protocol.rkt")
 (require imperative-syndicate/term)
 
-(define-logger syndicate/broker)
+(define-logger syndicate/distributed)
 
 (spawn #:name 'client-factory
        (during (to-server $a _) (assert (server-connection a)))
@@ -14,8 +14,8 @@
        (during (observe (server-connected $a)) (assert (server-connection a))))
 
 (define (generic-client-session-facet address w)
-  (on-start (log-syndicate/broker-info "Connected to ~v" address))
-  (on-stop (log-syndicate/broker-info "Disconnected from ~v" address))
+  (on-start (log-syndicate/distributed-info "Connected to ~v" address))
+  (on-stop (log-syndicate/distributed-info "Disconnected from ~v" address))
   (assert (server-connected address))
 
   (define next-ep

syndicate/distributed/client/loopback.rkt

@@ -6,7 +6,7 @@
 (require "../wire-protocol.rkt")
 (require "../protocol.rkt")
 
-(require/activate imperative-syndicate/broker/server)
+(require/activate imperative-syndicate/distributed/server)
 
 (assertion-struct server-loopback-connection (scope))
 

syndicate/distributed/main.rkt

@@ -38,15 +38,15 @@
                          (when tcp-port (spawn-tcp-server! tcp-port))
                          (when http-port (spawn-websocket-server! http-port)))))
 
-(define-logger syndicate/broker)
+(define-logger syndicate/distributed)
 
-(when (log-level? syndicate/broker-logger 'debug)
+(when (log-level? syndicate/distributed-logger 'debug)
   (spawn #:name 'server-debug
          (on (asserted (server-poa $id $scope))
-             (log-syndicate/broker-debug "+ ~v ~v" id scope))
+             (log-syndicate/distributed-debug "+ ~v ~v" id scope))
          (on (retracted (server-poa $id $scope))
-             (log-syndicate/broker-debug "- ~v ~v" id scope))
+             (log-syndicate/distributed-debug "- ~v ~v" id scope))
          (on (message (message-poa->server $id $p))
-             (log-syndicate/broker-debug "IN  ~v ~v" id p))
+             (log-syndicate/distributed-debug "IN  ~v ~v" id p))
          (on (message (message-server->poa $id $p))
-             (log-syndicate/broker-debug "OUT ~v ~v" id p))))
+             (log-syndicate/distributed-debug "OUT ~v ~v" id p))))

syndicate/distributed/server/tcp.rkt

@@ -7,7 +7,7 @@
 (require "../wire-protocol.rkt")
 
 (require/activate imperative-syndicate/drivers/tcp)
-(require/activate imperative-syndicate/broker/server)
+(require/activate imperative-syndicate/distributed/server)
 
 (define (server-facet/tcp id scope)
   (assert (tcp-accepted id))

syndicate/distributed/server/websocket.rkt

@@ -8,7 +8,7 @@
 
 (require/activate imperative-syndicate/drivers/web)
 (require/activate imperative-syndicate/drivers/timer)
-(require/activate imperative-syndicate/broker/server)
+(require/activate imperative-syndicate/distributed/server)
 
 (define (server-facet/websocket id scope)
   (assert (http-accepted id))

syndicate/examples/server-chat-client.rkt

@@ -1,6 +1,6 @@
 #lang imperative-syndicate
 
-(require/activate imperative-syndicate/broker)
+(require/activate imperative-syndicate/distributed)
 (require/activate imperative-syndicate/drivers/external-event)
 (require (only-in racket/port read-line-evt))
 

syndicate/test/distributed/nesting-confusion.rkt

@@ -2,7 +2,7 @@
 ;; Analogous to the `core/nesting-confusion.rkt` test case.
 
 (require (only-in imperative-syndicate/lang activate))
-(require imperative-syndicate/broker)
+(require imperative-syndicate/distributed)
 
 (assertion-struct researcher (name topic))
 
@@ -23,7 +23,7 @@
                         "Added topic: Evil")))
 
 (test-case
-    [(activate imperative-syndicate/broker)
+    [(activate imperative-syndicate/distributed)
 
      (spawn #:name 'tony
             (assert (server-proposal "test" (researcher "Tony" "Computering")))
@@ -62,7 +62,7 @@
                                                            "Nonspecific claim 123 retracted"))))
 
 (test-case
-    [(activate imperative-syndicate/broker)
+    [(activate imperative-syndicate/distributed)
 
      (spawn #:name 'claimant
             (assert (server-proposal "test" (claim 123)))
@@ -81,7 +81,7 @@
 ;;---------------------------------------------------------------------------
 
 (test-case
-    [(activate imperative-syndicate/broker)
+    [(activate imperative-syndicate/distributed)
 
      (spawn #:name 'inner-monitor
             (during (server-connected test-address)

syndicate/test/distributed/observation-visibility.rkt

@@ -3,14 +3,14 @@
 ;; creation of an assertion of observation in that server's dataspace.
 
 (require (only-in imperative-syndicate/lang activate))
-(require imperative-syndicate/broker)
+(require imperative-syndicate/distributed)
 
 (assertion-struct presence (who))
 
 (define test-address (server-loopback-connection "test"))
 
 (test-case
-    [(activate imperative-syndicate/broker)
+    [(activate imperative-syndicate/distributed)
 
      (spawn #:name 'producer
             (during (server-connected test-address)