Merge pull request #43 from bwoodhead/6.x

Changed back to fedora_repository

fedora_repository.info

@@ -1,9 +1,9 @@
 ; $Id$
-name = Digital Repository
+name = Islandora Repository
 dependencies[] = imageapi
 dependencies[] = tabs
 dependencies[] = islandora_content_model_forms
 description = Shows a list of items in a fedora collection.
 package = Islandora
-version = 11.2.beta1
+version = 11.2.beta2
 core = 6.x

formClass.inc

@@ -25,7 +25,7 @@ class formClass {
     $items = array();
 
     $items['admin/settings/fedora_repository'] = array(
-      'title' => t('Configure Islandora'),
+      'title' => t('Islandora Configure'),
       'description' => t('Enter the Islandora Collection information here'),
       'page callback' => 'drupal_get_form',
       'page arguments' => array('fedora_repository_admin'),

installer_files/foxml/islandora-root.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<foxml:digitalObject PID="islandora:top" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
+<foxml:digitalObject PID="islandora:root" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
     <foxml:objectProperties>
         <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
@@ -97,7 +97,7 @@
           xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
                     <dc:title>Islandora Top-Level Collection</dc:title>
-                    <dc:identifier>islandora:top</dc:identifier>
+                    <dc:identifier>islandora:root</dc:identifier>
                 </oai_dc:dc>
             </foxml:xmlContent>
         </foxml:datastreamVersion>
@@ -107,7 +107,7 @@
       ID="RELS-EXT.0" LABEL="RDF Statements about this object" MIMETYPE="application/rdf+xml" SIZE="314">
             <foxml:xmlContent>
                 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-                    <rdf:Description rdf:about="info:fedora/islandora:top">
+                    <rdf:Description rdf:about="info:fedora/islandora:root">
                         <hasModel rdf:resource="info:fedora/islandora:collectionCModel" xmlns="info:fedora/fedora-system:def/model#"/>
                     </rdf:Description>
                 </rdf:RDF>
@@ -144,7 +144,7 @@
     </foxml:datastream>
     <foxml:datastream CONTROL_GROUP="M" ID="TN" STATE="A" VERSIONABLE="true">
         <foxml:datastreamVersion CREATED="2010-10-11T23:08:15.373Z" ID="TN.0" LABEL="Thumbnail.png" MIMETYPE="image/png" SIZE="16243">
-            <foxml:contentLocation REF="http://localhost:8080/fedora/get/islandora:top/TN/2010-10-11T23:08:15.373Z" TYPE="INTERNAL_ID"/>
+            <foxml:contentLocation REF="http://localhost:8080/fedora/get/islandora:root/TN/2010-10-11T23:08:15.373Z" TYPE="INTERNAL_ID"/>
         </foxml:datastreamVersion>
     </foxml:datastream>
 </foxml:digitalObject>

plugins/fedora_imageapi.info

@@ -3,5 +3,5 @@ description = Adds image manipulation support through a REST interface
 package = Islandora Dependencies
 dependencies[] = fedora_repository
 dependencies[] = imageapi
-version = 11.2.beta1
+version = 11.2.beta2
 core = 6.x

tests/README_TESTING.txt

@@ -5,7 +5,7 @@ Fedora Installation
 The test sets up the islandora module with the default server settings.
 This means it will expect a Fedora server to be running on localhost:8080
 with the usual defaults. The tests also expect the Islandora demo objects, i.e.,
-islandora:top, islandora:demos collections, etc. to be installed. (Go to
+islandora:root, islandora:demos collections, etc. to be installed. (Go to
 Administer -> Site Configuration -> Fedora Colleciton List and click the Install
 Demos tab and follow the instructions.)
 

tests/fedora_repository.test

@@ -45,11 +45,11 @@ class FedoraRepositoryTestCase extends DrupalWebTestCase {
 
     $pid_list = array();
     // Create a collection for ingesting PDF content model objects.
-    //$this->drupalGet('fedora/ingestObject/islandora:top/Islandora%20Top-Level%20Collection');
+    //$this->drupalGet('fedora/ingestObject/islandora:root/Islandora%20Top-Level%20Collection');
     $ingest_form = array();
     $ingest_form['models'] = 'islandora:collectionCModel/ISLANDORACM';
 
-    $this->drupalPost('fedora/ingestObject/islandora:top/Islandora%20Top-Level%20Collection', $ingest_form, 'Next');
+    $this->drupalPost('fedora/ingestObject/islandora:root/Islandora%20Top-Level%20Collection', $ingest_form, 'Next');
 
     // Add a sample PDF object via the web ingest form.
     // Required fields are file location, dc:title and dc:description
@@ -67,7 +67,7 @@ class FedoraRepositoryTestCase extends DrupalWebTestCase {
     $ingest_form = array();
     $ingest_form['models'] = 'islandora:collectionCModel/ISLANDORACM';
 
-    $this->drupalPost('fedora/ingestObject/islandora:top/Islandora%20Top-Level%20Collection', $ingest_form, 'Next');
+    $this->drupalPost('fedora/ingestObject/islandora:root/Islandora%20Top-Level%20Collection', $ingest_form, 'Next');
     // Required fields are file location, dc:title and dc:description
     $ingest_form_step_2 = array();
     $ingest_form_step_2['dc:title'] = $this->randomName(32);