Moving the webrick/mongrel "servers" over to HTTPServer module instead of Server. Using Server as the master class for client connections. Server (former RESTServer) will instantiate the appropriate subclass based upon Puppet configurator setting. There are now tests broken in the network section which I can't seem to figure out yet. Not a happy place to be.

1 files changed, 4 insertions, 4 deletions

diff --git a/bin/puppetmasterd b/bin/puppetmasterd
index f764b1901..39802f229 100755
--- a/bin/puppetmasterd
+++ b/bin/puppetmasterd
@@ -238,11 +238,11 @@ begin
     case Puppet[:servertype]
     when "webrick"
         # use the default, um, everything
-        require 'puppet/network/server/webrick'
-        webserver = server = Puppet::Network::Server::WEBrick.new(:Handlers => handlers)
+        require 'puppet/network/http_server/webrick'
+        webserver = server = Puppet::Network::HTTPServer::WEBrick.new(:Handlers => handlers)
     when "mongrel":
-        require 'puppet/network/server/mongrel'
-        server = Puppet::Network::Server::Mongrel.new(handlers)
+        require 'puppet/network/http_server/mongrel'
+        server = Puppet::Network::HTTPServer::Mongrel.new(handlers)
         addr = Puppet[:bindaddress]
         if addr == ""
             addr =  "127.0.0.1"