Renaming Puppet::Node::Catalog to Puppet::Resource::Catalog

Signed-off-by: Luke Kanies <luke@madstop.com>

8 files changed, 11 insertions, 11 deletions

diff --git a/lib/puppet/indirector/catalog/compiler.rb b/lib/puppet/indirector/catalog/compiler.rb
index a6a812817..df1808d73 100644
--- a/lib/puppet/indirector/catalog/compiler.rb
+++ b/lib/puppet/indirector/catalog/compiler.rb
@@ -1,10 +1,10 @@
 require 'puppet/node'
-require 'puppet/node/catalog'
+require 'puppet/resource/catalog'
 require 'puppet/indirector/code'
 require 'puppet/parser/interpreter'
 require 'yaml'
 
-class Puppet::Node::Catalog::Compiler < Puppet::Indirector::Code
+class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
     desc "Puppet's catalog compilation interface, and its back-end is
         Puppet's compiler"
 
diff --git a/lib/puppet/indirector/catalog/yaml.rb b/lib/puppet/indirector/catalog/yaml.rb
index 6a8d1765c..d6fc9b81d 100644
--- a/lib/puppet/indirector/catalog/yaml.rb
+++ b/lib/puppet/indirector/catalog/yaml.rb
@@ -1,7 +1,7 @@
-require 'puppet/node/catalog'
+require 'puppet/resource/catalog'
 require 'puppet/indirector/yaml'
 
-class Puppet::Node::Catalog::Yaml < Puppet::Indirector::Yaml
+class Puppet::Resource::Catalog::Yaml < Puppet::Indirector::Yaml
     desc "Store catalogs as flat files, serialized using YAML."
 
     private
diff --git a/lib/puppet/network/client/master.rb b/lib/puppet/network/client/master.rb
index d24fd7df7..f86c9bb01 100644
--- a/lib/puppet/network/client/master.rb
+++ b/lib/puppet/network/client/master.rb
@@ -319,7 +319,7 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
         if args[:ignore]
             hash[:ignore] = args[:ignore].split(/\s+/)
         end
-        downconfig = Puppet::Node::Catalog.new("downloading")
+        downconfig = Puppet::Resource::Catalog.new("downloading")
         downconfig.add_resource Puppet::Type.type(:file).create(hash)
         
         Puppet.info "Retrieving #{args[:name]}s"
diff --git a/lib/puppet/network/handler/master.rb b/lib/puppet/network/handler/master.rb
index 71b633a09..7bde0af73 100644
--- a/lib/puppet/network/handler/master.rb
+++ b/lib/puppet/network/handler/master.rb
@@ -62,7 +62,7 @@ class Puppet::Network::Handler
             # Pass the facts to the fact handler
             Puppet::Node::Facts.new(client, facts).save unless local?
 
-            catalog = Puppet::Node::Catalog.find(client)
+            catalog = Puppet::Resource::Catalog.find(client)
 
             case format
             when "yaml":
diff --git a/lib/puppet/parser/compiler.rb b/lib/puppet/parser/compiler.rb
index d67b3d275..9f5548d8b 100644
--- a/lib/puppet/parser/compiler.rb
+++ b/lib/puppet/parser/compiler.rb
@@ -2,7 +2,7 @@
 #  Copyright (c) 2007. All rights reserved.
 
 require 'puppet/node'
-require 'puppet/node/catalog'
+require 'puppet/resource/catalog'
 require 'puppet/util/errors'
 
 # Maintain a graph of scopes, along with a bunch of data
@@ -412,7 +412,7 @@ class Puppet::Parser::Compiler
         @scope_graph = Puppet::SimpleGraph.new
 
         # For maintaining the relationship between scopes and their resources.
-        @catalog = Puppet::Node::Catalog.new(@node.name)
+        @catalog = Puppet::Resource::Catalog.new(@node.name)
         @catalog.version = @parser.version
     end
 
diff --git a/lib/puppet/node/catalog.rb b/lib/puppet/resource/catalog.rb
index bc522cc1e..5b1022799 100644
--- a/lib/puppet/node/catalog.rb
+++ b/lib/puppet/resource/catalog.rb
@@ -10,7 +10,7 @@ require 'puppet/util/tagging'
 # meant to be passed from server to client, and it contains all
 # of the information in the catalog, including the resources
 # and the relationships between them.
-class Puppet::Node::Catalog < Puppet::SimpleGraph
+class Puppet::Resource::Catalog < Puppet::SimpleGraph
     class DuplicateResourceError < Puppet::Error; end
 
     extend Puppet::Indirector
diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb
index 83017222f..30f86a9d7 100644
--- a/lib/puppet/transaction.rb
+++ b/lib/puppet/transaction.rb
@@ -400,7 +400,7 @@ class Transaction
     # this should only be called by a Puppet::Type::Component resource now
     # and it should only receive an array
     def initialize(resources)
-        if resources.is_a?(Puppet::Node::Catalog)
+        if resources.is_a?(Puppet::Resource::Catalog)
             @catalog = resources
         elsif resources.is_a?(Puppet::SimpleGraph)
             raise "Transactions should get catalogs now, not SimpleGraph"
diff --git a/lib/puppet/transportable.rb b/lib/puppet/transportable.rb
index b809d5b94..9e85b1fe7 100644
--- a/lib/puppet/transportable.rb
+++ b/lib/puppet/transportable.rb
@@ -181,7 +181,7 @@ module Puppet
 
         # Create a resource graph from our structure.
         def to_catalog(clear_on_failure = true)
-            catalog = Puppet::Node::Catalog.new(Facter.value("hostname"))
+            catalog = Puppet::Resource::Catalog.new(Facter.value("hostname"))
 
             # This should really use the 'delve' method, but this
             # whole class is going away relatively soon, hopefully,