Created a Handler base class for all of the server handlers, which allows a lot of the manual work to now be automatic

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

3 files changed, 13 insertions, 25 deletions

diff --git a/lib/puppet/server/ca.rb b/lib/puppet/server/ca.rb
index 65074c3f6..20caee9bb 100644
--- a/lib/puppet/server/ca.rb
+++ b/lib/puppet/server/ca.rb
@@ -9,16 +9,12 @@ require 'xmlrpc/server'
 module Puppet
 class Server
     class CAError < Puppet::Error; end
-    class CA
+    class CA < Handler
         attr_reader :ca
 
-        def self.interface
-            XMLRPC::Service::Interface.new("puppetca") { |iface|
-                iface.add_method("array getcert(csr)")
-            }
-        end
-
-        Puppet::Server.addhandler(:CA, self)
+        @interface = XMLRPC::Service::Interface.new("puppetca") { |iface|
+            iface.add_method("array getcert(csr)")
+        }
 
         def autosign?(hostname)
             # simple values are easy
diff --git a/lib/puppet/server/fileserver.rb b/lib/puppet/server/fileserver.rb
index 43e08655f..f13c3285f 100755
--- a/lib/puppet/server/fileserver.rb
+++ b/lib/puppet/server/fileserver.rb
@@ -4,21 +4,17 @@ require 'cgi'
 module Puppet
 class Server
     class FileServerError < Puppet::Error; end
-    class FileServer
+    class FileServer < Handler
         attr_accessor :local
 
         #CHECKPARAMS = %w{checksum type mode owner group}
         CHECKPARAMS = [:mode, :type, :owner, :group, :checksum]
 
-        def self.interface
-            XMLRPC::Service::Interface.new("fileserver") { |iface|
-                iface.add_method("string describe(string)")
-                iface.add_method("string list(string, boolean)")
-                iface.add_method("string retrieve(string)")
-            }
-        end
-
-        Puppet::Server.addhandler(:FileServer, self)
+        @interface = XMLRPC::Service::Interface.new("fileserver") { |iface|
+            iface.add_method("string describe(string)")
+            iface.add_method("string list(string, boolean)")
+            iface.add_method("string retrieve(string)")
+        }
 
         def check(dir)
             unless FileTest.exists?(dir)
diff --git a/lib/puppet/server/master.rb b/lib/puppet/server/master.rb
index f3f0411e9..00d62eb5b 100644
--- a/lib/puppet/server/master.rb
+++ b/lib/puppet/server/master.rb
@@ -7,17 +7,13 @@ require 'xmlrpc/server'
 module Puppet
 class Server
     class MasterError < Puppet::Error; end
-    class Master
+    class Master < Handler
         attr_accessor :ast, :local
         attr_reader :ca
 
-        def self.interface
-            XMLRPC::Service::Interface.new("puppetmaster") { |iface|
+        @interface = XMLRPC::Service::Interface.new("puppetmaster") { |iface|
                 iface.add_method("string getconfig(string)")
-            }
-        end
-
-        Puppet::Server.addhandler(:Master, self)
+        }
 
         def initialize(hash = {})