Moving some of the stand-alone classes into the util/ subdirectory, to clean up the top-level namespace a bit. This is a lot of file modifications, but most of them just change class names and file paths.

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

4 files changed, 5 insertions, 5 deletions

diff --git a/lib/puppet/server/authconfig.rb b/lib/puppet/server/authconfig.rb
index 073ff9516..d43371a77 100644
--- a/lib/puppet/server/authconfig.rb
+++ b/lib/puppet/server/authconfig.rb
@@ -1,4 +1,4 @@
-require 'puppet/loadedfile'
+require 'puppet/util/loadedfile'
 require 'puppet/server/rights'
 
 module Puppet
@@ -6,7 +6,7 @@ class Server
 
 class ConfigurationError < Puppet::Error; end
 
-class AuthConfig < Puppet::LoadedFile
+class AuthConfig < Puppet::Util::LoadedFile
     Puppet.config.setdefaults(:puppet,
         :authconfig => [ "$confdir/namespaceauth.conf",
             "The configuration file that defines the rights to the different
diff --git a/lib/puppet/server/fileserver.rb b/lib/puppet/server/fileserver.rb
index b541f2474..3ea44d785 100755
--- a/lib/puppet/server/fileserver.rb
+++ b/lib/puppet/server/fileserver.rb
@@ -75,7 +75,7 @@ class Server
             if hash[:Config] == false
                 @noreadconfig = true
             else
-                @config = Puppet::LoadedFile.new(
+                @config = Puppet::Util::LoadedFile.new(
                     hash[:Config] || Puppet[:fileserverconfig]
                 )
                 @noreadconfig = false
diff --git a/lib/puppet/server/logger.rb b/lib/puppet/server/logger.rb
index 2170a5772..aa3521573 100755
--- a/lib/puppet/server/logger.rb
+++ b/lib/puppet/server/logger.rb
@@ -42,7 +42,7 @@ class Server
                 end
             end
 
-            Puppet::Log.newmessage(message)
+            Puppet::Util::Log.newmessage(message)
 
             # This is necessary or XMLRPC gets all pukey
             return ""
diff --git a/lib/puppet/server/report.rb b/lib/puppet/server/report.rb
index 3c325041d..4298f8ee6 100755
--- a/lib/puppet/server/report.rb
+++ b/lib/puppet/server/report.rb
@@ -39,7 +39,7 @@ class Server
         )
 
         @reports = {}
-        @reportloader = Puppet::Autoload.new(self, "puppet/reports")
+        @reportloader = Puppet::Util::Autoload.new(self, "puppet/reports")
 
         class << self
             attr_reader :hooks