Simplify connection-manager

svn: r6493

collects/web-server/dispatchers/dispatch.ss

@@ -1,6 +1,6 @@
 (module dispatch mzscheme
   (require (lib "contract.ss"))
-  (require "../private/connection-structs.ss"
+  (require "../private/connection-manager.ss"
            "../private/request-structs.ss")
   
   (define dispatcher? 

collects/web-server/private/connection-manager.ss

@@ -1,10 +1,15 @@
 (module connection-manager mzscheme
-  (require "connection-structs.ss"
-           "timer.ss"
-           (lib "contract.ss"))
-  (provide (all-from "connection-structs.ss"))
-
+  (require (lib "contract.ss")
+           "timer.ss")
+  
+  (define-struct connection (timer i-port o-port custodian close? mutex)
+    (make-inspector))
+  
   (provide/contract
+   [struct connection
+           ([timer timer?]
+            [i-port input-port?] [o-port output-port?] [custodian custodian?]
+            [close? boolean?] [mutex semaphore?])]
    [start-connection-manager (custodian? . -> . void)]
    [new-connection (number? input-port? output-port? custodian? boolean? . -> . connection?)]
    [kill-connection! (connection? . -> . void)]

collects/web-server/private/connection-structs.ss

@@ -1,12 +0,0 @@
-(module connection-structs mzscheme
-  (require (lib "contract.ss"))
-  (require "timer.ss")
-  
-  (define-struct connection (timer i-port o-port custodian close? mutex)
-    (make-inspector))
-  
-  (provide/contract
-   [struct connection
-           ([timer timer?]
-            [i-port input-port?] [o-port output-port?] [custodian custodian?]
-            [close? boolean?] [mutex semaphore?])]))

collects/web-server/private/servlet.ss

@@ -2,7 +2,7 @@
   (require (lib "contract.ss"))
   (require "../managers/manager.ss"
            "../servlet/servlet-structs.ss"
-           "connection-structs.ss"
+           "connection-manager.ss"
            "../private/request-structs.ss")
   
   (define-struct (exn:fail:servlet:instance exn:fail) ())

collects/web-server/tests/private/request-test.ss

@@ -1,7 +1,7 @@
 (module request-test mzscheme
   (require (planet "util.ss" ("schematics" "schemeunit.plt" 2))
            (planet "test.ss" ("schematics" "schemeunit.plt" 2))
-           (lib "connection-structs.ss" "web-server" "private")
+           (lib "connection-manager.ss" "web-server" "private")
            (lib "timer.ss" "web-server" "private")
            (lib "request-structs.ss" "web-server" "private"))