Disabling most documentation generation except for the API docs, and wrapping the StatusServer in the xmlrpc check

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

1 files changed, 41 insertions, 40 deletions

diff --git a/lib/puppet/server.rb b/lib/puppet/server.rb
index 4b40e2bc9..35a16a7f3 100644
--- a/lib/puppet/server.rb
+++ b/lib/puppet/server.rb
@@ -97,62 +97,63 @@ module Puppet
                 self.mount("/RPC2", Puppet::Server::Servlet, @handlers)
             end
         end
-    end
-
-    class Server
-        # the base class for the different handlers
-        class Handler
-            attr_accessor :server
-            @subclasses = []
 
-            def self.each
-                @subclasses.each { |c| yield c }
-            end
+        class Server
+            # the base class for the different handlers
+            class Handler
+                attr_accessor :server
+                @subclasses = []
 
-            def self.handler(name)
-                @subclasses.find { |h|
-                    h.name == name
-                }
-            end
+                def self.each
+                    @subclasses.each { |c| yield c }
+                end
 
-            def self.inherited(sub)
-                @subclasses << sub
-            end
+                def self.handler(name)
+                    @subclasses.find { |h|
+                        h.name == name
+                    }
+                end
 
-            def self.interface
-                if defined? @interface
-                    return @interface
-                else
-                    raise Puppet::DevError, "Handler %s has no defined interface" %
-                        self
+                def self.inherited(sub)
+                    @subclasses << sub
                 end
-            end
 
-            def self.name
-                unless defined? @name
-                    @name = self.to_s.sub(/.+::/, '').intern
+                def self.interface
+                    if defined? @interface
+                        return @interface
+                    else
+                        raise Puppet::DevError, "Handler %s has no defined interface" %
+                            self
+                    end
                 end
 
-                return @name
-            end
+                def self.name
+                    unless defined? @name
+                        @name = self.to_s.sub(/.+::/, '').intern
+                    end
 
-            def initialize(hash = {})
+                    return @name
+                end
+
+                def initialize(hash = {})
+                end
             end
-        end
 
-        class ServerStatus < Handler
+            
+            class ServerStatus < Handler
 
-            @interface = XMLRPC::Service::Interface.new("status") { |iface|
-                iface.add_method("int status()")
-            }
+                @interface = XMLRPC::Service::Interface.new("status") { |iface|
+                    iface.add_method("int status()")
+                }
 
-            @name = :Status
+                @name = :Status
 
-            def status(status = nil, client = nil, clientip = nil)
-                return 1
+                def status(status = nil, client = nil, clientip = nil)
+                    return 1
+                end
             end
-        end
 
+        end
     end
 
     #---------------------------------------------------------------