moving all server handlers into a specific server subdirectory

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@579 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/puppet/client.rb b/lib/puppet/client.rb
index 1282a5900..7998f2ff8 100644
--- a/lib/puppet/client.rb
+++ b/lib/puppet/client.rb
@@ -5,13 +5,13 @@
 require 'puppet'
 require 'puppet/sslcertificates'
 require 'puppet/type'
-require 'puppet/server'
 require 'facter'
 require 'openssl'
 require 'puppet/transaction'
 require 'puppet/transportable'
 require 'puppet/metric'
 require 'puppet/daemon'
+require 'puppet/server'
 
 $noclientnetworking = false
 begin
@@ -33,9 +33,9 @@ module Puppet
         class NetworkClient < XMLRPC::Client
             #include Puppet::Daemon
 
-            @@handlers = [Puppet::FileServer, Puppet::CA, Puppet::Master]
+            #@@handlers = [Puppet::FileServer, Puppet::CA, Puppet::Server::Master]
 
-            @@handlers.each { |handler|
+            Puppet::Server.eachhandler { |name, handler|
                 interface = handler.interface
                 namespace = interface.prefix
 
@@ -169,12 +169,12 @@ module Puppet
 
                     @driver = Puppet::NetworkClient.new(args)
                     @local = false
-                when Puppet::Master:
+                when Puppet::Server::Master:
                     @driver = hash[:Server]
                     @local = true
                 else
                     raise ClientError.new("Server must be a hostname or a " +
-                        "Puppet::Master object")
+                        "Puppet::Server::Master object")
                 end
             else
                 raise ClientError.new("Must pass :Server to client")