diff options
| -rw-r--r-- | modules/rdf/rdf.api.php | 7 | ||||
| -rw-r--r-- | modules/rdf/rdf.module | 3 | ||||
| -rw-r--r-- | modules/rdf/rdf.test | 2 | ||||
| -rw-r--r-- | modules/simpletest/tests/common.test | 2 |
4 files changed, 3 insertions, 11 deletions
diff --git a/modules/rdf/rdf.api.php b/modules/rdf/rdf.api.php index 67cfe564e..2624fbfe3 100644 --- a/modules/rdf/rdf.api.php +++ b/modules/rdf/rdf.api.php @@ -90,18 +90,13 @@ function hook_rdf_mapping() { */ function hook_rdf_namespaces() { return array( - 'admin' => 'http://webns.net/mvcb/', 'content' => 'http://purl.org/rss/1.0/modules/content/', 'dc' => 'http://purl.org/dc/terms/', 'foaf' => 'http://xmlns.com/foaf/0.1/', - 'owl' => 'http://www.w3.org/2002/07/owl#', - 'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#', + 'og' => 'http://ogp.me/ns#', 'rdfs' => 'http://www.w3.org/2000/01/rdf-schema#', - 'rss' => 'http://purl.org/rss/1.0/', - 'tags' => 'http://www.holygoat.co.uk/owl/redwood/0.1/tags/', 'sioc' => 'http://rdfs.org/sioc/ns#', 'sioct' => 'http://rdfs.org/sioc/types#', - 'ctag' => 'http://commontag.org/ns#', 'skos' => 'http://www.w3.org/2004/02/skos/core#', 'xsd' => 'http://www.w3.org/2001/XMLSchema#', ); diff --git a/modules/rdf/rdf.module b/modules/rdf/rdf.module index 27c2c8e90..4c0513e20 100644 --- a/modules/rdf/rdf.module +++ b/modules/rdf/rdf.module @@ -81,10 +81,7 @@ function rdf_rdf_namespaces() { 'dc' => 'http://purl.org/dc/terms/', 'foaf' => 'http://xmlns.com/foaf/0.1/', 'og' => 'http://ogp.me/ns#', - 'owl' => 'http://www.w3.org/2002/07/owl#', - 'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#', 'rdfs' => 'http://www.w3.org/2000/01/rdf-schema#', - 'rss' => 'http://purl.org/rss/1.0/', 'sioc' => 'http://rdfs.org/sioc/ns#', 'sioct' => 'http://rdfs.org/sioc/types#', 'skos' => 'http://www.w3.org/2004/02/skos/core#', diff --git a/modules/rdf/rdf.test b/modules/rdf/rdf.test index 137bb7c78..e3287a511 100644 --- a/modules/rdf/rdf.test +++ b/modules/rdf/rdf.test @@ -688,7 +688,7 @@ class RdfGetRdfNamespacesTestCase extends DrupalWebTestCase { // Get all RDF namespaces. $ns = rdf_get_namespaces(); - $this->assertEqual($ns['owl'], 'http://www.w3.org/2002/07/owl#', t('A prefix declared once is included.')); + $this->assertEqual($ns['rdfs'], 'http://www.w3.org/2000/01/rdf-schema#', t('A prefix declared once is included.')); $this->assertEqual($ns['foaf'], 'http://xmlns.com/foaf/0.1/', t('The same prefix declared in several implementations of hook_rdf_namespaces() is valid as long as all the namespaces are the same.')); $this->assertEqual($ns['foaf1'], 'http://xmlns.com/foaf/0.1/', t('Two prefixes can be assigned the same namespace.')); $this->assertTrue(!isset($ns['dc']), t('A prefix with conflicting namespaces is discarded.')); diff --git a/modules/simpletest/tests/common.test b/modules/simpletest/tests/common.test index b23e8e53c..bcec70f0c 100644 --- a/modules/simpletest/tests/common.test +++ b/modules/simpletest/tests/common.test @@ -2017,7 +2017,7 @@ class DrupalGetRdfNamespacesTestCase extends DrupalWebTestCase { $xml = new SimpleXMLElement($this->content); $ns = $xml->getDocNamespaces(); - $this->assertEqual($ns['owl'], 'http://www.w3.org/2002/07/owl#', t('A prefix declared once is displayed.')); + $this->assertEqual($ns['rdfs'], 'http://www.w3.org/2000/01/rdf-schema#', t('A prefix declared once is displayed.')); $this->assertEqual($ns['foaf'], 'http://xmlns.com/foaf/0.1/', t('The same prefix declared in several implementations of hook_rdf_namespaces() is valid as long as all the namespaces are the same.')); $this->assertEqual($ns['foaf1'], 'http://xmlns.com/foaf/0.1/', t('Two prefixes can be assigned the same namespace.')); $this->assertTrue(!isset($ns['dc']), t('A prefix with conflicting namespaces is discarded.')); |