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.

5 files changed, 10 insertions, 10 deletions

diff --git a/test/lib/puppettest/servertest.rb b/test/lib/puppettest/servertest.rb
index 3d1381111..11c24f5b4 100644
--- a/test/lib/puppettest/servertest.rb
+++ b/test/lib/puppettest/servertest.rb
@@ -1,5 +1,5 @@
 require 'puppettest'
-require 'puppet/network/server/webrick'
+require 'puppet/network/http_server/webrick'
 
 module PuppetTest::ServerTest
     include PuppetTest
@@ -47,7 +47,7 @@ module PuppetTest::ServerTest
         # then create the actual server
         server = nil
         assert_nothing_raised {
-            server = Puppet::Network::Server::WEBrick.new(
+            server = Puppet::Network::HTTPServer::WEBrick.new(
                 :Port => @@port,
                 :Handlers => handlers
             )
diff --git a/test/network/handler/ca.rb b/test/network/handler/ca.rb
index 3e74f8e05..e349f9c4c 100755
--- a/test/network/handler/ca.rb
+++ b/test/network/handler/ca.rb
@@ -191,7 +191,7 @@ class TestCA < Test::Unit::TestCase
         server = nil
         Puppet[:name] = "puppetmasterd"
         assert_nothing_raised {
-            server = Puppet::Network::Server::WEBrick.new(
+            server = Puppet::Network::HTTPServer::WEBrick.new(
                 :Port => @@port,
                 :Handlers => {
                     :CA => {}, # so that certs autogenerate
diff --git a/test/network/server/mongrel_test.rb b/test/network/server/mongrel_test.rb
index 05d18257b..52d8790eb 100755
--- a/test/network/server/mongrel_test.rb
+++ b/test/network/server/mongrel_test.rb
@@ -12,7 +12,7 @@ class TestMongrelServer < PuppetTest::TestCase
 
     def mkserver(handlers = nil)
         handlers ||= { :Status => nil }
-        mongrel = Puppet::Network::Server::Mongrel.new(handlers)
+        mongrel = Puppet::Network::HTTPServer::Mongrel.new(handlers)
     end
 
     # Make sure client info is correctly extracted.
diff --git a/test/network/server/webrick.rb b/test/network/server/webrick.rb
index 0f76659b1..5919461ed 100755
--- a/test/network/server/webrick.rb
+++ b/test/network/server/webrick.rb
@@ -3,7 +3,7 @@
 $:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
-require 'puppet/network/server/webrick'
+require 'puppet/network/http_server/webrick'
 require 'mocha'
 
 class TestWebrickServer < Test::Unit::TestCase
@@ -19,7 +19,7 @@ class TestWebrickServer < Test::Unit::TestCase
     def test_basics
         server = nil
         assert_raise(Puppet::Error, "server succeeded with no cert") do
-            server = Puppet::Network::Server::WEBrick.new(
+            server = Puppet::Network::HTTPServer::WEBrick.new(
                 :Port => @@port,
                 :Handlers => {
                     :Status => nil
@@ -28,7 +28,7 @@ class TestWebrickServer < Test::Unit::TestCase
         end
 
         assert_nothing_raised("Could not create simple server") do
-            server = Puppet::Network::Server::WEBrick.new(
+            server = Puppet::Network::HTTPServer::WEBrick.new(
                 :Port => @@port,
                 :Handlers => {
                     :CA => {}, # so that certs autogenerate
@@ -112,7 +112,7 @@ class TestWebrickServer < Test::Unit::TestCase
     def mk_status_server
         server = nil
         assert_nothing_raised() {
-            server = Puppet::Network::Server::WEBrick.new(
+            server = Puppet::Network::HTTPServer::WEBrick.new(
                 :Port => @@port,
                 :Handlers => {
                     :CA => {}, # so that certs autogenerate
diff --git a/test/ral/types/filesources.rb b/test/ral/types/filesources.rb
index 9517db5a5..489bc4e78 100755
--- a/test/ral/types/filesources.rb
+++ b/test/ral/types/filesources.rb
@@ -548,7 +548,7 @@ class TestFileSources < Test::Unit::TestCase
 
         serverpid = nil
         assert_nothing_raised() {
-            server = Puppet::Network::Server::WEBrick.new(
+            server = Puppet::Network::HTTPServer::WEBrick.new(
                 :Handlers => {
                     :CA => {}, # so that certs autogenerate
                     :FileServer => {
@@ -593,7 +593,7 @@ class TestFileSources < Test::Unit::TestCase
 
         serverpid = nil
         assert_nothing_raised("Could not start on port %s" % @port) {
-            server = Puppet::Network::Server::WEBrick.new(
+            server = Puppet::Network::HTTPServer::WEBrick.new(
                 :Port => @port,
                 :Handlers => {
                     :CA => {}, # so that certs autogenerate