Merge pull request #117 from ruebot/7.x-ISLANDORA-962

DESTROY ISLANDORACM!!!

Author: willtp87

includes/collection_policy.inc

@@ -110,10 +110,9 @@ EOT;
   public function addContentModel($pid, $name, $namespace) {
     $content_models_element = $this->xml->getElementsByTagName('content_models');
     $content_model_element = $content_models_element->item(0)->getElementsByTagName('content_model');
-
     $content_model_element = $this->xml->createElement('content_model');
     $content_model_element->setAttribute('name', $name);
-    $content_model_element->setAttribute('dsid', variable_get('Islandora_Content_Model_DSID', 'ISLANDORACM'));
+    $content_model_element->setAttribute('dsid', variable_get('Islandora_Content_Model_DSID', ''));
     $content_model_element->setAttribute('namespace', $namespace);
     $content_model_element->setAttribute('pid', $pid);
     $content_models_element->item(0)->appendChild($content_model_element);

islandora_basic_collection.module

@@ -157,12 +157,6 @@ function islandora_basic_collection_islandora_required_objects(IslandoraTuque $c
   $collection_content_model->owner = 'fedoraAdmin';
   $collection_content_model->label = 'Islandora Collection Content Model';
   $collection_content_model->models = 'fedora-system:ContentModel-3.0';
-  // ISLANDORACM Datastream.
-  $datastream = $collection_content_model->constructDatastream('ISLANDORACM', 'X');
-  $datastream->label = 'Islandora content model';
-  $datastream->mimetype = 'text/xml';
-  $datastream->setContentFromFile("$module_path/xml/islandora_basic_collection_content_model.xml", FALSE);
-  $collection_content_model->ingestDatastream($datastream);
   // DS-COMPOSITE-MODEL Datastream.
   $datastream = $collection_content_model->constructDatastream('DS-COMPOSITE-MODEL', 'X');
   $datastream->label = 'DS-COMPOSITE-MODEL';