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

5 files changed, 12 insertions, 12 deletions

diff --git a/lib/puppet/parser/ast.rb b/lib/puppet/parser/ast.rb
index e8cfcc4dd..d8d421c47 100644
--- a/lib/puppet/parser/ast.rb
+++ b/lib/puppet/parser/ast.rb
@@ -1,7 +1,7 @@
 # the parent class for all of our syntactical objects
 
 require 'puppet'
-require 'puppet/autoload'
+require 'puppet/util/autoload'
 
 # The base class for all of the objects that make up the parse trees.
 # Handles things like file name, line #, and also does the initialization
@@ -114,7 +114,7 @@ class Puppet::Parser::AST
     end
     #---------------------------------------------------------------
     # Now autoload everything.
-    @autoloader = Puppet::Autoload.new(self,
+    @autoloader = Puppet::Util::Autoload.new(self,
         "puppet/parser/ast"
     )
     @autoloader.loadall
diff --git a/lib/puppet/parser/functions.rb b/lib/puppet/parser/functions.rb
index 9fbec43df..47c5ff110 100644
--- a/lib/puppet/parser/functions.rb
+++ b/lib/puppet/parser/functions.rb
@@ -1,5 +1,5 @@
 # Grr
-require 'puppet/autoload'
+require 'puppet/util/autoload'
 require 'puppet/parser/scope'
 
 module Puppet::Parser
@@ -13,7 +13,7 @@ module Functions
 
     def self.autoloader
         unless defined? @autoloader
-            @autoloader = Puppet::Autoload.new(self,
+            @autoloader = Puppet::Util::Autoload.new(self,
                 "puppet/parser/functions",
                 :wrap => false
             )
@@ -181,7 +181,7 @@ module Functions
     end
 
     # Runs a newfunction to create a function for each of the log levels
-    Puppet::Log.levels.each do |level|      
+    Puppet::Util::Log.levels.each do |level|      
         newfunction(level, :doc => "Log a message on the server at level
         #{level.to_s}.") do |vals| 
             send(level, vals.join(" ")) 
diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra
index fe4a08c57..5877439ec 100644
--- a/lib/puppet/parser/grammar.ra
+++ b/lib/puppet/parser/grammar.ra
@@ -615,7 +615,7 @@ endcomma:     # nothing
 end
 ---- header ----
 require 'puppet'
-require 'puppet/loadedfile'
+require 'puppet/util/loadedfile'
 require 'puppet/parser/lexer'
 require 'puppet/parser/ast'
 #require 'puppet/parser/interpreter'
diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb
index 63b107985..3b268c16c 100644
--- a/lib/puppet/parser/interpreter.rb
+++ b/lib/puppet/parser/interpreter.rb
@@ -611,8 +611,8 @@ class Puppet::Parser::Interpreter
     # reparsed.
     def newfile(*files)
         files.each do |file|
-            unless file.is_a? Puppet::LoadedFile
-                file = Puppet::LoadedFile.new(file)
+            unless file.is_a? Puppet::Util::LoadedFile
+                file = Puppet::Util::LoadedFile.new(file)
             end
             @files << file
         end
diff --git a/lib/puppet/parser/parser.rb b/lib/puppet/parser/parser.rb
index 414405302..94d4f7fad 100644
--- a/lib/puppet/parser/parser.rb
+++ b/lib/puppet/parser/parser.rb
@@ -8,7 +8,7 @@ require 'racc/parser'
 
 
 require 'puppet'
-require 'puppet/loadedfile'
+require 'puppet/util/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..id0df015d0a0', 'grammar.ra', 633
+module_eval <<'..end grammar.ra modeval..id05c09a2dac', 'grammar.ra', 633
 require 'puppet/parser/functions'
 
 attr_reader :file, :interp
@@ -101,7 +101,7 @@ def file=(file)
     if @files.detect { |f| f.file == file }
         raise Puppet::ImportError.new("Import loop detected")
     else
-        @files << Puppet::LoadedFile.new(file)
+        @files << Puppet::Util::LoadedFile.new(file)
         @lexer.file = file
     end
 end
@@ -199,7 +199,7 @@ end
 
 # $Id$
 
-..end grammar.ra modeval..id0df015d0a0
+..end grammar.ra modeval..id05c09a2dac
 
 ##### racc 1.4.5 generates ###