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

7 files changed, 13 insertions, 13 deletions

diff --git a/lib/puppet/config.rb b/lib/puppet/config.rb
index c5da14880..3c2f20e1a 100644
--- a/lib/puppet/config.rb
+++ b/lib/puppet/config.rb
@@ -233,10 +233,10 @@ class Config
     def parse(file)
         text = nil
 
-        if file.is_a? Puppet::ParsedFile
+        if file.is_a? Puppet::LoadedFile
             @file = file
         else
-            @file = Puppet::ParsedFile.new(file)
+            @file = Puppet::LoadedFile.new(file)
         end
 
         # Create a timer so that this.
diff --git a/lib/puppet/parsedfile.rb b/lib/puppet/loadedfile.rb
index c6425c8c0..c0b00c597 100755
--- a/lib/puppet/parsedfile.rb
+++ b/lib/puppet/loadedfile.rb
@@ -5,7 +5,7 @@ require 'puppet'
 
 module Puppet
     class NoSuchFile < Puppet::Error; end
-    class ParsedFile
+    class LoadedFile
         attr_reader :file
 
         # Provide a hook for setting the timestamp during testing, so we don't
diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra
index 535bf6e56..c4883deef 100644
--- a/lib/puppet/parser/grammar.ra
+++ b/lib/puppet/parser/grammar.ra
@@ -585,7 +585,7 @@ endcomma:     # nothing
 end
 ---- header ----
 require 'puppet'
-require 'puppet/parsedfile'
+require 'puppet/loadedfile'
 require 'puppet/parser/lexer'
 require 'puppet/parser/ast'
 #require 'puppet/parser/interpreter'
@@ -648,7 +648,7 @@ def file=(file)
     if @files.detect { |f| f.file == file }
         raise Puppet::ImportError.new("Import loop detected")
     else
-        @files << Puppet::ParsedFile.new(file)
+        @files << Puppet::LoadedFile.new(file)
         @lexer.file = file
     end
 end
diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb
index 246bdce5b..ee770d02e 100644
--- a/lib/puppet/parser/interpreter.rb
+++ b/lib/puppet/parser/interpreter.rb
@@ -254,7 +254,7 @@ module Puppet
             # Add a new file to check for updateness.
             def newfile(file)
                 unless @files.find { |f| f.file == file }
-                    @files << Puppet::ParsedFile.new(file)
+                    @files << Puppet::LoadedFile.new(file)
                 end
             end
 
diff --git a/lib/puppet/parser/parser.rb b/lib/puppet/parser/parser.rb
index 81f2aae8a..94ac1f6f1 100644
--- a/lib/puppet/parser/parser.rb
+++ b/lib/puppet/parser/parser.rb
@@ -8,7 +8,7 @@ require 'racc/parser'
 
 
 require 'puppet'
-require 'puppet/parsedfile'
+require 'puppet/loadedfile'
 require 'puppet/parser/lexer'
 require 'puppet/parser/ast'
 #require 'puppet/parser/interpreter'
@@ -29,7 +29,7 @@ module Puppet
 
     class Parser < Racc::Parser
 
-module_eval <<'..end grammar.ra modeval..id19f016e436', 'grammar.ra', 603
+module_eval <<'..end grammar.ra modeval..idaca07abf20', 'grammar.ra', 603
 require 'puppet/parser/functions'
 
 attr_reader :file
@@ -78,7 +78,7 @@ def file=(file)
     if @files.detect { |f| f.file == file }
         raise Puppet::ImportError.new("Import loop detected")
     else
-        @files << Puppet::ParsedFile.new(file)
+        @files << Puppet::LoadedFile.new(file)
         @lexer.file = file
     end
 end
@@ -175,7 +175,7 @@ end
 
 # $Id$
 
-..end grammar.ra modeval..id19f016e436
+..end grammar.ra modeval..idaca07abf20
 
 ##### racc 1.4.5 generates ###
 
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