Renaming Parser::ResourceType to Resource::Type

Basically, these classes (ResourceType and ResourceTypeCollection)
don't really belong in Parser, so I'm moving them to the
Resource namespace.  This will be where anything RAL-related goes
from now on, and as we migrate functionality out of Puppet::Type,
it should go here.

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

4 files changed, 5 insertions, 5 deletions

diff --git a/spec/integration/parser/functions/include.rb b/spec/integration/parser/functions/include.rb
index 64346bffb..f84d43276 100755
--- a/spec/integration/parser/functions/include.rb
+++ b/spec/integration/parser/functions/include.rb
@@ -14,7 +14,7 @@ describe "The include function" do
     end
 
     it "should add a containment relationship between the 'included' class and our class" do
-        @compiler.known_resource_types.add Puppet::Parser::ResourceType.new(:hostclass, "includedclass")
+        @compiler.known_resource_types.add Puppet::Resource::Type.new(:hostclass, "includedclass")
 
         @scope.function_include("includedclass")
 
diff --git a/spec/integration/parser/functions/require.rb b/spec/integration/parser/functions/require.rb
index 5f95ec520..143729967 100755
--- a/spec/integration/parser/functions/require.rb
+++ b/spec/integration/parser/functions/require.rb
@@ -16,7 +16,7 @@ describe "The require function" do
     end
 
     it "should add a dependency between the 'required' class and our class" do
-        @compiler.known_resource_types.add Puppet::Parser::ResourceType.new(:hostclass, "requiredclass")
+        @compiler.known_resource_types.add Puppet::Resource::Type.new(:hostclass, "requiredclass")
 
         @scope.function_require("requiredclass")
         @scope.resource["require"].should_not be_nil
diff --git a/spec/integration/parser/parser.rb b/spec/integration/parser/parser.rb
index 08cab5621..5a30f066e 100755
--- a/spec/integration/parser/parser.rb
+++ b/spec/integration/parser/parser.rb
@@ -4,7 +4,7 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Puppet::Parser::Parser do
     before :each do
-        @resource_type_collection = Puppet::Parser::ResourceTypeCollection.new("env")
+        @resource_type_collection = Puppet::Resource::TypeCollection.new("env")
         @parser = Puppet::Parser::Parser.new "development"
     end
 
diff --git a/spec/integration/util/rdoc/parser.rb b/spec/integration/util/rdoc/parser.rb
index a52c11d87..01bcb644b 100755
--- a/spec/integration/util/rdoc/parser.rb
+++ b/spec/integration/util/rdoc/parser.rb
@@ -2,7 +2,7 @@
 
 Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
 
-require 'puppet/parser/resource_type_collection'
+require 'puppet/resource/type_collection'
 require 'puppet/util/rdoc/parser'
 require 'puppet/util/rdoc'
 require 'puppet/util/rdoc/code_objects'
@@ -41,7 +41,7 @@ describe RDoc::Parser do
     end
 
     it "should parse to RDoc data structure" do
-        @parser.expects(:document_class).with { |n,k,c| n == "::test" and k.is_a?(Puppet::Parser::ResourceType) }
+        @parser.expects(:document_class).with { |n,k,c| n == "::test" and k.is_a?(Puppet::Resource::Type) }
         @parser.scan
     end