Change module name to islandora, add default fedora_resource_type

config/install/islandora.fedora_resource_type.non_rdf_source.yml

@@ -0,0 +1,4 @@
+langcode: en
+id: non_rdf_source
+label: 'Non RDF Source'
+rdf_type: fedora:Binary

config/install/islandora.fedora_resource_type.rdf_source.yml

@@ -0,0 +1,4 @@
+langcode: en
+id: rdf_source
+label: 'RDF Source'
+rdf_type: fedora:Resource

config/schema/fedora_resource_type.schema.yml

@@ -1,4 +1,4 @@
-islandoraclaw.fedora_resource_type.*:
+islandora.fedora_resource_type.*:
   type: config_entity
   label: 'Fedora resource type config'
   mapping:
@@ -10,8 +10,11 @@ islandoraclaw.fedora_resource_type.*:
       label: 'Label'
     uuid:
       type: string
+    rdf_type:
+      type: label
+      label: 'RDF type'
 
-# Plugin \Drupal\islandoraclaw\Plugin\Search\FedoraResourceSearch
+# Plugin \Drupal\islandora\Plugin\Search\FedoraResourceSearch
 search.plugin.node_search:
   type: mapping
   label: 'Fedora Resource search'

islandora.links.action.yml

@@ -3,6 +3,7 @@ entity.fedora_resource.add_form:
   title: 'Add Fedora resource'
   appears_on:
     - entity.fedora_resource.collection
+
 entity.fedora_resource_type.add_form:
   route_name: 'entity.fedora_resource_type.add_form'
   title: 'Add Fedora resource type'

islandora.links.menu.yml

@@ -8,7 +8,7 @@ entity.fedora_resource.collection:
 
 # Fedora resource type menu items definition
 entity.fedora_resource_type.collection:
-  title: 'Fedora resource type'
+  title: 'Fedora resource type list'
   route_name: entity.fedora_resource_type.collection
   description: 'List Fedora resource type (bundles)'
   parent: system.admin_structure

islandora.module

@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains islandoraclaw.module..
+ * Contains islandora.module..
  */
 
 use Drupal\Core\Routing\RouteMatchInterface;
@@ -10,10 +10,10 @@ use Drupal\Core\Routing\RouteMatchInterface;
 /**
  * Implements hook_help().
  */
-function islandoraclaw_help($route_name, RouteMatchInterface $route_match) {
+function islandora_help($route_name, RouteMatchInterface $route_match) {
   switch ($route_name) {
-    // Main module help for the islandoraclaw module.
+    // Main module help for the islandora module.
-    case 'help.page.islandoraclaw':
+    case 'help.page.islandora':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
       $output .= '<p>' . t('') . '</p>';
@@ -26,7 +26,7 @@ function islandoraclaw_help($route_name, RouteMatchInterface $route_match) {
 /**
  * Implements hook_theme().
  */
-function islandoraclaw_theme() {
+function islandora_theme() {
   $theme = [];
   $theme['fedora_resource'] = [
     'render element' => 'elements',
@@ -44,7 +44,7 @@ function islandoraclaw_theme() {
 /**
 * Implements hook_theme_suggestions_HOOK().
 */
-function islandoraclaw_theme_suggestions_fedora_resource(array $variables) {
+function islandora_theme_suggestions_fedora_resource(array $variables) {
   $suggestions = array();
   $entity = $variables['elements']['#fedora_resource'];
   $sanitized_view_mode = strtr($variables['elements']['#view_mode'], '.', '_');

islandora.permissions.yml

@@ -1,3 +1,4 @@
+# Fedora Resource permissions
 add fedora resource entities:
   title: 'Create new Fedora resource entities'
 
@@ -17,3 +18,9 @@ view published fedora resource entities:
 
 view unpublished fedora resource entities:
   title: 'View unpublished Fedora resource entities'
+
+# Fedora Resource Type permissions
+administer fedora resource type entities:
+  title: 'Administer Fedora Resource Type entities'
+  description: 'Allow to access administration of Fedora Resource Type entities (bundles).'
+  restrict access: true

islandora.routing.yml

@@ -0,0 +1,19 @@
+entity.fedora_resource.collection:
+  path: '/admin/structure/fedora_resource'
+  defaults:
+    _entity_list: 'fedora_resource'
+    _title: 'Fedora Resource'
+  requirements:
+    _permission: 'administer fedora resource entities'
+  options:
+    _admin_route: true
+
+entity.fedora_resource_type.collection:
+  path: '/admin/structure/fedora_resource_type'
+  defaults:
+    _entity_list: 'fedora_resource_type'
+    _title: 'Fedora Resource Type'
+  requirements:
+    _permission: 'administer fedora resource type entities'
+  options:
+    _admin_route: true

src/Controller/FedoraResourceAddController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\islandoraclaw\Controller;
+namespace Drupal\islandora\Controller;
 
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Entity\EntityInterface;
@@ -14,7 +14,7 @@ use Symfony\Component\HttpFoundation\Request;
 /**
  * Class FedoraResourceAddController.
  *
- * @package Drupal\islandoraclaw\Controller
+ * @package Drupal\islandora\Controller
  */
 class FedoraResourceAddController extends ControllerBase {
 

src/Entity/FedoraResource.php

@@ -1,19 +1,19 @@
 <?php
 
-namespace Drupal\islandoraclaw\Entity;
+namespace Drupal\islandora\Entity;
 
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Entity\ContentEntityBase;
 use Drupal\Core\Entity\EntityChangedTrait;
 use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\islandoraclaw\FedoraResourceInterface;
+use Drupal\islandora\FedoraResourceInterface;
 use Drupal\user\UserInterface;
 
 /**
  * Defines the Fedora resource entity.
  *
- * @ingroup islandoraclaw
+ * @ingroup islandora
  *
  * @ContentEntityType(
  *   id = "fedora_resource",
@@ -21,18 +21,18 @@ use Drupal\user\UserInterface;
  *   bundle_label = @Translation("Fedora resource type"),
  *   handlers = {
  *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
- *     "list_builder" = "Drupal\islandoraclaw\FedoraResourceListBuilder",
+ *     "list_builder" = "Drupal\islandora\FedoraResourceListBuilder",
- *     "views_data" = "Drupal\islandoraclaw\Entity\FedoraResourceViewsData",
+ *     "views_data" = "Drupal\islandora\Entity\FedoraResourceViewsData",
  *
  *     "form" = {
- *       "default" = "Drupal\islandoraclaw\Form\FedoraResourceForm",
+ *       "default" = "Drupal\islandora\Form\FedoraResourceForm",
- *       "add" = "Drupal\islandoraclaw\Form\FedoraResourceForm",
+ *       "add" = "Drupal\islandora\Form\FedoraResourceForm",
- *       "edit" = "Drupal\islandoraclaw\Form\FedoraResourceForm",
+ *       "edit" = "Drupal\islandora\Form\FedoraResourceForm",
- *       "delete" = "Drupal\islandoraclaw\Form\FedoraResourceDeleteForm",
+ *       "delete" = "Drupal\islandora\Form\FedoraResourceDeleteForm",
  *     },
- *     "access" = "Drupal\islandoraclaw\FedoraResourceAccessControlHandler",
+ *     "access" = "Drupal\islandora\FedoraResourceAccessControlHandler",
  *     "route_provider" = {
- *       "html" = "Drupal\islandoraclaw\FedoraResourceHtmlRouteProvider",
+ *       "html" = "Drupal\islandora\FedoraResourceHtmlRouteProvider",
  *     },
  *   },
  *   base_table = "fedora_resource",
@@ -176,6 +176,40 @@ class FedoraResource extends ContentEntityBase implements FedoraResourceInterfac
     return $this;
   }
 
+
+  /**
+   * {@inheritdoc}
+   */
+  public function hasParent()
+  {
+    return ($this->get('fedora_has_parent') !== null);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getParent()
+  {
+    return $this->get('fedora_has_parent')->getEntity();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getParentId()
+  {
+    return $this->get('fedora_has_parent')->getEntity()->id();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setParent(EntityTypeInterface $entity)
+  {
+    $this->set('fedora_has_parent', $entity);
+    return $this;
+  }
+
   /**
    * Default value callback for 'fedora_has_parent' base field definition.
    *
@@ -238,7 +272,7 @@ class FedoraResource extends ContentEntityBase implements FedoraResourceInterfac
         ->setRevisionable(TRUE)
         ->setSetting('target_type', 'fedora_resource')
         ->setSetting('handler', 'default')
-        ->setDefaultValueCallback('Drupal\islandoraClaw\Entity\FedoraResource::getFedoraRoot')
+        ->setDefaultValueCallback('Drupal\islandora\Entity\FedoraResource::getFedoraRoot')
         ->setTranslatable(TRUE)
         ->setDisplayOptions('view', array(
           'label' => 'hidden',
@@ -258,7 +292,7 @@ class FedoraResource extends ContentEntityBase implements FedoraResourceInterfac
         ->setDisplayConfigurable('form', TRUE)
         ->setDisplayConfigurable('view', TRUE);
 
-        $fields['ldp_containes'] = BaseFieldDefinition::create('entity_reference')
+        $fields['ldp_contains'] = BaseFieldDefinition::create('entity_reference')
           ->setLabel(t('LDP Contains'))
           ->setDescription(t('Contains Fedora Resource.'))
           ->setRevisionable(TRUE)

src/Entity/FedoraResourceType.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\islandoraclaw\Entity;
+namespace Drupal\islandora\Entity;
 
 use Drupal\Core\Config\Entity\ConfigEntityBundleBase;
-use Drupal\islandoraclaw\FedoraResourceTypeInterface;
+use Drupal\islandora\FedoraResourceTypeInterface;
 
 /**
  * Defines the Fedora resource type entity.
@@ -12,14 +12,14 @@ use Drupal\islandoraclaw\FedoraResourceTypeInterface;
  *   id = "fedora_resource_type",
  *   label = @Translation("Fedora resource type"),
  *   handlers = {
- *     "list_builder" = "Drupal\islandoraclaw\FedoraResourceTypeListBuilder",
+ *     "list_builder" = "Drupal\islandora\FedoraResourceTypeListBuilder",
  *     "form" = {
- *       "add" = "Drupal\islandoraclaw\Form\FedoraResourceTypeForm",
+ *       "add" = "Drupal\islandora\Form\FedoraResourceTypeForm",
- *       "edit" = "Drupal\islandoraclaw\Form\FedoraResourceTypeForm",
+ *       "edit" = "Drupal\islandora\Form\FedoraResourceTypeForm",
- *       "delete" = "Drupal\islandoraclaw\Form\FedoraResourceTypeDeleteForm"
+ *       "delete" = "Drupal\islandora\Form\FedoraResourceTypeDeleteForm"
  *     },
  *     "route_provider" = {
- *       "html" = "Drupal\islandoraclaw\FedoraResourceTypeHtmlRouteProvider",
+ *       "html" = "Drupal\islandora\FedoraResourceTypeHtmlRouteProvider",
  *     },
  *   },
  *   config_prefix = "fedora_resource_type",
@@ -55,4 +55,18 @@ class FedoraResourceType extends ConfigEntityBundleBase implements FedoraResourc
    */
   protected $label;
 
+  /**
+   * The RDF type
+   * 
+   * @var string
+   */
+  protected $rdf_type;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRdfType()
+  {
+    return $this->rdf_type;
+  }
 }

src/Entity/FedoraResourceViewsData.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\islandoraclaw\Entity;
+namespace Drupal\islandora\Entity;
 
 use Drupal\views\EntityViewsData;
 use Drupal\views\EntityViewsDataInterface;

src/FedoraResource.php

@@ -1,22 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\islandoraclaw\FedoraResourceInterface.
- */
-
-namespace Drupal\islandoraclaw;
-
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\user\EntityOwnerInterface;
-use Drupal\Core\Entity\EntityChangedInterface;
-
-/**
- * Provides an interface for defining a Fedora 4 Resource entity.
- *
- * This interface extends multiple ones so we can use all the extended ones at once.
- *
- * @ingroup islandoraclaw
- */
-interface FedoraResourceInterface extends ContentEntityInterface, EntityOwnerInterface, EntityChangedInterface {
-
-}

src/FedoraResourceAccessControlHandler.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\islandoraclaw;
+namespace Drupal\islandora;
 
 use Drupal\Core\Entity\EntityAccessControlHandler;
 use Drupal\Core\Entity\EntityInterface;
@@ -10,7 +10,7 @@ use Drupal\Core\Access\AccessResult;
 /**
  * Access controller for the Fedora resource entity.
  *
- * @see \Drupal\islandoraclaw\Entity\FedoraResource.
+ * @see \Drupal\islandora\Entity\FedoraResource.
  */
 class FedoraResourceAccessControlHandler extends EntityAccessControlHandler {
 
@@ -18,7 +18,7 @@ class FedoraResourceAccessControlHandler extends EntityAccessControlHandler {
    * {@inheritdoc}
    */
   protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
-    /** @var \Drupal\islandoraclaw\FedoraResourceInterface $entity */
+    /** @var \Drupal\islandora\FedoraResourceInterface $entity */
     switch ($operation) {
       case 'view':
         if (!$entity->isPublished()) {

src/FedoraResourceHtmlRouteProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\islandoraclaw;
+namespace Drupal\islandora;
 
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\Routing\AdminHtmlRouteProvider;
@@ -86,8 +86,8 @@ class FedoraResourceHtmlRouteProvider extends AdminHtmlRouteProvider {
       // Content entities with bundles are added via a dedicated controller.
       $route
         ->setDefaults([
-          '_controller' => 'Drupal\islandoraclaw\Controller\FedoraResourceAddController::addForm',
+          '_controller' => 'Drupal\islandora\Controller\FedoraResourceAddController::addForm',
-          '_title_callback' => 'Drupal\islandoraclaw\Controller\FedoraResourceAddController::getAddFormTitle',
+          '_title_callback' => 'Drupal\islandora\Controller\FedoraResourceAddController::getAddFormTitle',
         ])
         ->setRequirement('_entity_create_access', $entity_type_id . ':{' . $bundle_entity_type_id . '}');
       $parameters[$bundle_entity_type_id] = ['type' => 'entity:' . $bundle_entity_type_id];
@@ -113,7 +113,7 @@ class FedoraResourceHtmlRouteProvider extends AdminHtmlRouteProvider {
     $route = new Route("/admin/structure/{$entity_type->id()}/add");
     $route
       ->setDefaults([
-        '_controller' => 'Drupal\islandoraclaw\Controller\FedoraResourceAddController::add',
+        '_controller' => 'Drupal\islandora\Controller\FedoraResourceAddController::add',
         '_title' => "Add {$entity_type->getLabel()}",
       ])
       ->setRequirement('_entity_create_access', $entity_type->id())
@@ -136,7 +136,7 @@ class FedoraResourceHtmlRouteProvider extends AdminHtmlRouteProvider {
       $route = new Route("/admin/structure/{$entity_type->id()}/settings");
       $route
         ->setDefaults([
-          '_form' => 'Drupal\islandoraclaw\Form\FedoraResourceSettingsForm',
+          '_form' => 'Drupal\islandora\Form\FedoraResourceSettingsForm',
           '_title' => "{$entity_type->getLabel()} settings",
         ])
         ->setRequirement('_permission', $entity_type->getAdminPermission())

src/FedoraResourceInterface.php

@@ -1,15 +1,16 @@
 <?php
 
-namespace Drupal\islandoraclaw;
+namespace Drupal\islandora;
 
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\EntityChangedInterface;
+use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\user\EntityOwnerInterface;
 
 /**
  * Provides an interface for defining Fedora resource entities.
  *
- * @ingroup islandoraclaw
+ * @ingroup islandora
  */
 interface FedoraResourceInterface extends ContentEntityInterface, EntityChangedInterface, EntityOwnerInterface {
 
@@ -37,7 +38,7 @@ interface FedoraResourceInterface extends ContentEntityInterface, EntityChangedI
    * @param string $name
    *   The Fedora resource name.
    *
-   * @return \Drupal\islandoraclaw\FedoraResourceInterface
+   * @return \Drupal\islandora\FedoraResourceInterface
    *   The called Fedora resource entity.
    */
   public function setName($name);
@@ -56,7 +57,7 @@ interface FedoraResourceInterface extends ContentEntityInterface, EntityChangedI
    * @param int $timestamp
    *   The Fedora resource creation timestamp.
    *
-   * @return \Drupal\islandoraclaw\FedoraResourceInterface
+   * @return \Drupal\islandora\FedoraResourceInterface
    *   The called Fedora resource entity.
    */
   public function setCreatedTime($timestamp);
@@ -77,9 +78,43 @@ interface FedoraResourceInterface extends ContentEntityInterface, EntityChangedI
    * @param bool $published
    *   TRUE to set this Fedora resource to published, FALSE to set it to unpublished.
    *
-   * @return \Drupal\islandoraclaw\FedoraResourceInterface
+   * @return \Drupal\islandora\FedoraResourceInterface
    *   The called Fedora resource entity.
    */
   public function setPublished($published);
 
+  /**
+   * Does the entity have a parent entity?
+   *
+   * @return bool
+   *    Whether a parent entity was set.
+   */
+  public function hasParent();
+
+  /**
+   * Gets the id of the parent entity.
+   *
+   * @return int
+   *    The id of the parent Fedora resource entity.
+   */
+  public function getParentId();
+
+  /**
+   * Get the parent entity.
+   *
+   * @return \Drupal\islandora\FedoraResourceInterface
+   *    The actual entity of the parent Fedora resource.
+   */
+  public function getParent();
+
+  /**
+   * Get the parent entity.
+   *
+   * @param \Drupal\islandora\FedoraResourceInterface $parent
+   *    The parent entity
+   *
+   * @return \Drupal\islandora\FedoraResourceInterface
+   *    The called Fedora resource entity.
+   */
+  public function setParent(EntityTypeInterface $entity);
 }

src/FedoraResourceListBuilder.php

@@ -1,27 +1,25 @@
 <?php
 
-namespace Drupal\islandoraclaw;
+namespace Drupal\islandora;
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityListBuilder;
-use Drupal\Core\Routing\LinkGeneratorTrait;
+use Drupal\Core\Link;
-use Drupal\Core\Url;
 
 /**
  * Defines a class to build a listing of Fedora resource entities.
  *
- * @ingroup islandoraclaw
+ * @ingroup islandora
  */
 class FedoraResourceListBuilder extends EntityListBuilder {
 
-  use LinkGeneratorTrait;
-
   /**
    * {@inheritdoc}
    */
   public function buildHeader() {
     $header['id'] = $this->t('Fedora resource ID');
     $header['name'] = $this->t('Name');
+    $header['parent'] = $this->t('Parent');
     return $header + parent::buildHeader();
   }
 
@@ -29,16 +27,21 @@ class FedoraResourceListBuilder extends EntityListBuilder {
    * {@inheritdoc}
    */
   public function buildRow(EntityInterface $entity) {
-    /* @var $entity \Drupal\islandoraclaw\Entity\FedoraResource */
+    /* @var $entity \Drupal\islandora\Entity\FedoraResource */
     $row['id'] = $entity->id();
-    $row['name'] = $this->l(
+    $row['name'] = Link::fromTextAndUrl(
       $entity->label(),
-      new Url(
+      $entity->toUrl()
-        'entity.fedora_resource.edit_form', array(
+    );
-          'fedora_resource' => $entity->id(),
+    if ($entity->hasParent()) {
-        )
+      $row['parent'] = Link::fromTextAndUrl(
-      )
+        $entity->getParent()->label(),
+        $entity->getParent()->toUrl()
       );
+    }
+    else {
+      $row['parent'] = $this->t("n/a");
+    }
     return $row + parent::buildRow($entity);
   }
 

src/FedoraResourceTypeHtmlRouteProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\islandoraclaw;
+namespace Drupal\islandora;
 
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\Routing\AdminHtmlRouteProvider;

src/FedoraResourceTypeInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\islandoraclaw;
+namespace Drupal\islandora;
 
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
 
@@ -10,4 +10,9 @@ use Drupal\Core\Config\Entity\ConfigEntityInterface;
 interface FedoraResourceTypeInterface extends ConfigEntityInterface {
 
   // Add get/set methods for your configuration properties here.
+
+  /**
+   * Return the entities rdf_type
+   */
+  public function getRdfType();
 }

src/FedoraResourceTypeListBuilder.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\islandoraclaw;
+namespace Drupal\islandora;
 
 use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
 use Drupal\Core\Entity\EntityInterface;
@@ -16,6 +16,7 @@ class FedoraResourceTypeListBuilder extends ConfigEntityListBuilder {
   public function buildHeader() {
     $header['label'] = $this->t('Fedora resource type');
     $header['id'] = $this->t('Machine name');
+    $header['rdf_type'] = $this->t('RDF Type');
     return $header + parent::buildHeader();
   }
 
@@ -25,6 +26,7 @@ class FedoraResourceTypeListBuilder extends ConfigEntityListBuilder {
   public function buildRow(EntityInterface $entity) {
     $row['label'] = $entity->label();
     $row['id'] = $entity->id();
+    $row['rdf_type'] = $entity->getRdfType();
     // You probably want a few more properties here...
     return $row + parent::buildRow($entity);
   }

src/Form/FedoraResourceDeleteForm.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\islandoraclaw\Form;
+namespace Drupal\islandora\Form;
 
 use Drupal\Core\Entity\ContentEntityDeleteForm;
 
 /**
  * Provides a form for deleting Fedora resource entities.
  *
- * @ingroup islandoraclaw
+ * @ingroup islandora
  */
 class FedoraResourceDeleteForm extends ContentEntityDeleteForm {
 

src/Form/FedoraResourceForm.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\islandoraclaw\Form;
+namespace Drupal\islandora\Form;
 
 use Drupal\Core\Entity\ContentEntityForm;
 use Drupal\Core\Form\FormStateInterface;
@@ -8,7 +8,7 @@ use Drupal\Core\Form\FormStateInterface;
 /**
  * Form controller for Fedora resource edit forms.
  *
- * @ingroup islandoraclaw
+ * @ingroup islandora
  */
 class FedoraResourceForm extends ContentEntityForm {
 
@@ -16,7 +16,7 @@ class FedoraResourceForm extends ContentEntityForm {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    /* @var $entity \Drupal\islandoraclaw\Entity\FedoraResource */
+    /* @var $entity \Drupal\islandora\Entity\FedoraResource */
     $form = parent::buildForm($form, $form_state);
     $entity = $this->entity;
 

src/Form/FedoraResourceSettingsForm.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\islandoraclaw\Form;
+namespace Drupal\islandora\Form;
 
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
@@ -8,9 +8,9 @@ use Drupal\Core\Form\FormStateInterface;
 /**
  * Class FedoraResourceSettingsForm.
  *
- * @package Drupal\islandoraclaw\Form
+ * @package Drupal\islandora\Form
  *
- * @ingroup islandoraclaw
+ * @ingroup islandora
  */
 class FedoraResourceSettingsForm extends FormBase {
 

src/Form/FedoraResourceTypeDeleteForm.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\islandoraclaw\Form;
+namespace Drupal\islandora\Form;
 
 use Drupal\Core\Entity\EntityConfirmFormBase;
 use Drupal\Core\Form\FormStateInterface;

src/Form/FedoraResourceTypeForm.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\islandoraclaw\Form;
+namespace Drupal\islandora\Form;
 
 use Drupal\Core\Entity\EntityForm;
 use Drupal\Core\Form\FormStateInterface;
@@ -8,7 +8,7 @@ use Drupal\Core\Form\FormStateInterface;
 /**
  * Class FedoraResourceTypeForm.
  *
- * @package Drupal\islandoraclaw\Form
+ * @package Drupal\islandora\Form
  */
 class FedoraResourceTypeForm extends EntityForm {
 
@@ -32,11 +32,20 @@ class FedoraResourceTypeForm extends EntityForm {
       '#type' => 'machine_name',
       '#default_value' => $fedora_resource_type->id(),
       '#machine_name' => array(
-        'exists' => '\Drupal\islandoraclaw\Entity\FedoraResourceType::load',
+        'exists' => '\Drupal\islandora\Entity\FedoraResourceType::load',
       ),
       '#disabled' => !$fedora_resource_type->isNew(),
     );
 
+    $form['rdf_type'] = array(
+      '#type' => 'textfield',
+      '#title' => $this->t('RDF Type'),
+      '#maxlength' => 255,
+      '#default_value' => $fedora_resource_type->getRdfType(),
+      '#description' => $this->t('Base RDF type for this entity'),
+      '#required' => TRUE,
+    );
+
     /* You will need additional form elements for your custom properties. */
 
     return $form;

src/Plugin/Search/FedoraEntitySearch.php

@@ -1,10 +1,10 @@
 <?
 /**
  * @file
- * Contains \Drupal\islandoraclaw\Plugin\Search\FedoraEntitySearch.
+ * Contains \Drupal\islandora\Plugin\Search\FedoraEntitySearch.
  */
 
-namespace Drupal\islandoraclaw\Plugin\Search;
+namespace Drupal\islandora\Plugin\Search;
 
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Cache\CacheableMetadata;
@@ -20,7 +20,7 @@ use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Access\AccessibleInterface;
 use Drupal\Core\Database\Query\Condition;
 use Drupal\Core\Render\RendererInterface;
-use Drupal\islandoraclaw\FedoraResourceInterface;
+use Drupal\islandora\FedoraResourceInterface;
 use Drupal\search\Plugin\ConfigurableSearchPluginBase;
 use Drupal\search\Plugin\SearchIndexingInterface;
 use Drupal\search\SearchQuery;
@@ -175,7 +175,7 @@ class FedoraResourceSearch extends ConfigurableSearchPluginBase implements Acces
   }
 
   /**
-   * Constructs \Drupal\islandoraclaw\Plugin\Search\FedoraResourceSearch.
+   * Constructs \Drupal\islandora\Plugin\Search\FedoraResourceSearch.
    *
    * @param array $configuration
    *   A configuration array containing information about the plugin instance.
@@ -371,7 +371,7 @@ class FedoraResourceSearch extends ConfigurableSearchPluginBase implements Acces
     $results = array();
 
     // 'fedora_resource' comes from the entity type id declared
-    // in the annotation for \Drupal\islandoraclaw\Entity\FedoraResource.
+    // in the annotation for \Drupal\islandora\Entity\FedoraResource.
     // Replace this with your entity's type id.
     $entity_storage = $this->entityManager->getStorage('fedora_resource');
     $entity_render = $this->entityManager->getViewBuilder('fedora_resource');
@@ -498,7 +498,7 @@ class FedoraResourceSearch extends ConfigurableSearchPluginBase implements Acces
     }
 
     // 'fedora_resource' comes from the entity type id declared
-    // in the annotation for \Drupal\islandoraclaw\Entity\FedoraResource.
+    // in the annotation for \Drupal\islandora\Entity\FedoraResource.
     // Replace this with your entity's type id.
     $entity_storage = $this->entityManager->getStorage('fedora_resource');