Renaming parsedfile to loadedfile, which makes much more sense and reduces some naming conflicts

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

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/puppet/server/authconfig.rb b/lib/puppet/server/authconfig.rb
index 951a21229..073ff9516 100644
--- a/lib/puppet/server/authconfig.rb
+++ b/lib/puppet/server/authconfig.rb
@@ -1,4 +1,4 @@
-require 'puppet/parsedfile'
+require 'puppet/loadedfile'
 require 'puppet/server/rights'
 
 module Puppet
@@ -6,7 +6,7 @@ class Server
 
 class ConfigurationError < Puppet::Error; end
 
-class AuthConfig < Puppet::ParsedFile
+class AuthConfig < Puppet::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 aa9b8800a..49af26c54 100755
--- a/lib/puppet/server/fileserver.rb
+++ b/lib/puppet/server/fileserver.rb
@@ -104,7 +104,7 @@ class Server
             if hash[:Config] == false
                 @noreadconfig = true
             else
-                @config = Puppet::ParsedFile.new(
+                @config = Puppet::LoadedFile.new(
                     hash[:Config] || Puppet[:fileserverconfig]
                 )
                 @noreadconfig = false