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

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

4 files changed, 24 insertions, 24 deletions

diff --git a/spec/integration/network/formats.rb b/spec/integration/network/formats.rb
index 0cfbadd38..2ec4cb9e8 100755
--- a/spec/integration/network/formats.rb
+++ b/spec/integration/network/formats.rb
@@ -14,6 +14,6 @@ describe Puppet::Network::FormatHandler.format(:s) do
     end
 
     it "should not support catalogs" do
-        @format.should_not be_supported(Puppet::Node::Catalog)
+        @format.should_not be_supported(Puppet::Resource::Catalog)
     end
 end
diff --git a/spec/integration/node/catalog.rb b/spec/integration/resource/catalog.rb
index 438f92834..db25dab67 100755
--- a/spec/integration/node/catalog.rb
+++ b/spec/integration/resource/catalog.rb
@@ -5,7 +5,7 @@
 
 require File.dirname(__FILE__) + '/../../spec_helper'
 
-describe Puppet::Node::Catalog do
+describe Puppet::Resource::Catalog do
     describe "when using the indirector" do
         after { Puppet::Util::Cacher.expire }
         before do
@@ -16,21 +16,21 @@ describe Puppet::Node::Catalog do
 
 
         it "should be able to delegate to the :yaml terminus" do
-            Puppet::Node::Catalog.indirection.stubs(:terminus_class).returns :yaml
+            Puppet::Resource::Catalog.indirection.stubs(:terminus_class).returns :yaml
 
             # Load now, before we stub the exists? method.
-            terminus = Puppet::Node::Catalog.indirection.terminus(:yaml)
+            terminus = Puppet::Resource::Catalog.indirection.terminus(:yaml)
             terminus.expects(:path).with("me").returns "/my/yaml/file"
 
             FileTest.expects(:exist?).with("/my/yaml/file").returns false
-            Puppet::Node::Catalog.find("me").should be_nil
+            Puppet::Resource::Catalog.find("me").should be_nil
         end
 
         it "should be able to delegate to the :compiler terminus" do
-            Puppet::Node::Catalog.indirection.stubs(:terminus_class).returns :compiler
+            Puppet::Resource::Catalog.indirection.stubs(:terminus_class).returns :compiler
 
             # Load now, before we stub the exists? method.
-            compiler = Puppet::Node::Catalog.indirection.terminus(:compiler)
+            compiler = Puppet::Resource::Catalog.indirection.terminus(:compiler)
 
             node = mock 'node'
             node.stub_everything
@@ -38,17 +38,17 @@ describe Puppet::Node::Catalog do
             Puppet::Node.expects(:find).returns(node)
             compiler.expects(:compile).with(node).returns nil
 
-            Puppet::Node::Catalog.find("me").should be_nil
+            Puppet::Resource::Catalog.find("me").should be_nil
         end
 
         it "should pass provided node information directly to the terminus" do
             terminus = mock 'terminus'
 
-            Puppet::Node::Catalog.indirection.stubs(:terminus).returns terminus
+            Puppet::Resource::Catalog.indirection.stubs(:terminus).returns terminus
 
             node = mock 'node'
             terminus.expects(:find).with { |request| request.options[:use_node] == node }
-            Puppet::Node::Catalog.find("me", :use_node => node)
+            Puppet::Resource::Catalog.find("me", :use_node => node)
         end
     end
 end
diff --git a/spec/integration/type/file.rb b/spec/integration/type/file.rb
index 9d1b77788..5f15aa55c 100755
--- a/spec/integration/type/file.rb
+++ b/spec/integration/type/file.rb
@@ -37,7 +37,7 @@ describe Puppet::Type.type(:file) do
 
             @file = Puppet::Type::File.create(:name => @path, :mode => 0644, :recurse => true)
 
-            @catalog = Puppet::Node::Catalog.new
+            @catalog = Puppet::Resource::Catalog.new
             @catalog.add_resource @file
 
             lambda { @file.eval_generate }.should_not raise_error
@@ -50,7 +50,7 @@ describe Puppet::Type.type(:file) do
 
             @file = Puppet::Type::File.create(:name => @path, :mode => 0644, :recurse => true)
 
-            @catalog = Puppet::Node::Catalog.new
+            @catalog = Puppet::Resource::Catalog.new
             @catalog.add_resource @file
 
             @catalog.apply
@@ -73,7 +73,7 @@ describe Puppet::Type.type(:file) do
 
             @file = Puppet::Type::File.create(:name => dest, :target => source, :recurse => true, :ensure => :link)
 
-            @catalog = Puppet::Node::Catalog.new
+            @catalog = Puppet::Resource::Catalog.new
             @catalog.add_resource @file
 
             @catalog.apply
@@ -100,7 +100,7 @@ describe Puppet::Type.type(:file) do
 
             @file = Puppet::Type::File.create(:name => dest, :source => source, :recurse => true)
 
-            @catalog = Puppet::Node::Catalog.new
+            @catalog = Puppet::Resource::Catalog.new
             @catalog.add_resource @file
 
             @catalog.apply
@@ -135,7 +135,7 @@ describe Puppet::Type.type(:file) do
 
             @file = Puppet::Type::File.create(:name => @dest, :source => @source, :recurse => true)
 
-            @catalog = Puppet::Node::Catalog.new
+            @catalog = Puppet::Resource::Catalog.new
             @catalog.add_resource @file
         end
 
@@ -168,7 +168,7 @@ describe Puppet::Type.type(:file) do
 
             file = Puppet::Type::File.create(:name => dest, :source => source)
 
-            catalog = Puppet::Node::Catalog.new
+            catalog = Puppet::Resource::Catalog.new
             catalog.add_resource file
 
             catalog.apply
@@ -185,7 +185,7 @@ describe Puppet::Type.type(:file) do
 
             file = Puppet::Type::File.create(:name => dest, :source => source)
 
-            catalog = Puppet::Node::Catalog.new
+            catalog = Puppet::Resource::Catalog.new
             catalog.add_resource file
 
             catalog.apply
@@ -201,7 +201,7 @@ describe Puppet::Type.type(:file) do
 
             file = Puppet::Type::File.create(:name => dest, :source => source)
 
-            catalog = Puppet::Node::Catalog.new
+            catalog = Puppet::Resource::Catalog.new
             catalog.add_resource file
             catalog.apply
 
@@ -223,7 +223,7 @@ describe Puppet::Type.type(:file) do
 
             file = Puppet::Type::File.create(:name => dest, :source => source, :recurse => true)
 
-            catalog = Puppet::Node::Catalog.new
+            catalog = Puppet::Resource::Catalog.new
             catalog.add_resource file
             catalog.apply
 
@@ -239,7 +239,7 @@ describe Puppet::Type.type(:file) do
             :content => "this is some content, yo"
         )
 
-        catalog = Puppet::Node::Catalog.new
+        catalog = Puppet::Resource::Catalog.new
         catalog.add_resource file
         catalog.apply
 
@@ -255,7 +255,7 @@ describe Puppet::Type.type(:file) do
             :content => "this is some content, yo"
         )
 
-        catalog = Puppet::Node::Catalog.new
+        catalog = Puppet::Resource::Catalog.new
         catalog.add_resource file
         catalog.apply
 
@@ -274,7 +274,7 @@ describe Puppet::Type.type(:file) do
             :source => source
         )
 
-        catalog = Puppet::Node::Catalog.new
+        catalog = Puppet::Resource::Catalog.new
         catalog.add_resource file
         catalog.apply
 
@@ -310,7 +310,7 @@ describe Puppet::Type.type(:file) do
                                         :purge => true,
                                         :recurse => true)
 
-            @catalog = Puppet::Node::Catalog.new
+            @catalog = Puppet::Resource::Catalog.new
             @catalog.add_resource @lfobj, @destobj
         end
 
diff --git a/spec/integration/type/tidy.rb b/spec/integration/type/tidy.rb
index 2c83e7a8a..3ad7de9ec 100755
--- a/spec/integration/type/tidy.rb
+++ b/spec/integration/type/tidy.rb
@@ -19,7 +19,7 @@ describe Puppet::Type.type(:tidy) do
         
         tidy = Puppet::Type.type(:tidy).create :path => dir, :recurse => true
 
-        catalog = Puppet::Node::Catalog.new
+        catalog = Puppet::Resource::Catalog.new
         catalog.add_resource(tidy)
 
         catalog.apply