From d0389f4d16efbeccf47d6cd2f1b0854ccb1c88d5 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Thu, 7 Jan 2010 17:23:31 -0800 Subject: 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 --- lib/puppet/application/main.rb | 2 +- lib/puppet/application/server.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/puppet/application') diff --git a/lib/puppet/application/main.rb b/lib/puppet/application/main.rb index 3813df612..2952ef4ae 100644 --- a/lib/puppet/application/main.rb +++ b/lib/puppet/application/main.rb @@ -72,7 +72,7 @@ Puppet::Application.new(:main) do Puppet[:manifest] = ARGV.shift end begin - Puppet::Parser::ResourceTypeCollection.new(Puppet[:environment]).perform_initial_import + Puppet::Resource::TypeCollection.new(Puppet[:environment]).perform_initial_import rescue => detail Puppet.err detail exit 1 diff --git a/lib/puppet/application/server.rb b/lib/puppet/application/server.rb index e9253c6f9..afdad54fb 100644 --- a/lib/puppet/application/server.rb +++ b/lib/puppet/application/server.rb @@ -69,7 +69,7 @@ Puppet::Application.new(:server) do command(:parseonly) do begin - Puppet::Parser::ResourceTypeCollection.new(Puppet[:environment]).perform_initial_import + Puppet::Resource::TypeCollection.new(Puppet[:environment]).perform_initial_import rescue => detail Puppet.err detail exit 1 -- cgit