=== modified file 'modules/comment/comment.module'
--- modules/comment/comment.module	2009-10-17 05:50:27 +0000
+++ modules/comment/comment.module	2009-10-17 19:42:40 +0000
@@ -2494,3 +2494,32 @@ function comment_filter_format_delete($f
     ->condition('format', $format->format)
     ->execute();
 }
+
+function comment_rdf_mapping() {
+  return array(
+    array(
+      'type' => 'comment',
+      'bundle' => RDF_DEFAULT_BUNDLE,
+      'mapping' => array(
+        'rdftype' => array('sioct:Post'),
+        'title'   => array(
+          'property' => array('dc:title'),
+        ),
+        'created' => array(
+          'property' => array('dc:date', 'dc:created'),
+          'datatype' => 'xsd:dateTime',
+          'callback' => 'date_iso8601',
+        ),
+        'body'    => array(
+          'property' => array('content:encoded'),
+        ),
+        'uid'     => array(
+          'property' => array('sioc:has_creator'),
+        ),
+        'name'    => array(
+          'property' => array('foaf:name'),
+        ),
+      ),
+    ),
+  );
+}

=== modified file 'modules/node/node.module'
--- modules/node/node.module	2009-10-17 05:50:27 +0000
+++ modules/node/node.module	2009-10-17 19:42:40 +0000
@@ -754,6 +754,47 @@ function node_type_set_defaults($info = 
 }
 
 /**
+ * Define the default RDF mapping for the node entity type.
+ *
+ * These default mapping properties are used by rdf_save_mapping() to populate
+ * non-existing properties before they are saved to the database.
+ *
+ * @return
+ *   A list of default mapping properties for the node entity type.
+ */
+function node_rdf_mapping() {
+  return array(
+    array(
+      'type' => 'node',
+      'bundle' => RDF_DEFAULT_BUNDLE,
+      'mapping' => array(
+        'rdftype' => array('sioc:Item', 'foaf:Document'),
+        'title'   => array(
+          'property' => array('dc:title'),
+        ),
+        'created' => array(
+          'property' => array('dc:date', 'dc:created'),
+          'datatype' => 'xsd:dateTime',
+          'callback' => 'date_iso8601',
+        ),
+        'changed' => array(
+          'property' => array('dc:modified'),
+        ),
+        'body'    => array(
+          'property' => array('content:encoded'),
+        ),
+        'uid'     => array(
+          'property' => array('sioc:has_creator'),
+        ),
+        'name'    => array(
+          'property' => array('foaf:name'),
+        ),
+      ),
+    ),
+  );
+}
+
+/**
  * Determine whether a node hook exists.
  *
  * @param $node

=== added directory 'modules/rdf'
=== added file 'modules/rdf/rdf.api.php'
--- modules/rdf/rdf.api.php	1970-01-01 00:00:00 +0000
+++ modules/rdf/rdf.api.php	2009-10-17 19:42:40 +0000
@@ -0,0 +1,44 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Hooks provided by the RDF module.
+ */
+
+/**
+ * @addtogroup hooks
+ * @{
+ */
+
+/**
+ * Allow modules to define RDF mappings for bundles.
+ *
+ * Modules defining their own bundles can specify which RDF semantics should be
+ * used to annotate these bundles. These mappings are then used for automatic
+ * RDFa output in the HTML code.
+ *
+ * @return
+ *   An array of mappings. Each mapping has three mandatory keys:
+ *   -type: The name of an entity type
+ *   -bundle: The name of a bundle
+ *   -mapping: A mapping is an array whose keys must correspond to existing
+ *   field instances in the bundle with an array of RDF properties as value.
+ *   The 'rdftype' key is a special case which is used to define the type of
+ *   the instance, its value shoud be an array of RDF classes.
+ */
+function hook_rdf_mapping() {
+  return array(
+    array(
+      'type' => 'node',
+      'bundle' => 'blog',
+      'mapping' => array(
+        'rdftype' => array('sioct:Weblog'),
+      )
+    ),
+  );
+}
+
+/**
+ * @} End of "addtogroup hooks".
+ */

=== added file 'modules/rdf/rdf.info'
--- modules/rdf/rdf.info	1970-01-01 00:00:00 +0000
+++ modules/rdf/rdf.info	2009-10-17 19:42:40 +0000
@@ -0,0 +1,10 @@
+; $Id$
+name = RDF
+description = Allows to map the site data structure to RDF and export it in RDFa.
+package = Core
+version = VERSION
+core = 7.x
+files[] = rdf.install
+files[] = rdf.module
+files[] = rdf.crud.inc
+files[] = rdf.test

=== added file 'modules/rdf/rdf.install'
--- modules/rdf/rdf.install	1970-01-01 00:00:00 +0000
+++ modules/rdf/rdf.install	2009-10-17 19:42:39 +0000
@@ -0,0 +1,50 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Install, update and uninstall functions for the rdf module.
+ */
+
+/**
+ * Implements hook_schema().
+ */
+function rdf_schema() {
+  $schema['rdf_mapping'] = array(
+    'description' => 'Stores custom RDF mappings for user defined content types or overriden module-defined mappings',
+    'fields' => array(
+      'type' => array(
+        'type' => 'varchar',
+        'length' => 128,
+        'not null' => TRUE,
+        'description' => 'The name of the entity type a mapping applies to (node, user, comment, etc.).',
+      ),
+      'bundle' => array(
+        'type' => 'varchar',
+        'length' => 128,
+        'not null' => TRUE,
+        'description' => 'The name of the bundle a mapping applies to.',
+      ),
+      'mapping' => array(
+        'description' => 'The serialized mapping of the bundle type and fields to RDF terms.',
+        'type' => 'text',
+        'not null' => FALSE,
+        'size' => 'big',
+        'serialize' => TRUE,
+      ),
+    ),
+    'primary key' => array('type', 'bundle'),
+  );
+
+  return $schema;
+}
+
+/**
+ * Implements hook_install().
+ */
+function rdf_install() {
+  // The installer does not trigger hook_modules_installed() so it needs to
+  // triggered programmatically on the modules which defined RDF mappings.
+  $modules = module_implements('rdf_mapping');
+  rdf_modules_installed($modules);
+}

=== added file 'modules/rdf/rdf.module'
--- modules/rdf/rdf.module	1970-01-01 00:00:00 +0000
+++ modules/rdf/rdf.module	2009-10-17 20:19:24 +0000
@@ -0,0 +1,466 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Enables semantically enriched output for Drupal sites.
+ *
+ * @todo RDFa primer...
+ *
+ * Modules can provide mappings of their bundles' data and metadata to RDFa
+ * properties using the appropriate vocabularies. This module takes care of
+ * injecting that data into variables available to themers in the .tpl files.
+ * Drupal core themes ship with RDFa output enabled.
+ *
+ * Example mapping from comment.module:
+ * array(
+ *   'comment' => array(
+ *     'rdftype' => array('sioct:Post'),
+ *     'title'   => array(
+ *       'property' => array('dc:title'),
+ *     ),
+ *     'created' => array(
+ *       'property' => array('dc:date', 'dc:created'),
+ *       'datatype' => 'xsd:dateTime',
+ *       'callback' => 'date_iso8601',
+ *     ),
+ *     'replyof' => array(
+ *       'property' => array('sioc:reply_of'),
+ *     ),
+ *     'name' => array(
+ *       'property' => array('dc:creator'),
+ *     ),
+ *   )
+ * );
+ */
+
+define('RDF_DEFAULT_BUNDLE', '');
+
+/**
+ * Returns the mapping for the attributes of the given bundle.
+ *
+ * @param $type
+ *   An entity type.
+ * @param $bundle
+ *   A bundle name.
+ * @return array
+ *   The mapping corresponding to the requested type, bundle combo.
+ */
+function rdf_get_mapping($type, $bundle = RDF_DEFAULT_BUNDLE) {
+  // Retrieve the mapping from the entity info.
+  $entity_info = entity_get_info($type);
+  return !empty($entity_info['bundles'][$bundle]['rdf_mapping']) ? $entity_info['bundles'][$bundle]['rdf_mapping'] : NULL;
+}
+
+/**
+ * Saves an RDF mapping to the database.
+ *
+ * Takes a mapping structure returned by hook_rdf_mapping() implementations
+ * and creates or updates a record mapping for each encountered
+ * type, bundle pair. If available, adds default values for non-existent
+ * mapping keys.
+ *
+ * @param $mapping
+ *   The RDF mapping to save, as an array.
+ * @return
+ *   Status flag indicating the outcome of the operation.
+ */
+function rdf_save_mapping($mapping) {
+  // Adds default values for non-existent keys.
+  $new_mapping = $mapping['mapping'] + _rdf_get_default_mapping($mapping['type']);
+  $exists = (bool)rdf_read_mapping($mapping['type'], $mapping['bundle']);
+
+  if ($exists) {
+    rdf_update_mapping($mapping['type'], $mapping['bundle'], $new_mapping);
+    return SAVED_UPDATED;
+  }
+  else {
+    rdf_create_mapping($mapping['type'], $mapping['bundle'], $new_mapping);
+    return SAVED_NEW;
+  }
+
+  cache_clear_all('entity_info', 'cache');
+  drupal_static_reset('entity_get_info');
+}
+
+/**
+ * Implements hook_modules_installed().
+ *
+ * Checks if the installed modules have any RDF mapping definitions to declare
+ * and stores them in the rdf_mapping table.
+ *
+ * While both default entity mappings and specific bundle mappings can be
+ * defined in hook_rdf_mapping(), we do not want to save the default entity
+ * mappings in the database because users are not expected to alter these.
+ * Instead they should alter specific bundle mappings which are stored in the
+ * database so that they can be altered via the RDF CRUD mapping API.
+ */
+function rdf_modules_installed($modules) {
+  // We need to clear the caches of entity_info as this is not done right
+  // during the tests. see http://drupal.org/node/594234
+  cache_clear_all('entity_info', 'cache');
+  drupal_static_reset('entity_get_info');
+
+  foreach ($modules as $module) {
+    if (function_exists($module . '_rdf_mapping')) {
+      $mapping_array = call_user_func($module . '_rdf_mapping');
+      foreach ($mapping_array as $mapping) {
+        // Only the bundle mappings are saved in the database.
+        if ($mapping['bundle'] != RDF_DEFAULT_BUNDLE) {
+          rdf_save_mapping($mapping);
+        }
+      }
+    }
+  }
+}
+
+/**
+ * Implements hook_modules_uninstalled().
+ */
+function rdf_modules_uninstalled($modules) {
+// @todo remove the RDF mappings.
+}
+
+/**
+ * Implements hook_entity_info_alter().
+ *
+ * Adds the proper RDF mapping to each entity type, bundle pair.
+ */
+function rdf_entity_info_alter(&$entity_info) {
+  // Loop through each entity type and its bundles.
+  foreach ($entity_info as $entity_type => $entity_type_info) {
+    if (isset($entity_type_info['bundles'])) {
+      foreach ($entity_type_info['bundles'] as $bundle => $bundle_info) {
+        if ($mapping = rdf_read_mapping($entity_type, $bundle)) {
+          $entity_info[$entity_type]['bundles'][$bundle]['rdf_mapping'] = $mapping;
+        }
+        else {
+          // If no mapping was found in the database, assign the default RDF
+          // mapping for this entity type.
+          $entity_info[$entity_type]['bundles'][$bundle]['rdf_mapping'] = _rdf_get_default_mapping($entity_type);
+        }
+      }
+    }
+  }
+}
+
+/**
+ * Returns ready to render RDFa attributes for the given mapping.
+ *
+ * @param $mapping
+ *   An array containing a mandatory property key and optional datatype and
+ *   callback keys.
+ *   Example:
+ *   array(
+ *     'property' => array('dc:created'),
+ *     'datatype' => 'xsd:dateTime',
+ *     'callback' => 'date_iso8601',
+ *   )
+ * @param $data
+ *   A value that needs to be converted by the provided callback function.
+ * @return array
+ *   An array containing RDFa attributes ready for rendering.
+ */
+function drupal_rdfa_attributes($mapping, $data = NULL) {
+  $attributes['property'] = $mapping['property'];
+
+  if (isset($mapping['callback']) && isset($data)) {
+    $callback = $mapping['callback'];
+
+    if (function_exists($callback)) {
+      $attributes['content'] = call_user_func($callback, $data);
+    }
+    if (isset($mapping['datatype'])) {
+      $attributes['datatype'] = $mapping['datatype'];
+    }
+  }
+
+  return $attributes;
+}
+
+
+/**
+ * Implements hook_entity_load().
+ */
+function rdf_entity_load($entities, $type) {
+  foreach ($entities as $entity) {
+    // Extracts the bundle of the entity being loaded.
+    list($id, $vid, $bundle) = field_extract_ids($type, $entity);
+    $entity->rdf_mapping = rdf_get_mapping($type, $bundle);
+  }
+}
+
+/**
+ * Returns an ISO8601 formatted date based on the given date.
+ *
+ * Can be used as a callback for mappings.
+ *
+ * @param $date
+ *   A unix timestamp.
+ * @return string
+ *   An ISO8601 formatted date.
+ */
+function date_iso8601($date) {
+  return date('c', $date);
+}
+
+/**
+ * Implements MODULE_preprocess_HOOK().
+ */
+function rdf_preprocess_node(&$variables) {
+  // Add RDFa markup to the node container. The about attribute specifies the
+  // URI of the resource described within the HTML element, while the typeof
+  // attribute indicates its RDF type (foaf:Document, or sioc:User, etc.).
+  $variables['attributes_array']['about'] = empty($variables['node_url']) ? NULL: $variables['node_url'];
+  $variables['attributes_array']['typeof'] = empty($variables['node']->rdf_mapping['rdftype']) ? NULL : $variables['node']->rdf_mapping['rdftype'];
+
+  // Add RDFa markup to the title of the node. Because the RDFa markup is added
+  // to the h2 tag which might contain HTML code, we specify an empty datatype
+  // to ensure the value of the title read by the RDFa parsers is a literal.
+  $variables['title_attributes_array']['property'] = empty($variables['node']->rdf_mapping['title']['property']) ? NULL : $variables['node']->rdf_mapping['title']['property'];
+  $variables['title_attributes_array']['datatype'] = '';
+
+  // In full node mode, the title is not displayed by node.tpl.php so it is
+  // added in the head tag of the HTML page.
+  if ($variables['page']) {
+    $title_attributes['property'] = empty($variables['node']->rdf_mapping['title']['property']) ? NULL : $variables['node']->rdf_mapping['title']['property'];
+    $title_attributes['content'] = $variables['node_title'];
+    $title_attributes['about'] = $variables['node_url'];
+    drupal_add_html_head('<meta' . drupal_attributes($title_attributes) . ' />');
+  }
+
+  // Add RDFa markup for the date.
+  // @todo use a theme_timestamp() function instead? see http://drupal.org/node/574954
+  if (!empty($variables['rdf_mapping']['created'])) {
+    $date_attributes_array = drupal_rdfa_attributes($variables['rdf_mapping']['created'], $variables['created']);
+    $variables['date'] = '<span' . drupal_attributes($date_attributes_array) .  '>' . $variables['date'] . '</span>';
+  }
+}
+
+/**
+ * Adds RDFa attributes to the template variables.
+ *
+ * @param $variables
+ */
+function rdf_preprocess_field(&$variables) {
+  $entity_type = $variables['element']['#object_type'];
+  $instance = $variables['instance'];
+  $mapping = rdf_get_mapping($entity_type, $instance['bundle']);
+  $field_name = $instance['field_name'];
+
+  if (!empty($mapping) && !empty($mapping[$field_name])) {
+    foreach ($variables['items'] as $delta => $item) {
+      if (!empty($item['#item'])) {
+        $variables['item_attributes_array'][$delta] = drupal_rdfa_attributes($mapping[$field_name], $item['#item']);
+      }
+    }
+  }
+}
+
+/**
+ * Implements MODULE_preprocess_HOOK().
+ */
+function rdf_preprocess_username(&$variables) {
+  $account = $variables['account'];
+  if (!empty($account->rdf_mapping['name'])) {
+    if ($account->uid != 0) {
+      // The following RDFa construct allows to fit all the needed information
+      // into the a tag and avoids having to wrap it with an extra span.
+
+      // An RDF resource for the user is created with the 'about' attribute and
+      // the profile URI is used to identify this resource. Even if the user
+      // profile is not accessible, we generate its URI regardless in order to
+      // be able to identify the user in RDF.
+      $variables['attributes_array']['about'] = url('user/' . $account->uid);
+      // The 'typeof' attribute specifies the RDF type(s) of this resource. They
+      // are defined in the 'rdftype' property of the user object RDF mapping.
+      // Since the full user object is not available in $variables, it needs to
+      // be loaded. This is due to the collision between the node and user
+      // when they are merged into $account and some properties are overridden.
+      $variables['attributes_array']['typeof'] = user_load($account->uid)->rdf_mapping['rdftype'];
+
+      // This first thing we are describing is the relation between the user and
+      // the parent resource (e.g. a node). Because the set of predicate link
+      // the parent to the user, we must use the 'rev' RDFa attribute to specify
+      // that the relationship is reverse.
+      $variables['attributes_array']['rev'] = $account->rdf_mapping['uid']['property'];
+      // We indicate the parent identifier in the 'resource' attribute,
+      // typically this is the entity URI. This is the object in RDF.
+      // @todo find a better way to get the link to the parent entity. If there
+      // a helper function for that?
+      $parent_uri = '';
+      if (!empty($account->path['source'])) {
+        $parent_uri = url($account->path['source']);
+      }
+      elseif (!empty($account->cid)) {
+        $parent_uri = url('comment/' . $account->cid, array('fragment' => 'comment-' . $account->cid));
+      }
+      $variables['attributes_array']['resource'] = $parent_uri;
+
+      // The second information we annotate is the name of the user with the
+      // 'property' attribute. We do not need to specify the RDF object here
+      // because it's the value inside the a tag which will be used
+      // automatically according to the RDFa parsing rules.
+      $variables['attributes_array']['property'] = $account->rdf_mapping['name']['property'];
+     }
+  }
+}
+
+/**
+ * Implements hook_comment_view().
+ */
+function rdf_comment_view($comment, $build_mode) {
+  // Here we have other solution other than wrapping the body content with a div
+  // @todo This would not be necessary if the comment body was a field,
+  // see http://drupal.org/node/538164
+  // An alternative would be to add a $title_attributes to the tpl file
+  // similarily to $title_attributes.
+  if (!empty($comment->rdf_mapping['body']['property'])) {
+    $attributes['property'] = $comment->rdf_mapping['body']['property'];
+    $comment->content['comment_body']['#prefix'] = '<div' . drupal_attributes($attributes) . '>';
+    $comment->content['comment_body']['#suffix'] = '</div>';
+  }
+}
+
+/**
+ * Implements MODULE_preprocess_HOOK().
+ */
+function rdf_preprocess_comment(&$variables) {
+  $comment = $variables['comment'];
+  if (!empty($comment->rdf_mapping['rdftype'])) {
+    // Add RDFa markup to the comment container. The about attribute specifies
+    // the URI of the resource described within the HTML element, while the
+    // typeof attribute indicates its RDF type (e.g. sioc:Post, etc.).
+    $variables['attributes_array']['about'] = url('comment/' . $comment->cid, array('fragment' => 'comment-' . $comment->cid));
+    $variables['attributes_array']['typeof'] = $comment->rdf_mapping['rdftype'];
+  }
+  if (!empty($comment->rdf_mapping['title'])) {
+    $variables['title_attributes_array']['property'] = $comment->rdf_mapping['title']['property'];
+    $variables['title_attributes_array']['datatype'] = '';
+  }
+  if (!empty($comment->rdf_mapping['created'])) {
+    $date_attributes_array = drupal_rdfa_attributes($comment->rdf_mapping['created'], $comment->created);
+    $variables['created'] = '<span' . drupal_attributes($date_attributes_array) .  '>' . $variables['created'] . '</span>';
+  }
+}
+
+/**
+ * Returns the default RDF mapping for the given entity type.
+ *
+ * @param $type
+ *   An entity type.
+ * @return array
+ *   The RDF mapping or an empty array.
+ */
+function _rdf_get_default_mapping($type) {
+  $default_mappings = &drupal_static(__FUNCTION__, array());
+
+  if (empty($default_mappings)) {
+    // Get all modules implementing hook_rdf_mapping().
+    $modules = module_implements('rdf_mapping');
+
+    // Only consider the default entity mapping definitions.
+    foreach ($modules as $module) {
+      $mappings = module_invoke($module, 'rdf_mapping');
+      foreach ($mappings as $mapping) {
+        if ($mapping['bundle'] == RDF_DEFAULT_BUNDLE) {
+          $default_mappings[$mapping['type']] = $mapping['mapping'];
+        }
+      }
+    }
+  }
+
+  return empty($default_mappings[$type]) ? array() : $default_mappings[$type];
+}
+
+/**
+ * Create an RDF mapping binded to a bundle and an entity type.
+ *
+ * RDF CRUD API, handling RDF mapping creation and deletion.
+ *
+ * @param $type
+ *   The entity type the mapping refers to (node, user, comment, term, etc.).
+ * @param $bundle
+ *   The bundle the mapping refers to.
+ * @param $mapping
+ *   An associative array represeting an RDF mapping structure.
+ * @return array
+ *   The stored mapping.
+ */
+function rdf_create_mapping($type, $bundle, $mapping) {
+  $fields = array(
+    'type' => $type,
+    'bundle' => $bundle,
+    'mapping' => serialize($mapping)
+  );
+
+  db_insert('rdf_mapping')->fields($fields)->execute();
+
+  return $mapping;
+}
+
+/**
+ * Read an RDF mapping record directly from the database.
+ *
+ * RDF CRUD API, handling RDF mapping creation and deletion.
+ *
+ * @param $type
+ *   The entity type the mapping refers to.
+ * @param $bundle
+ *   The bundle the mapping refers to.
+ * @return array
+ *   An RDF mapping structure or FALSE if the mapping could not be found.
+ */
+function rdf_read_mapping($type, $bundle) {
+  $query = db_select('rdf_mapping')->fields(NULL, array('mapping'))
+    ->condition('type', $type)->condition('bundle', $bundle)->execute();
+
+  $mapping = unserialize($query->fetchField());
+
+  if (!is_array($mapping)) {
+    $mapping = array();
+  }
+
+  return $mapping;
+}
+
+/**
+ * Update an RDF mapping binded to a bundle and an entity type.
+ *
+ * RDF CRUD API, handling RDF mapping creation and deletion.
+ *
+ * @param $type
+ *   The entity type the mapping refers to.
+ * @param $bundle
+ *   The bundle the mapping refers to.
+ * @param $mapping
+ *   An associative array representing an RDF mapping structure.
+ * @return bool
+ *   Return boolean TRUE if mapping updated, FALSE if not.
+ */
+function rdf_update_mapping($type, $bundle, $mapping) {
+  $fields = array('mapping' => serialize($mapping));
+  $num_rows = db_update('rdf_mapping')->fields($fields)
+    ->condition('type', $type)->condition('bundle', $bundle)->execute();
+
+  return (bool) ($num_rows > 0);
+}
+
+/**
+ * Delete the mapping for the given pair of type and bundle from the database.
+ *
+ * RDF CRUD API, handling RDF mapping creation and deletion.
+ *
+ * @param $type
+ *   The entity type the mapping refers to.
+ * @param $bundle
+ *   The bundle the mapping refers to.
+ * @return bool
+ *   Return boolean TRUE if mapping deleted, FALSE if not.
+ */
+function rdf_delete_mapping($type, $bundle) {
+  $num_rows = db_delete('rdf_mapping')->condition('type', $type)
+    ->condition('bundle', $bundle)->execute();
+
+  return (bool) ($num_rows > 0);
+}

=== added file 'modules/rdf/rdf.test'
--- modules/rdf/rdf.test	1970-01-01 00:00:00 +0000
+++ modules/rdf/rdf.test	2009-10-17 19:48:21 +0000
@@ -0,0 +1,194 @@
+<?php
+// $Id$
+
+class RdfMappingHookTestCase extends DrupalWebTestCase {
+  public static function getInfo() {
+    return array(
+      'name' => t('RDF mapping hook'),
+      'description' => t('Test hook_rdf_mapping().'),
+      'group' => t('RDF'),
+    );
+  }
+
+  function setUp() {
+    parent::setUp('rdf', 'rdf_test', 'field_test');
+    // We need to trigger rdf_modules_installed() because
+    // hook_modules_installed() is not automatically invoked during testing.
+    rdf_modules_installed(array('rdf_test'));
+  }
+
+  /**
+   * Test that hook_rdf_mapping() correctly returns and processes mapping.
+   */
+  function testMapping() {
+    // Test that the mapping is returned correctly by the hook.
+    $mapping = rdf_get_mapping('test_entity', 'test_bundle');
+    $this->assertIdentical($mapping['rdftype'], array('sioc:Post'), t('Mapping for rdftype is sioc:Post.'));
+    $this->assertIdentical($mapping['title'], array('property' => array('dc:title')), t('Mapping for title is dc:title.'));
+    $this->assertIdentical($mapping['created'], array(
+      'property' => array('dc:created'),
+      'datatype' => 'xsd:dateTime',
+      'callback' => 'date_iso8601',
+    ), t('Mapping for created is dc:created with datatype xsd:dateTime and callback date_iso8601.'));
+    $this->assertIdentical($mapping['uid'], array('property' => array('sioc:has_creator', 'dc:creator')), t('Mapping for uid is sioc:has_creator and dc:creator.'));
+
+    // Test that NULL is returned if an entity type, bundle pair has no mapping.
+    $mapping = rdf_get_mapping('test_entity', 'test_bundle_no_mapping');
+    $this->assertTrue($mapping === NULL, t('NULL returned when an entity type, bundle pair has no mapping.'));
+  }
+}
+
+class RdfMarkupTestCase extends DrupalWebTestCase {
+  public static function getInfo() {
+    return array(
+      'name' => t('RDFa markup'),
+      'description' => t('Test RDFa markup generation.'),
+      'group' => t('RDF'),
+    );
+  }
+
+  function setUp() {
+    parent::setUp('rdf', 'field_test', 'rdf_test');
+    rdf_modules_installed(array('field_test', 'rdf_test'));
+  }
+
+  /**
+   * Test drupal_rdfa_attributes().
+   */
+  function testDrupalRdfaAtributes() {
+    $date = 1252750327;
+    $isoDate = date('c', $date);
+
+    $expected_type = 'xsd:dateTime';
+    $expected_property = array('dc:created');
+    $expected_value = $isoDate;
+
+    $mapping = rdf_get_mapping('test_entity', 'test_bundle');
+    $attributes = drupal_rdfa_attributes($mapping['created'], $date);
+
+    $this->assertEqual($expected_type, $attributes['datatype']);
+    $this->assertEqual($expected_property, $attributes['property']);
+    $this->assertEqual($expected_value, $attributes['content']);
+  }
+
+}
+
+class RdfCrudTestCase extends DrupalWebTestCase {
+  public static function getInfo() {
+    return array(
+      'name' => 'RDF mapping CRUD functions',
+      'description' => 'Test the RDF mapping CRUD functions.',
+      'group' => 'RDF',
+    );
+  }
+
+  function setUp() {
+    parent::setUp('rdf', 'rdf_test');
+  }
+
+  function testCreateReadUpdateWrite() {
+    $test_mapping = rdf_test_rdf_mapping();
+
+    $this->assertTrue(is_array(rdf_read_mapping('test_entity', 'test_bundle')));
+    $this->assertEqual(count(rdf_read_mapping('test_entity', 'test_bundle')), 0);
+    $this->assertEqual(
+      rdf_create_mapping('test_entity', 'test_bundle', $test_mapping[0]['mapping']),
+      $test_mapping[0]['mapping']
+    );
+
+    try {
+      rdf_create_mapping('test_entity', 'test_bundle', $test_mapping[0]['mapping']);
+      $this->fail('No Exception thrown when attempting to insert the same mapping another time.');
+    }
+    catch (Exception $e) {
+      $this->pass('Exception thrown when attempting to insert the same mapping another time.');
+    }
+
+    $this->assertEqual($test_mapping[0]['mapping'],
+      rdf_read_mapping('test_entity', 'test_bundle'));
+    $this->assertTrue(rdf_update_mapping('test_entity', 'test_bundle',
+      $test_mapping[1]['mapping']));
+    $this->assertEqual($test_mapping[1]['mapping'],
+      rdf_read_mapping('test_entity', 'test_bundle'));
+    $this->assertTrue(rdf_delete_mapping('test_entity', 'test_bundle'));
+    $this->assertFalse(rdf_read_mapping('test_entity', 'test_bundle'));
+  }
+
+  function testSaveMapping() {
+    $test_mapping = rdf_test_rdf_mapping();
+    rdf_save_mapping($test_mapping[0]);
+
+    $this->assertEqual($test_mapping[0]['mapping'],
+      rdf_read_mapping('test_entity', 'test_bundle'));
+  }
+
+}
+
+class RdfMappingDefinitionTestCase extends DrupalWebTestCase {
+  public static function getInfo() {
+    return array(
+      'name' => t('RDF mapping definition functionality'),
+      'description' => t('Test the different types of RDF mappings and ensure the proper RDFa markup in included in node pages.'),
+      'group' => t('RDF'),
+    );
+  }
+
+  function setUp() {
+    parent::setUp('rdf', 'rdf_test', 'blog');
+    // We need to trigger rdf_modules_installed() because
+    // hook_modules_installed() is not automatically invoked during testing.
+    rdf_modules_installed(array('rdf_test', 'node'));
+    // entity_info caches must be cleared during testing. This is done
+    // automatically during the manual installation.
+    cache_clear_all('entity_info', 'cache');
+    drupal_static_reset('entity_get_info');
+  }
+
+  /**
+   * Create a node of type blog and test whether the RDF mapping defined for
+   * this node type in rdf_test.module is used in the node page.
+   */
+  function testAttributesInMarkup1() {
+    $node = $this->drupalCreateNode(array('type' => 'blog'));
+    $this->drupalGet('node/' . $node->nid);
+
+    $this->assertRaw('typeof="sioct:Weblog"');
+    // Ensure the default bundle mapping for node is used. These attributes come
+    // from the node default bundle definition.
+    $this->assertRaw('property="dc:title"');
+    $this->assertRaw('property="dc:date dc:created"');
+
+  }
+
+  /**
+   * Create a content type and a node of type test_bundle_hook_install and test
+   * whether the RDF mapping defined in rdf_test.install is used.
+   */
+  function testAttributesInMarkup2() {
+    $type = $this->drupalCreateContentType(array('type' => 'test_bundle_hook_install'));
+    $node = $this->drupalCreateNode(array('type' => 'test_bundle_hook_install'));
+    $this->drupalGet('node/' . $node->nid);
+
+    $this->assertRaw('typeof="foo:mapping_install1 bar:mapping_install2"');
+    // Ensure the default bundle mapping for node is used. These attributes come
+    // from the node default bundle definition.
+    $this->assertRaw('property="dc:title"');
+    $this->assertRaw('property="dc:date dc:created"');
+  }
+
+  /**
+   * Create a random content type and node and ensure the default mapping for
+   * node is used.
+   */
+  function testAttributesInMarkup3() {
+    $type = $this->drupalCreateContentType();
+    $node = $this->drupalCreateNode(array('type' => $type->type));
+    $this->drupalGet('node/' . $node->nid);
+
+    $this->assertRaw('typeof="sioc:Item foaf:Document"');
+    // Ensure the default bundle mapping for node is used. These attributes come
+    // from the node default bundle definition.
+    $this->assertRaw('property="dc:title"');
+    $this->assertRaw('property="dc:date dc:created"');
+  }
+}

=== added directory 'modules/rdf/tests'
=== added file 'modules/rdf/tests/rdf_test.info'
--- modules/rdf/tests/rdf_test.info	1970-01-01 00:00:00 +0000
+++ modules/rdf/tests/rdf_test.info	2009-10-17 19:42:40 +0000
@@ -0,0 +1,9 @@
+; $Id$
+name = "RDF module tests"
+description = "Support module for RDF module testing."
+package = Testing
+version = VERSION
+core = 7.x
+files[] = rdf_test.install
+files[] = rdf_test.module
+hidden = TRUE

=== added file 'modules/rdf/tests/rdf_test.install'
--- modules/rdf/tests/rdf_test.install	1970-01-01 00:00:00 +0000
+++ modules/rdf/tests/rdf_test.install	2009-10-17 19:42:40 +0000
@@ -0,0 +1,26 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Install, update and uninstall functions for the rdf module.
+ */
+
+/**
+ * Implement hook_install().
+ */
+function rdf_test_install() {
+  $rdf_mappings = array(
+    array(
+      'type' => 'node',
+      'bundle' => 'test_bundle_hook_install',
+      'mapping' => array(
+        'rdftype' => array('foo:mapping_install1', 'bar:mapping_install2'),
+      ),
+    ),
+  );
+
+  foreach ($rdf_mappings as $rdf_mapping) {
+    rdf_save_mapping($rdf_mapping);
+  }
+}

=== added file 'modules/rdf/tests/rdf_test.module'
--- modules/rdf/tests/rdf_test.module	1970-01-01 00:00:00 +0000
+++ modules/rdf/tests/rdf_test.module	2009-10-17 19:42:40 +0000
@@ -0,0 +1,44 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Dummy module implementing RDF related hooks to test API interaction with
+ * the RDF module.
+ */
+
+/**
+ * Implementation of hook_rdf_mapping().
+ */
+function rdf_test_rdf_mapping() {
+  return array(
+    0 => array(
+      'type' => 'test_entity',
+      'bundle' => 'test_bundle',
+      'mapping' => array(
+        'rdftype' => array('sioc:Post'),
+        'title' => array(
+          'property' => array('dc:title'),
+        ),
+        'created' => array(
+          'property' => array('dc:created'),
+          'datatype' => 'xsd:dateTime',
+          'callback' => 'date_iso8601',
+        ),
+        'uid' => array(
+          'property' => array('sioc:has_creator', 'dc:creator'),
+        ),
+        'foobar' => array(
+          'property' => array('foo:bar'),
+        ),
+      ),
+    ),
+    1 => array(
+      'type' => 'node',
+      'bundle' => 'blog',
+      'mapping' => array(
+        'rdftype' => array('sioct:Weblog'),
+      )
+    ),
+  );
+}

=== modified file 'modules/taxonomy/taxonomy.module'
--- modules/taxonomy/taxonomy.module	2009-10-17 12:08:21 +0000
+++ modules/taxonomy/taxonomy.module	2009-10-17 19:42:40 +0000
@@ -1151,16 +1151,7 @@ function taxonomy_field_formatter_prepar
     }
   }
   if ($tids) {
-    $terms = array();
-
-    // Avoid calling taxonomy_term_load_multiple because it could lead to
-    // circular references.
-    $query = db_select('taxonomy_term_data', 't');
-    $query->fields('t');
-    $query->condition('t.tid', $tids, 'IN');
-    $query->addTag('translatable');
-    $query->addTag('term_access');
-    $terms = $query->execute()->fetchAllAssoc('tid');
+    $terms = taxonomy_term_load_multiple($tids);
 
     // Iterate through the fieldable entities again to attach the loaded term data.
     foreach ($objects as $id => $object) {
@@ -1415,6 +1406,38 @@ function taxonomy_field_settings_form($f
 }
 
 /**
+ * Implement hook_rdf_mapping().
+ *
+ * @return array
+ *   The rdf mapping for vocabularies and terms.
+ */
+function taxonomy_rdf_mapping() {
+  $mapping = array(
+    array(
+      'type' => 'taxonomy_term',
+      'bundle' => RDF_DEFAULT_BUNDLE,
+      'mapping' => array(
+        'rdftype' => array('skos:Concept'),
+        'name' => array('property' => 'dc:title'),
+        'description' => array('property' => 'rdf:description'),
+        'vid' => array('property' => 'skos:belongs_to'),
+      ),
+    ),
+    array(
+      'type' => 'taxonomy_vocabulary',
+      'bundle' => RDF_DEFAULT_BUNDLE,
+      'mapping' => array(
+        'rdftype' => array('skos:Collection'),
+        'name' => array('property' => 'dc:title'),
+        'description' => array('property' => 'rdf:description'),
+      ),
+    ),
+  );
+
+  return $mapping;
+}
+
+/**
  * @defgroup taxonomy indexing Taxonomy functions maintaining {taxonomy_index}.
  *
  * Taxonomy uses default field storage to store canonical relationships
@@ -1504,4 +1527,3 @@ function taxonomy_taxonomy_term_delete($
 /**
  * @} End of "defgroup taxonomy indexing"
  */
-

=== modified file 'profiles/default/default.info'
--- profiles/default/default.info	2009-10-17 01:15:39 +0000
+++ profiles/default/default.info	2009-10-17 19:42:40 +0000
@@ -18,4 +18,5 @@ dependencies[] = shortcut
 dependencies[] = toolbar
 dependencies[] = field_ui
 dependencies[] = file
+dependencies[] = rdf
 files[] = default.profile

=== modified file 'profiles/default/default.install'
--- profiles/default/default.install	2009-10-16 00:52:46 +0000
+++ profiles/default/default.install	2009-10-17 19:42:40 +0000
@@ -166,6 +166,28 @@ function default_install() {
     node_type_save($type);
   }
 
+  // Insert default user-defined RDF mapping into the database.
+  $rdf_mappings = array(
+    array(
+      'type' => 'node',
+      'bundle' => 'page',
+      'mapping' => array(
+        'rdftype' => array('foaf:Document'),
+      ),
+    ),
+    array(
+      'type' => 'node',
+      'bundle' => 'article',
+      'mapping' => array(
+        'rdftype' => array('sioc:Item', 'foaf:Document'),
+      ),
+    ),
+  );
+
+  foreach ($rdf_mappings as $rdf_mapping) {
+    rdf_save_mapping($rdf_mapping);
+  }
+
   // Default page to not be promoted and have comments disabled.
   variable_set('node_options_page', array('status'));
   variable_set('comment_page', COMMENT_NODE_HIDDEN);