puppet 0.24.9 → 0.25.0

data/lib/puppet/transaction/change.rb

@@ -5,7 +5,7 @@ require 'puppet/transaction/event'
 # including calling 'sync' on the properties and producing events.
 class Puppet::Transaction::Change
     attr_accessor :is, :should, :path, :property, :changed, :proxy
-    
+
     # Switch the goals of the property, thus running the change in reverse.
     def backward
         @is, @should = @should, @is
@@ -14,7 +14,7 @@ class Puppet::Transaction::Change
         @property.info "Reversing %s" % self
         return self.go
     end
-    
+
     def changed?
         self.changed
     end
@@ -28,7 +28,7 @@ class Puppet::Transaction::Change
 
             name = @property.event(should)
         end
-        
+
         Puppet::Transaction::Event.new(name, self.resource)
     end
 
@@ -61,7 +61,7 @@ class Puppet::Transaction::Change
         else
             events = [events]
         end
-        
+
         return events.collect { |name|
             @report = @property.log(@property.change_to_s(@is, @should))
             event(name)
@@ -71,12 +71,12 @@ class Puppet::Transaction::Change
     def forward
         return self.go
     end
-    
+
     # Is our property noop?  This is used for generating special events.
     def noop?
         return @property.noop
     end
-    
+
     # The resource that generated this change.  This is used for handling events,
     # and the proxy resource is used for generated resources, since we can't
     # send an event to a resource we don't have a direct relationship.  If we

data/lib/puppet/transaction/event.rb

@@ -8,7 +8,7 @@ require 'puppet/util/errors'
 class Puppet::Transaction::Event
     include Puppet::Util::MethodHelper
     include Puppet::Util::Errors
-    
+
     attr_reader :name, :source
 
     def initialize(name, source)

data/lib/puppet/transaction/report.rb

@@ -11,7 +11,13 @@ class Puppet::Transaction::Report
     indirects :report, :terminus_class => :processor
 
     attr_accessor :logs, :metrics, :time, :host
-    
+
+    # This is necessary since Marshall doesn't know how to
+    # dump hash with default proc (see below @records)
+    def self.default_format
+        :yaml
+    end
+
     def <<(msg)
         @logs << msg
         return self

data/lib/puppet/transportable.rb

@@ -1,5 +1,5 @@
 require 'puppet'
-require 'puppet/resource_reference'
+require 'puppet/resource/reference'
 require 'yaml'
 
 module Puppet
@@ -36,7 +36,7 @@ module Puppet
 
         def ref
             unless defined? @ref
-                @ref = Puppet::ResourceReference.new(@type, @name)
+                @ref = Puppet::Resource::Reference.new(@type, @name)
             end
             @ref.to_s
         end
@@ -66,7 +66,7 @@ module Puppet
         end
 
         def to_manifest
-            "%s { '%s':\n%s\n}" % 
+            "%s { '%s':\n%s\n}" %
                 [self.type.to_s, self.name,
                  @params.collect { |p, v|
                      if v.is_a? Array
@@ -78,6 +78,14 @@ module Puppet
                 ]
         end
 
+        # Create a normalized resource from our TransObject.
+        def to_resource
+            result = Puppet::Resource.new(type, name, @params.dup)
+            result.tag(*tags)
+
+            result
+        end
+
         def to_yaml_properties
             instance_variables.reject { |v| %w{@ref}.include?(v) }
         end
@@ -86,12 +94,8 @@ module Puppet
             ref
         end
 
-        def to_type
-            if typeklass = Puppet::Type.type(self.type)
-                return typeklass.create(self)
-            else
-                return to_component
-            end
+        def to_ral
+            to_resource.to_ral
         end
     end
 
@@ -181,7 +185,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,
@@ -189,13 +193,13 @@ module Puppet
             delver = proc do |obj|
                 obj.catalog = catalog
                 unless container = catalog.resource(obj.to_ref)
-                    container = obj.to_type
+                    container = obj.to_ral
                     catalog.add_resource container
                 end
                 obj.each do |child|
                     child.catalog = catalog
                     unless resource = catalog.resource(child.to_ref)
-                        resource = child.to_type
+                        resource = child.to_ral
                         catalog.add_resource resource
                     end
 
@@ -205,7 +209,7 @@ module Puppet
                     end
                 end
             end
-                
+
             begin
                 delver.call(self)
                 catalog.finalize
@@ -214,18 +218,18 @@ module Puppet
                 catalog.clear if (clear_on_failure)
                 raise
             end
-            
+
             return catalog
         end
 
         def to_ref
             unless defined? @ref
                 if self.type and self.name
-                    @ref = Puppet::ResourceReference.new(self.type, self.name)
+                    @ref = Puppet::Resource::Reference.new(self.type, self.name)
                 elsif self.type and ! self.name # This is old-school node types
-                    @ref = Puppet::ResourceReference.new("node", self.type)
+                    @ref = Puppet::Resource::Reference.new("node", self.type)
                 elsif ! self.type and self.name
-                    @ref = Puppet::ResourceReference.new("component", self.name)
+                    @ref = Puppet::Resource::Reference.new("component", self.name)
                 else
                     @ref = nil
                 end
@@ -233,18 +237,14 @@ module Puppet
             @ref.to_s if @ref
         end
 
-        def to_type
-            Puppet.debug("TransBucket '%s' has no type" % @name) unless defined? @type
+        def to_ral
+            to_resource.to_ral
+        end
 
-            # Nodes have the same name and type
-            trans = TransObject.new(to_ref, :component)
-            if defined? @parameters
-                @parameters.each { |param,value|
-                    Puppet.debug "Defining %s on %s" % [param, to_ref]
-                    trans[param] = value
-                }
-            end
-            return Puppet::Type::Component.create(trans)
+        # Create a normalized resource from our TransObject.
+        def to_resource
+            params = defined?(@parameters) ? @parameters.dup : {}
+            Puppet::Resource.new(type, name, params)
         end
 
         def param(param,value)

data/lib/puppet/type.rb

@@ -9,8 +9,10 @@ require 'puppet/metatype/manager'
 require 'puppet/util/errors'
 require 'puppet/util/log_paths'
 require 'puppet/util/logging'
-require 'puppet/resource_reference'
+require 'puppet/resource/reference'
+require 'puppet/util/cacher'
 require 'puppet/file_collection/lookup'
+require 'puppet/util/tagging'
 
 # see the bottom of the file for the rest of the inclusions
 
@@ -20,7 +22,9 @@ class Type
     include Puppet::Util::Errors
     include Puppet::Util::LogPaths
     include Puppet::Util::Logging
+    include Puppet::Util::Cacher
     include Puppet::FileCollection::Lookup
+    include Puppet::Util::Tagging
 
     ###############################
     # Code related to resource type attributes.
@@ -35,12 +39,11 @@ class Type
         properties()
     end
 
-    # All parameters, in the appropriate order.  The namevar comes first,
-    # then the properties, then the params and metaparams in the order they
-    # were specified in the files.
+    # All parameters, in the appropriate order.  The namevar comes first, then
+    # the provider, then the properties, and finally the params and metaparams
+    # in the order they were specified in the files.
     def self.allattrs
-        # now get all of the arguments, in a specific order
-        # Cache this, since it gets called so many times
+        # Cache this, since it gets called multiple times
         namevar = self.namevar
 
         order = [namevar]
@@ -52,7 +55,7 @@ class Type
             self.metaparams].flatten.reject { |param|
                 # we don't want our namevar in there multiple times
                 param == namevar
-        }
+            }
 
         order.flatten!
 
@@ -80,9 +83,9 @@ class Type
         # of times (as in, hundreds of thousands in a given run).
         unless @attrclasses.include?(name)
             @attrclasses[name] = case self.attrtype(name)
-            when :property: @validproperties[name]
-            when :meta: @@metaparamhash[name]
-            when :param: @paramhash[name]
+            when :property; @validproperties[name]
+            when :meta; @@metaparamhash[name]
+            when :param; @paramhash[name]
             end
         end
         @attrclasses[name]
@@ -94,13 +97,9 @@ class Type
         @attrtypes ||= {}
         unless @attrtypes.include?(attr)
             @attrtypes[attr] = case
-                when @validproperties.include?(attr): :property
-                when @paramhash.include?(attr): :param
-                when @@metaparamhash.include?(attr): :meta
-                else
-                    raise Puppet::DevError,
-                        "Invalid attribute '%s' for class '%s'" %
-                        [attr, self.name]
+                when @validproperties.include?(attr); :property
+                when @paramhash.include?(attr); :param
+                when @@metaparamhash.include?(attr); :meta
                 end
         end
 
@@ -124,30 +123,6 @@ class Type
         end
     end
 
-    # A similar function but one that yields the class and type.
-    # This is mainly so that setdefaults doesn't call quite so many functions.
-    def self.eachattr(*ary)
-        if ary.empty?
-            ary = nil
-        end
-
-        # We have to do this in a specific order, so that defaults are
-        # created in that order (e.g., providers should be set up before
-        # anything else).
-        allattrs.each do |name|
-            next unless ary.nil? or ary.include?(name)
-            if obj = @properties.find { |p| p.name == name }
-                yield obj, :property
-            elsif obj = @parameters.find { |p| p.name == name }
-                yield obj, :param
-            elsif obj = @@metaparams.find { |p| p.name == name }
-                yield obj, :meta
-            else
-                raise Puppet::DevError, "Could not find parameter %s" % name
-            end
-        end
-    end
-
     def self.eachmetaparam
         @@metaparams.each { |p| yield p.name }
     end
@@ -174,7 +149,7 @@ class Type
 
         return ens
     end
-    
+
     # Deal with any options passed into parameters.
     def self.handle_param_options(name, options)
         # If it's a boolean parameter, create a method to test the value easily
@@ -186,8 +161,6 @@ class Type
                 end
             end
         end
-        
-        # If this param handles relationships, store that information
     end
 
     # Is the parameter in question a meta-parameter?
@@ -228,7 +201,7 @@ class Type
         if options[:required_features]
             param.required_features = options[:required_features]
         end
-        
+
         handle_param_options(name, options)
 
         param.metaparam = true
@@ -266,7 +239,7 @@ class Type
             :array => @parameters,
             :hash => @paramhash
         )
-        
+
         handle_param_options(name, options)
 
         # Grr.
@@ -276,15 +249,6 @@ class Type
 
         param.isnamevar if options[:namevar]
 
-        # These might be enabled later.
-#        define_method(name) do
-#            @parameters[name].value
-#        end
-#
-#        define_method(name.to_s + "=") do |value|
-#            newparam(param, value)
-#        end
-
         if param.isnamevar?
             @namevar = param.name
         end
@@ -314,7 +278,7 @@ class Type
                 "Options must be a hash, not %s" % options.inspect
         end
 
-        if @validproperties.include?(name) 
+        if @validproperties.include?(name)
             raise Puppet::DevError, "Class %s already has a property named %s" %
                 [self.name, name]
         end
@@ -349,14 +313,6 @@ class Type
             @properties << prop
         end
 
-#        define_method(name) do
-#            @parameters[name].should
-#        end
-#
-#        define_method(name.to_s + "=") do |value|
-#            newproperty(name, :should => value)
-#        end
-
         return prop
     end
 
@@ -425,38 +381,6 @@ class Type
         end
     end
 
-    # fix any namevar => param translations
-    def argclean(oldhash)
-        # This duplication is here because it might be a transobject.
-        hash = oldhash.dup.to_hash
-
-        if hash.include?(:resource)
-            hash.delete(:resource)
-        end
-        namevar = self.class.namevar
-
-        # Do a simple translation for those cases where they've passed :name
-        # but that's not our namevar
-        if hash.include? :name and namevar != :name
-            if hash.include? namevar
-                raise ArgumentError, "Cannot provide both name and %s" % namevar
-            end
-            hash[namevar] = hash[:name]
-            hash.delete(:name)
-        end
-
-        # Make sure we have a name, one way or another
-        unless hash.include? namevar
-            if defined? @title and @title
-                hash[namevar] = @title
-            else
-                raise Puppet::Error, "Was not passed a namevar or title"
-            end
-        end
-
-        return hash
-    end
-
     # Return either the attribute alias or the attribute.
     def attr_alias(name)
         name = symbolize(name)
@@ -466,7 +390,7 @@ class Type
             return name
         end
     end
-    
+
     # Are we deleting this resource?
     def deleting?
         obj = @parameters[:ensure] and obj.should == :absent
@@ -481,7 +405,7 @@ class Type
         end
         return false
     end
-    
+
     # abstract accessing parameters and properties, and normalize
     # access to always be symbols, not strings
     # This returns a value, not an object.  It returns the 'is'
@@ -491,7 +415,7 @@ class Type
         name = attr_alias(name)
 
         unless self.class.validattr?(name)
-            raise TypeError.new("Invalid parameter %s(%s)" % [name, name.inspect])
+            fail("Invalid parameter %s(%s)" % [name, name.inspect])
         end
 
         if name == :name
@@ -514,7 +438,7 @@ class Type
         name = attr_alias(name)
 
         unless self.class.validattr?(name)
-            raise TypeError.new("Invalid parameter %s" % [name])
+            fail("Invalid parameter %s" % [name])
         end
 
         if name == :name
@@ -553,6 +477,12 @@ class Type
         }
     end
 
+    # Let the catalog determine whether a given cached value is
+    # still valid or has expired.
+    def expirer
+        catalog
+    end
+
     # retrieve the 'should' value for a specified property
     def should(name)
         name = attr_alias(name)
@@ -603,10 +533,7 @@ class Type
 
     # return the value of a parameter
     def parameter(name)
-        unless name.is_a? Symbol
-            name = name.intern
-        end
-        return @parameters[name].value
+        @parameters[name.to_sym]
     end
 
     # Is the named property defined?
@@ -617,8 +544,9 @@ class Type
         return @parameters.include?(name)
     end
 
-    # return an actual type by name; to return the value, use 'inst[name]'
-    # FIXME this method should go away
+    # Return an actual property instance by name; to return the value, use 'resource[param]'
+    # LAK:NOTE(20081028) Since the 'parameter' method is now a superset of this method,
+    # this one should probably go away at some point.
     def property(name)
         if obj = @parameters[symbolize(name)] and obj.is_a?(Puppet::Property)
             return obj
@@ -627,42 +555,27 @@ class Type
         end
     end
 
-#    def set(name, value)
-#        send(name.to_s + "=", value)
-#    end
-#
-#    def get(name)
-#        send(name)
-#    end
-
     # For any parameters or properties that have defaults and have not yet been
     # set, set them now.  This method can be handed a list of attributes,
     # and if so it will only set defaults for those attributes.
-    def setdefaults(*ary)
-        #self.class.eachattr(*ary) { |klass, type|
-        self.class.eachattr(*ary) { |klass, type|
-            # not many attributes will have defaults defined, so we short-circuit
-            # those away
-            next unless klass.method_defined?(:default)
-            next if @parameters[klass.name]
-
-            next unless obj = self.newattr(klass)
-
-            # We have to check for nil values, not "truth", so we allow defaults
-            # to false.
-            value = obj.default and ! value.nil?
-            if ! value.nil?
-                obj.value = value
-            else
-                @parameters.delete(obj.name)
-            end
-        }
+    def set_default(attr)
+        return unless klass = self.class.attrclass(attr)
+        return unless klass.method_defined?(:default)
+        return if @parameters.include?(klass.name)
+
+        return unless parameter = newattr(klass.name)
+
+        if value = parameter.default and ! value.nil?
+            parameter.value = value
+        else
+            @parameters.delete(parameter.name)
+        end
     end
 
     # Convert our object to a hash.  This just includes properties.
     def to_hash
         rethash = {}
-    
+
         @parameters.each do |name, obj|
             rethash[name] = obj.value
         end
@@ -681,6 +594,11 @@ class Type
         end
     end
 
+    def version
+        return 0 unless catalog
+        catalog.version
+    end
+
     # Meta-parameter methods:  These methods deal with the results
     # of specifying metaparameters
 
@@ -706,10 +624,6 @@ class Type
 
     public
 
-    ###############################
-    # Code related to the closure-like behaviour of the resource classes.
-    attr_writer :implicit
-
     # Is this type's name isomorphic with the object?  That is, if the
     # name conflicts, does it necessarily mean that the objects conflict?
     # Defaults to true.
@@ -721,14 +635,6 @@ class Type
         end
     end
 
-    def implicit?
-        if defined? @implicit and @implicit
-            return true
-        else
-            return false
-        end
-    end
-
     def isomorphic?
         self.class.isomorphic?
     end
@@ -758,6 +664,9 @@ class Type
 
     ###############################
     # Code related to the container behaviour.
+
+    # this is a retarded hack method to get around the difference between
+    # component children and file children
     def self.depthfirst?
         if defined? @depthfirst
             return @depthfirst
@@ -765,24 +674,11 @@ class Type
             return false
         end
     end
-    
+
     def depthfirst?
         self.class.depthfirst?
     end
 
-    # Add a hook for testing for recursion.
-    def parentof?(child)
-        if (self == child)
-            debug "parent is equal to child"
-            return true
-        elsif defined? @parent and @parent.parentof?(child)
-            debug "My parent is parent of child"
-            return true
-        else
-            return false
-        end
-    end
-
     # Remove an object.  The argument determines whether the object's
     # subscriptions get eliminated, too.
     def remove(rmdeps = true)
@@ -792,7 +688,6 @@ class Type
             obj.remove
         end
         @parameters.clear
-        self.class.delete(self)
 
         @parent = nil
 
@@ -816,13 +711,6 @@ class Type
                 raise Puppet::Error, "Provider %s is not functional on this platform" % provider.class.name
             end
         end
-        #Puppet.err "Evaluating %s" % self.path.join(":")
-        unless defined? @evalcount
-            self.err "No evalcount defined on '%s' of type '%s'" %
-                [self.title,self.class]
-            @evalcount = 0
-        end
-        @evalcount += 1
 
         # this only operates on properties, not properties + children
         # it's important that we call retrieve() on the type instance,
@@ -863,14 +751,14 @@ class Type
     # it's really only used for testing
     def insync?(is)
         insync = true
-        
+
         if property = @parameters[:ensure]
             unless is.include? property
                raise Puppet::DevError,
                         "The is value is not in the is array for '%s'" %
                         [property.name]
             end
-            ensureis = is[property]           
+            ensureis = is[property]
             if property.insync?(ensureis) and property.should == :absent
                 return true
             end
@@ -896,12 +784,12 @@ class Type
         #self.debug("%s sync status is %s" % [self,insync])
         return insync
     end
-        
+
     # retrieve the current value of all contained properties
     def retrieve
         return currentpropvalues
     end
-    
+
     # Get a hash of the current properties.  Returns a hash with
     # the actual property instance as the key and the current value
     # as the, um, value.
@@ -938,7 +826,7 @@ class Type
     def noop
         noop?
     end
-     
+
     # Retrieve the changes associated with all of the properties.
     def propertychanges(currentvalues)
         # If we are changing the existence of the object, then none of
@@ -979,18 +867,15 @@ class Type
     # Code related to managing resource instances.
     require 'puppet/transportable'
 
-    # Make 'new' private, so people have to use create instead.
-    class << self
-        private :new
-    end
-
     # retrieve a named instance of the current type
     def self.[](name)
+        raise "Global resource access is deprecated"
         @objects[name] || @aliases[name]
     end
 
     # add an instance by name to the class list of instances
     def self.[]=(name,object)
+        raise "Global resource storage is deprecated"
         newobj = nil
         if object.is_a?(Puppet::Type)
             newobj = object
@@ -1022,6 +907,7 @@ class Type
     # Create an alias.  We keep these in a separate hash so that we don't encounter
     # the objects multiple times when iterating over them.
     def self.alias(name, obj)
+        raise "Global resource aliasing is deprecated"
         if @objects.include?(name)
             unless @objects[name] == obj
                 raise Puppet::Error.new(
@@ -1045,6 +931,7 @@ class Type
 
     # remove all of the instances of a single type
     def self.clear
+        raise "Global resource removal is deprecated"
         if defined? @objects
             @objects.each do |name, obj|
                 obj.remove(true)
@@ -1059,96 +946,14 @@ class Type
     # Force users to call this, so that we can merge objects if
     # necessary.
     def self.create(args)
-        # Don't modify the original hash; instead, create a duplicate and modify it.
-        # We have to dup and use the ! so that it stays a TransObject if it is
-        # one.
-        hash = args.dup
-        symbolizehash!(hash)
-
-        # If we're the base class, then pass the info on appropriately
-        if self == Puppet::Type
-            type = nil
-            if hash.is_a? Puppet::TransObject
-                type = hash.type
-            else
-                # If we're using the type to determine object type, then delete it
-                if type = hash[:type]
-                    hash.delete(:type)
-                end
-            end
-
-            # If they've specified a type and called on the base, then
-            # delegate to the subclass.
-            if type
-                if typeklass = self.type(type)
-                    return typeklass.create(hash)
-                else
-                    raise Puppet::Error, "Unknown type %s" % type
-                end
-            else
-                raise Puppet::Error, "No type found for %s" % hash.inspect
-            end
-        end
-
-        # Handle this new object being implicit
-        implicit = hash[:implicit] || false
-        if hash.include?(:implicit)
-            hash.delete(:implicit)
-        end
-
-        name = nil
-        unless hash.is_a? Puppet::TransObject
-            hash = self.hash2trans(hash)
-        end
-
-        # XXX This will have to change when transobjects change to using titles
-        title = hash.name
-
-        # if the object already exists
-        if self.isomorphic? and retobj = self[title]
-            # if only one of our objects is implicit, then it's easy to see
-            # who wins -- the non-implicit one.
-            if retobj.implicit? and ! implicit
-                Puppet.notice "Removing implicit %s" % retobj.title
-                # Remove all of the objects, but do not remove their subscriptions.
-                retobj.remove(false)
-
-                # now pass through and create the new object
-            elsif implicit
-                Puppet.debug "Ignoring implicit %s[%s]" % [self.name, title]
-                return nil
-            else
-                raise Puppet::Error, "%s is already being managed" % retobj.ref
-            end
-        end
-
-        # create it anew
-        # if there's a failure, destroy the object if it got that far, but raise
-        # the error.
-        begin
-            obj = new(hash)
-        rescue => detail
-            Puppet.err "Could not create %s: %s" % [title, detail.to_s]
-            if obj
-                obj.remove(true)
-            elsif obj = self[title]
-                obj.remove(true)
-            end
-            raise
-        end
-
-        if implicit
-            obj.implicit = true
-        end
-
-        # Store the object by title
-        self[obj.title] = obj
-
-        return obj
+        # LAK:DEP Deprecation notice added 12/17/2008
+        Puppet.warning "Puppet::Type.create is deprecated; use Puppet::Type.new"
+        new(args)
     end
 
     # remove a specified object
     def self.delete(resource)
+        raise "Global resource removal is deprecated"
         return unless defined? @objects
         if @objects.include?(resource.title)
             @objects.delete(resource.title)
@@ -1169,6 +974,7 @@ class Type
 
     # iterate across each of the type's instances
     def self.each
+        raise "Global resource iteration is deprecated"
         return unless defined? @objects
         @objects.each { |name,instance|
             yield instance
@@ -1177,58 +983,13 @@ class Type
 
     # does the type have an object with the given name?
     def self.has_key?(name)
+        raise "Global resource access is deprecated"
         return @objects.has_key?(name)
     end
 
-    # Convert a hash to a TransObject.
-    def self.hash2trans(hash)
-        title = nil
-        if hash.include? :title
-            title = hash[:title]
-            hash.delete(:title)
-        elsif hash.include? self.namevar
-            title = hash[self.namevar]
-            hash.delete(self.namevar)
-
-            if hash.include? :name
-                raise ArgumentError, "Cannot provide both name and %s to %s" %
-                    [self.namevar, self.name]
-            end
-        elsif hash[:name]
-            title = hash[:name]
-            hash.delete :name
-        end
-
-        if catalog = hash[:catalog]
-            hash.delete(:catalog)
-        end
-
-        raise(Puppet::Error, "You must specify a title for objects of type %s" % self.to_s) unless title
-
-        if hash.include? :type
-            unless self.validattr? :type
-                hash.delete :type
-            end
-        end
-
-        # okay, now make a transobject out of hash
-        begin
-            trans = Puppet::TransObject.new(title, self.name.to_s)
-            trans.catalog = catalog if catalog
-            hash.each { |param, value|
-                trans[param] = value
-            }
-        rescue => detail
-            raise Puppet::Error, "Could not create %s: %s" %
-                [name, detail]
-        end
-
-        return trans
-    end
-
     # Retrieve all known instances.  Either requires providers or must be overridden.
     def self.instances
-        unless defined?(@providers) and ! @providers.empty?
+        if provider_hash.empty?
             raise Puppet::DevError, "%s has no providers and has not overridden 'instances'" % self.name
         end
 
@@ -1236,10 +997,6 @@ class Type
         provider_instances = {}
         providers_by_source.collect do |provider|
             provider.instances.collect do |instance|
-                # First try to get the resource if it already exists
-                # Skip instances that map to a managed resource with a different provider
-                next if resource = self[instance.name] and resource.provider.class != instance.class
-
                 # We always want to use the "first" provider instance we find, unless the resource
                 # is already managed and has a different provider set
                 if other = provider_instances[instance.name]
@@ -1249,12 +1006,7 @@ class Type
                 end
                 provider_instances[instance.name] = instance
 
-                if resource
-                    resource.provider = instance
-                    resource
-                else
-                    create(:name => instance.name, :provider => instance, :check => :all)
-                end
+                new(:name => instance.name, :provider => instance, :check => :all)
             end
         end.flatten.compact
     end
@@ -1271,6 +1023,47 @@ class Type
         end.compact
     end
 
+    # Convert a simple hash into a Resource instance.  This is a convenience method,
+    # so people can create RAL resources with a hash and get the same behaviour
+    # as we get internally when we use Resource instances.
+    #   This should only be used directly from Ruby -- it's not used when going through
+    # normal Puppet usage.
+    def self.hash2resource(hash)
+        hash = hash.inject({}) { |result, ary| result[ary[0].to_sym] = ary[1]; result }
+
+        if title = hash[:title]
+            hash.delete(:title)
+        else
+            if self.namevar != :name
+                if hash.include?(:name) and hash.include?(self.namevar)
+                    raise Puppet::Error, "Cannot provide both name and %s to resources of type %s" % [self.namevar, self.name]
+                end
+                if title = hash[self.namevar]
+                    hash.delete(self.namevar)
+                end
+            end
+
+            unless title ||= hash[:name]
+                raise Puppet::Error, "You must specify a name or title for resources"
+            end
+        end
+
+
+        # Now create our resource.
+        resource = Puppet::Resource.new(self.name, title)
+        [:catalog].each do |attribute|
+            if value = hash[attribute]
+                hash.delete(attribute)
+                resource.send(attribute.to_s + "=", value)
+            end
+        end
+
+        hash.each do |param, value|
+            resource[param] = value
+        end
+        return resource
+    end
+
     # Create the path for logging and such.
     def pathbuilder
         if p = parent
@@ -1285,12 +1078,12 @@ class Type
     newmetaparam(:noop) do
         desc "Boolean flag indicating whether work should actually
             be done."
-            
+
         newvalues(:true, :false)
         munge do |value|
             case value
-            when true, :true, "true": @resource.noop = true
-            when false, :false, "false": @resource.noop = false
+            when true, :true, "true"; @resource.noop = true
+            when false, :false, "false"; @resource.noop = false
             end
         end
     end
@@ -1364,47 +1157,6 @@ class Type
             }
         end
     end
-    
-    # We've got four relationship metaparameters, so this method is used
-    # to reduce code duplication between them.
-    def munge_relationship(param, values)
-        # We need to support values passed in as an array or as a
-        # resource reference.
-        result = []
-        
-        # 'values' could be an array or a reference.  If it's an array,
-        # it could be an array of references or an array of arrays.
-        if values.is_a?(Puppet::Type)
-            result << [values.class.name, values.title]
-        else
-            unless values.is_a?(Array)
-                devfail "Relationships must be resource references"
-            end
-            if values[0].is_a?(String) or values[0].is_a?(Symbol)
-                # we're a type/title array reference
-                values[0] = symbolize(values[0])
-                result << values
-            else
-                # we're an array of stuff
-                values.each do |value|
-                    if value.is_a?(Puppet::Type)
-                        result << [value.class.name, value.title]
-                    elsif value.is_a?(Array)
-                        value[0] = symbolize(value[0])
-                        result << value
-                    else
-                        devfail "Invalid relationship %s" % value.inspect
-                    end
-                end
-            end
-        end
-        
-        if existing = self[param]
-            result = existing + result
-        end
-        
-        result
-    end
 
     newmetaparam(:loglevel) do
         desc "Sets the level that information will be logged.
@@ -1418,8 +1170,8 @@ class Type
         munge do |loglevel|
             val = super(loglevel)
             if val == :verbose
-                val = :info 
-            end        
+                val = :info
+            end
             val
         end
     end
@@ -1427,7 +1179,7 @@ class Type
     newmetaparam(:alias) do
         desc "Creates an alias for the object.  Puppet uses this internally when you
             provide a symbolic name::
-            
+
                 file { sshdconfig:
                     path => $operatingsystem ? {
                         solaris => \"/usr/local/etc/ssh/sshd_config\",
@@ -1460,7 +1212,7 @@ class Type
             should be affecting the same file.
 
             See the `LanguageTutorial language tutorial`:trac: for more information.
-            
+
             "
 
         munge do |aliases|
@@ -1478,9 +1230,6 @@ class Type
                     next
                 end
 
-                # LAK:FIXME Old-school, add the alias to the class.
-                @resource.class.alias(other, @resource)
-
                 # Newschool, add it to the catalog.
                 @resource.catalog.alias(@resource, other)
             end
@@ -1495,7 +1244,7 @@ class Type
 
             Tags are currently useful for things like applying a subset of a
             host's configuration::
-                
+
                 puppetd --test --tags mytag
 
             This way, when you're testing a configuration you can run just the
@@ -1509,32 +1258,38 @@ class Type
             end
         end
     end
-    
+
     class RelationshipMetaparam < Puppet::Parameter
         class << self
             attr_accessor :direction, :events, :callback, :subclasses
         end
-        
+
         @subclasses = []
-        
+
         def self.inherited(sub)
             @subclasses << sub
         end
-        
-        def munge(rels)
-            @resource.munge_relationship(self.class.name, rels)
+
+        def munge(references)
+            references = [references] unless references.is_a?(Array)
+            references.collect do |ref|
+                if ref.is_a?(Puppet::Resource::Reference)
+                    ref
+                else
+                    Puppet::Resource::Reference.new(ref)
+                end
+            end
         end
 
         def validate_relationship
-            @value.each do |value|
-                unless @resource.catalog.resource(*value)
+            @value.each do |ref|
+                unless @resource.catalog.resource(ref.to_s)
                     description = self.class.direction == :in ? "dependency" : "dependent"
-                    fail Puppet::Error, "Could not find %s %s[%s] for %s" % 
-                        [description, value[0].to_s.capitalize, value[1], resource.ref]
+                    fail "Could not find %s %s for %s" % [description, ref.to_s, resource.ref]
                 end
             end
         end
-        
+
         # Create edges from each of our relationships.    :in
         # relationships are specified by the event-receivers, and :out
         # relationships are specified by the event generator.  This
@@ -1544,26 +1299,23 @@ class Type
         # which resource is applied first and which resource is considered
         # to be the event generator.
         def to_edges
-            @value.collect do |value|
-                # we just have a name and a type, and we need to convert it
-                # to an object...
-                tname, name = value
-                reference = Puppet::ResourceReference.new(tname, name)
-                
+            @value.collect do |reference|
+                reference.catalog = resource.catalog
+
                 # Either of the two retrieval attempts could have returned
                 # nil.
-                unless object = reference.resolve
+                unless related_resource = reference.resolve
                     self.fail "Could not retrieve dependency '%s' of %s" % [reference, @resource.ref]
                 end
 
                 # Are we requiring them, or vice versa?  See the method docs
                 # for futher info on this.
                 if self.class.direction == :in
-                    source = object
+                    source = related_resource
                     target = @resource
                 else
                     source = @resource
-                    target = object
+                    target = related_resource
                 end
 
                 if method = self.class.callback
@@ -1571,19 +1323,19 @@ class Type
                         :event => self.class.events,
                         :callback => method
                     }
-                    self.debug("subscribes to %s" % [object.ref])
+                    self.debug("subscribes to %s" % [related_resource.ref])
                 else
                     # If there's no callback, there's no point in even adding
                     # a label.
                     subargs = nil
-                    self.debug("requires %s" % [object.ref])
+                    self.debug("requires %s" % [related_resource.ref])
                 end
-                
+
                 rel = Puppet::Relationship.new(source, target, subargs)
             end
         end
     end
-    
+
     def self.relationship_params
         RelationshipMetaparam.subclasses
     end
@@ -1598,7 +1350,7 @@ class Type
         desc "One or more objects that this object depends on.
             This is used purely for guaranteeing that changes to required objects
             happen before the dependent object.  For instance::
-            
+
                 # Create the destination directory before you copy things down
                 file { \"/usr/local/scripts\":
                     ensure => directory
@@ -1624,7 +1376,7 @@ class Type
             any parent directories that are being managed; it will
             automatically realize that the parent directory should be created
             before the script is pulled down.
-            
+
             Currently, exec resources will autorequire their CWD (if it is
             specified) plus any fully qualified paths that appear in the
             command.   For instance, if you had an ``exec`` command that ran
@@ -1639,7 +1391,7 @@ class Type
         desc "One or more objects that this object depends on.  Changes in the
             subscribed to objects result in the dependent objects being
             refreshed (e.g., a service will get restarted).  For instance::
-            
+
                 class nagios {
                     file { \"/etc/nagios/nagios.conf\":
                         source => \"puppet://server/module/nagios.conf\",
@@ -1650,7 +1402,7 @@ class Type
                         subscribe => File[nagconf]
                     }
                 }
-	 		
+
             Currently the ``exec``, ``mount`` and ``service`` type support
             refreshing.
             "
@@ -1671,11 +1423,11 @@ class Type
                     command => "/usr/bin/make",
                     cwd => "/var/nagios/configuration"
                 }
-            
+
             This will make sure all of the files are up to date before the
             make command is run.}
     end
-    
+
     newmetaparam(:notify, :parent => RelationshipMetaparam, :attributes => {:direction => :out, :events => :ALL_EVENTS, :callback => :refresh}) do
         desc %{This parameter is the opposite of **subscribe** -- it sends events
             to the specified object::
@@ -1688,7 +1440,7 @@ class Type
                 service { sshd:
                     ensure => running
                 }
-            
+
             This will restart the sshd service if the sshd config file changes.}
     end
 
@@ -1718,8 +1470,8 @@ class Type
 
             # If we don't have any default we use suitable providers
             defaults = suitable if defaults.empty?
-            max = defaults.collect { |provider| provider.defaultnum }.max
-            defaults = defaults.find_all { |provider| provider.defaultnum == max }
+            max = defaults.collect { |provider| provider.specificity }.max
+            defaults = defaults.find_all { |provider| provider.specificity == max }
 
             retval = nil
             if defaults.length > 1
@@ -1742,45 +1494,13 @@ class Type
         return @defaultprovider
     end
 
-    # Convert a hash, as provided by, um, a provider, into an instance of self.
-    def self.hash2obj(hash)
-        obj = nil
-        
-        namevar = self.namevar
-        unless hash.include?(namevar) and hash[namevar]
-            raise Puppet::DevError, "Hash was not passed with namevar"
-        end
-
-        # if the obj already exists with that name...
-        if obj = self[hash[namevar]]
-            # We're assuming here that objects with the same name
-            # are the same object, which *should* be the case, assuming
-            # we've set up our naming stuff correctly everywhere.
-
-            # Mark found objects as present
-            hash.each { |param, value|
-                if property = obj.property(param)
-                elsif val = obj[param]
-                    obj[param] = val
-                else
-                    # There is a value on disk, but it should go away
-                    obj[param] = :absent
-                end
-            }
-        else
-            # create a new obj, since no existing one seems to
-            # match
-            obj = self.create(namevar => hash[namevar])
-
-            # We can't just pass the hash in at object creation time,
-            # because it sets the should value, not the is value.
-            hash.delete(namevar)
-            hash.each { |param, value|
-                obj[param] = value unless obj.add_property_parameter(param)
-            }
-        end
+    def self.provider_hash_by_type(type)
+        @provider_hashes ||= {}
+        @provider_hashes[type] ||= {}
+    end
 
-        return obj
+    def self.provider_hash
+        Puppet::Type.provider_hash_by_type(self.name)
     end
 
     # Retrieve a provider by name.
@@ -1788,21 +1508,21 @@ class Type
         name = Puppet::Util.symbolize(name)
 
         # If we don't have it yet, try loading it.
-        unless @providers.has_key?(name)
+        unless provider_hash.has_key?(name)
             @providerloader.load(name)
         end
-        return @providers[name]
+        return provider_hash[name]
     end
 
     # Just list all of the providers.
     def self.providers
-        @providers.keys
+        provider_hash.keys
     end
 
     def self.validprovider?(name)
         name = Puppet::Util.symbolize(name)
 
-        return (@providers.has_key?(name) && @providers[name].suitable?)
+        return (provider_hash.has_key?(name) && provider_hash[name].suitable?)
     end
 
     # Create a new provider of a type.  This method must be called
@@ -1810,7 +1530,7 @@ class Type
     def self.provide(name, options = {}, &block)
         name = Puppet::Util.symbolize(name)
 
-        if obj = @providers[name]
+        if obj = provider_hash[name]
             Puppet.debug "Reloading %s %s provider" % [name, self.name]
             unprovide(name)
         end
@@ -1838,7 +1558,7 @@ class Type
 
         provider = genclass(name,
             :parent => parent,
-            :hash => @providers,
+            :hash => provider_hash,
             :prefix => "Provider",
             :block => block,
             :include => feature_module,
@@ -1906,9 +1626,9 @@ class Type
     end
 
     def self.unprovide(name)
-        if @providers.has_key? name
+        if provider_hash.has_key? name
             rmclass(name,
-                :hash => @providers,
+                :hash => provider_hash,
                 :prefix => "Provider"
             )
             if @defaultprovider and @defaultprovider.name == name
@@ -1919,10 +1639,10 @@ class Type
 
     # Return an array of all of the suitable providers.
     def self.suitableprovider
-        if @providers.empty?
+        if provider_hash.empty?
             providerloader.loadall
         end
-        @providers.find_all { |name, provider|
+        provider_hash.find_all { |name, provider|
             provider.suitable?
         }.collect { |name, provider|
             provider
@@ -1962,11 +1682,14 @@ class Type
 
     # Figure out of there are any objects we can automatically add as
     # dependencies.
-    def autorequire
+    def autorequire(rel_catalog = nil)
+        rel_catalog ||= catalog
+        raise(Puppet::DevError, "You cannot add relationships without a catalog") unless rel_catalog
+
         reqs = []
         self.class.eachautorequire { |type, block|
             # Ignore any types we can't find, although that would be a bit odd.
-            next unless typeobj = Puppet.type(type)
+            next unless typeobj = Puppet::Type.type(type)
 
             # Retrieve the list of names from the block.
             next unless list = self.instance_eval(&block)
@@ -1980,15 +1703,15 @@ class Type
                 # Support them passing objects directly, to save some effort.
                 unless dep.is_a? Puppet::Type
                     # Skip autorequires that we aren't managing
-                    unless dep = typeobj[dep]
+                    unless dep = rel_catalog.resource(type, dep)
                         next
                     end
                 end
-                
+
                 reqs << Puppet::Relationship.new(dep, self)
             }
         }
-        
+
         return reqs
     end
 
@@ -2001,61 +1724,6 @@ class Type
             end
         end.flatten.reject { |r| r.nil? }
     end
-    
-    # Does this resource have a relationship with the other?  We have to
-    # check each object for both directions of relationship.
-    def requires?(other)
-        them = [other.class.name, other.title]
-        me = [self.class.name, self.title]
-        self.class.relationship_params.each do |param|
-            case param.direction
-            when :in: return true if v = self[param.name] and v.include?(them)
-            when :out: return true if v = other[param.name] and v.include?(me)
-            end
-        end
-        return false
-    end
-
-    # we've received an event
-    # we only support local events right now, so we can pass actual
-    # objects around, including the transaction object
-    # the assumption here is that container objects will pass received
-    # methods on to contained objects
-    # i.e., we don't trigger our children, our refresh() method calls
-    # refresh() on our children
-    def trigger(event, source)
-        trans = event.transaction
-        if @callbacks.include?(source)
-            [:ALL_EVENTS, event.event].each { |eventname|
-                if method = @callbacks[source][eventname]
-                    if trans.triggered?(self, method) > 0
-                        next
-                    end
-                    if self.respond_to?(method)
-                        self.send(method)
-                    end
-
-                    trans.triggered(self, method)
-                end
-            }
-        end
-    end
-    
-    # Unsubscribe from a given object, possibly with a specific event.
-    def unsubscribe(object, event = nil)
-        # First look through our own relationship params
-        [:require, :subscribe].each do |param|
-            if values = self[param]
-                newvals = values.reject { |d|
-                    d == [object.class.name, object.title]
-                }
-                if newvals.length != values.length
-                    self.delete(param)
-                    self[param] = newvals
-                end
-            end
-        end
-    end
 
     ###############################
     # All of the scheduling code.
@@ -2064,9 +1732,14 @@ class Type
     # the instantiation phase, so that the schedule can be anywhere in the
     # file.
     def schedule
+         unless catalog
+             warning "Cannot schedule without a schedule-containing catalog"
+             return nil
+         end
+
         unless defined? @schedule
             if name = self[:schedule]
-                if sched = Puppet.type(:schedule)[name]
+                if sched = catalog.resource(:schedule, name)
                     @schedule = sched
                 else
                     self.fail "Could not find schedule %s" % name
@@ -2091,42 +1764,10 @@ class Type
         return schedule.match?(self.cached(:checked).to_i)
     end
 
-    ###############################
-    # All of the tagging code.
-    attr_reader :tags
-
-    # Add a new tag.
-    def tag(tag)
-        tag = tag.intern if tag.is_a? String
-        unless @tags.include? tag
-            @tags << tag
-        end
-    end
-
     # Define the initial list of tags.
     def tags=(list)
-        list = [list] unless list.is_a? Array
-
-        @tags = list.collect do |t|
-            case t
-            when String: t.intern
-            when Symbol: t
-            else
-                self.warning "Ignoring tag %s of type %s" % [tag.inspect, tag.class]
-            end
-        end
-
-        @tags << self.class.name unless @tags.include?(self.class.name)
-    end
-
-    # Figure out of any of the specified tags apply to this object.  This is an
-    # OR operation.
-    def tagged?(tags)
-        tags = [tags] unless tags.is_a? Array
-
-        tags = tags.collect { |t| t.intern }
-
-        return tags.find { |tag| @tags.include? tag }
+        tag(self.class.name)
+        tag(*list)
     end
 
     # Types (which map to resources in the languages) are entirely composed of
@@ -2141,7 +1782,7 @@ class Type
     attr_writer :noop
 
     include Enumerable
-    
+
     # class methods dealing with Type management
 
     public
@@ -2163,7 +1804,6 @@ class Type
         @objects = Hash.new
         @aliases = Hash.new
 
-        @providers = Hash.new
         @defaults = {}
 
         unless defined? @parameters
@@ -2211,7 +1851,13 @@ class Type
 
     # The catalog that this resource is stored in.
     attr_accessor :catalog
-    
+
+    # is the resource exported
+    attr_accessor :exported
+
+    # is the resource virtual (it should not :-))
+    attr_accessor :virtual
+
     # create a log at specified level
     def log(msg)
         Puppet::Util::Log.create(
@@ -2227,147 +1873,84 @@ class Type
 
     public
 
-    def initvars
-        @evalcount = 0
-        @tags = []
-
-        # callbacks are per object and event
-        @callbacks = Hash.new { |chash, key|
-            chash[key] = {}
-        }
-
-        # properties and parameters are treated equivalently from the outside:
-        # as name-value pairs (using [] and []=)
-        # internally, however, parameters are merely a hash, while properties
-        # point to Property objects
-        # further, the lists of valid properties and parameters are defined
-        # at the class level
-        unless defined? @parameters
-            @parameters = {}
-        end
-
-        # keeping stats for the total number of changes, and how many were
-        # completely sync'ed
-        # this isn't really sufficient either, because it adds lots of special
-        # cases such as failed changes
-        # it also doesn't distinguish between changes from the current transaction
-        # vs. changes over the process lifetime
-        @totalchanges = 0
-        @syncedchanges = 0
-        @failedchanges = 0
-
-        @inited = true
-    end
+    attr_reader :original_parameters
 
     # initialize the type instance
-    def initialize(hash)
-        unless defined? @inited
-            self.initvars
-        end
-        namevar = self.class.namevar
-
-        orighash = hash
-
-        # If we got passed a transportable object, we just pull a bunch of info
-        # directly from it.  This is the main object instantiation mechanism.
-        if hash.is_a?(Puppet::TransObject)
-            # XXX This will need to change when transobjects change to titles.
-            self.title = hash.name
-
-            #self[:name] = hash[:name]
-            [:file, :line, :tags, :catalog].each { |getter|
-                if hash.respond_to?(getter)
-                    setter = getter.to_s + "="
-                    if val = hash.send(getter)
-                        self.send(setter, val)
-                    end
-                end
-            }
+    def initialize(resource)
+        raise Puppet::DevError, "Got TransObject instead of Resource or hash" if resource.is_a?(Puppet::TransObject)
+        resource = self.class.hash2resource(resource) unless resource.is_a?(Puppet::Resource)
+
+        # The list of parameter/property instances.
+        @parameters = {}
 
-            hash = hash.to_hash
+        # Set the title first, so any failures print correctly.
+        if resource.type.to_s.downcase.to_sym == self.class.name
+            self.title = resource.title
         else
-            if hash[:title]
-                @title = hash[:title]
-                hash.delete(:title)
-            end
+            # This should only ever happen for components
+            self.title = resource.ref
         end
 
-        # Before anything else, set our parent if it was included
-        if hash.include?(:parent)
-            @parent = hash[:parent]
-            hash.delete(:parent)
+        [:file, :line, :catalog, :exported, :virtual].each do |getter|
+            setter = getter.to_s + "="
+            if val = resource.send(getter)
+                self.send(setter, val)
+            end
         end
 
-        # Munge up the namevar stuff so we only have one value.
-        hash = self.argclean(hash)
+        @tags = resource.tags
 
-        # Let's do the name first, because some things need to happen once
-        # we have the name but before anything else
+        @original_parameters = resource.to_hash
 
-        attrs = self.class.allattrs
+        set_name(@original_parameters)
 
-        if hash.include?(namevar)
-            #self.send(namevar.to_s + "=", hash[namevar])
-            self[namevar] = hash[namevar]
-            hash.delete(namevar)
-            if attrs.include?(namevar)
-                attrs.delete(namevar)
-            else
-                self.devfail "My namevar isn't a valid attribute...?"
-            end
-        else
-            self.devfail "I was not passed a namevar"
-        end
+        set_default(:provider)
 
-        # If the name and title differ, set up an alias
-        if self.name != self.title
-            if obj = self.class[self.name] 
-                if self.class.isomorphic?
-                    raise Puppet::Error, "%s already exists with name %s" %
-                        [obj.title, self.name]
-                end
-            else
-                self.class.alias(self.name, self)
-            end
-        end
+        set_parameters(@original_parameters)
 
-        if hash.include?(:provider)
-            self[:provider] = hash[:provider]
-            hash.delete(:provider)
-        else
-            setdefaults(:provider)
-        end
+        self.validate if self.respond_to?(:validate)
+    end
+
+    private
 
-        # This is all of our attributes except the namevar.
-        attrs.each { |attr|
-            if hash.include?(attr)
-                begin
+    # Set our resource's name.
+    def set_name(hash)
+        n = self.class.namevar
+        self[n] = hash[n]
+        hash.delete(n)
+    end
+
+    # Set all of the parameters from a hash, in the appropriate order.
+    def set_parameters(hash)
+        # Use the order provided by allattrs, but add in any
+        # extra attributes from the resource so we get failures
+        # on invalid attributes.
+        no_values = []
+        (self.class.allattrs + hash.keys).uniq.each do |attr|
+            begin
+                # Set any defaults immediately.  This is mostly done so
+                # that the default provider is available for any other
+                # property validation.
+                if hash.has_key?(attr)
                     self[attr] = hash[attr]
-                rescue ArgumentError, Puppet::Error, TypeError
-                    raise
-                rescue => detail
-                    error = Puppet::DevError.new( "Could not set %s on %s: %s" % [attr, self.class.name, detail])
-                    error.set_backtrace(detail.backtrace)
-                    raise error
+                else
+                    no_values << attr
                 end
-                hash.delete attr
+            rescue ArgumentError, Puppet::Error, TypeError
+                raise
+            rescue => detail
+                error = Puppet::DevError.new( "Could not set %s on %s: %s" % [attr, self.class.name, detail])
+                error.set_backtrace(detail.backtrace)
+                raise error
             end
-        }
-        
-        # Set all default values.
-        self.setdefaults
-
-        if hash.length > 0
-            self.debug hash.inspect
-            self.fail("Class %s does not accept argument(s) %s" %
-                [self.class.name, hash.keys.join(" ")])
         end
-
-        if self.respond_to?(:validate)
-            self.validate
+        no_values.each do |attr|
+            set_default(attr)
         end
     end
 
+    public
+
     # Set up all of our autorequires.
     def finish
         # Scheduling has to be done when the whole config is instantiated, so
@@ -2395,14 +1978,6 @@ class Type
         #@cache[name] = value
     end
 
-#    def set(name, value)
-#        send(name.to_s + "=", value)
-#    end
-#
-#    def get(name)
-#        send(name)
-#    end
-
     # For now, leave the 'name' method functioning like it used to.  Once 'title'
     # works everywhere, I'll switch it.
     def name
@@ -2414,13 +1989,7 @@ class Type
         return nil unless catalog
 
         unless defined?(@parent)
-            # This is kinda weird.
-            if implicit?
-                parents = catalog.relationship_graph.adjacent(self, :direction => :in)
-            else
-                parents = catalog.adjacent(self, :direction => :in)
-            end
-            if parents
+            if parents = catalog.adjacent(self, :direction => :in)
                 # We should never have more than one parent, so let's just ignore
                 # it if we happen to.
                 @parent = parents.shift
@@ -2435,7 +2004,7 @@ class Type
     def ref
         "%s[%s]" % [self.class.name.to_s.capitalize, self.title]
     end
-    
+
     def self_refresh?
         self.class.self_refresh
     end
@@ -2503,6 +2072,12 @@ class Type
         return trans
     end
 
+    %w{exported virtual}.each do |m|
+        define_method(m+"?") do
+            self.send(m)
+        end
+    end
+
 end # Puppet::Type
 end