Browse Source

Part of https://github.com/Islandora-CLAW/CLAW/issues/475 (#27)

* Pulling islandora module back to the top

* Pulling dependencies from main composer.json into this module's

* Testing how module dependencies work

* Adding search_api to module depenedencies.

* Just .info is not enough

* Adding jsonld serializer to composer dependencies

* Changing vendor name and pointing to @DiegoPino's fork

* Adding keywords

* Adding phpcs back in

* Pointing to islandora org for jsonld serializer.
pull/756/head
dannylamb 8 years ago committed by Diego Pino Navarro
parent
commit
f537ea398a
  1. 2
      .travis.yml
  2. 25
      composer.json
  3. 0
      config/install/core.entity_form_display.fedora_resource.rdf_source.default.yml
  4. 0
      config/install/core.entity_view_mode.fedora_resource.teaser.yml
  5. 0
      config/install/field.field.fedora_resource.rdf_source.field_ldp_contains.yml
  6. 0
      config/install/field.storage.fedora_resource.rdf_source.field_ldp_contains.yml
  7. 0
      config/install/islandora.fedora_resource_type.non_rdf_source.yml
  8. 0
      config/install/islandora.fedora_resource_type.rdf_source.yml
  9. 0
      config/install/islandora.settings.yml
  10. 2
      config/install/rdf.mapping.fedora_resource_type.non_rdf_source.yml
  11. 0
      config/install/rdf.mapping.fedora_resource_type.rdf_source.yml
  12. 0
      config/install/rules.reaction.broadcast_create_event.yml
  13. 0
      config/install/rules.reaction.broadcast_delete_event.yml
  14. 0
      config/install/rules.reaction.broadcast_update_event.yml
  15. 0
      config/install/views.view.fedora_entities_reference.yml
  16. 0
      config/schema/fedora_resource_type.schema.yml
  17. 0
      fedora_resource.page.inc
  18. 1
      islandora.info.yml
  19. 0
      islandora.links.action.yml
  20. 0
      islandora.links.menu.yml
  21. 0
      islandora.links.task.yml
  22. 0
      islandora.module
  23. 0
      islandora.permissions.yml
  24. 0
      islandora.routing.yml
  25. 0
      islandora.services.yml
  26. 14
      islandora_collection/composer.json
  27. 21
      islandora_collection/config/install/field.field.fedora_resource.collection.field_description.yml
  28. 30
      islandora_collection/config/install/field.field.fedora_resource.collection.field_memberof.yml
  29. 21
      islandora_collection/config/install/field.storage.fedora_resource.field_description.yml
  30. 22
      islandora_collection/config/install/field.storage.fedora_resource.field_memberof.yml
  31. 9
      islandora_collection/config/install/islandora.fedora_resource_type.collection.yml
  32. 50
      islandora_collection/config/install/rdf.mapping.fedora_resource_type.collection.yml
  33. 5
      islandora_collection/islandora_collection.info.yml
  34. 24
      islandora_collection/islandora_collection.module
  35. 0
      src/Controller/FedoraResourceAddController.php
  36. 0
      src/Entity/FedoraResource.php
  37. 0
      src/Entity/FedoraResourceType.php
  38. 0
      src/Entity/FedoraResourceViewsData.php
  39. 0
      src/EventGenerator/EventGenerator.php
  40. 0
      src/EventGenerator/EventGeneratorActionBase.php
  41. 0
      src/EventGenerator/EventGeneratorInterface.php
  42. 0
      src/FedoraResourceAccessControlHandler.php
  43. 0
      src/FedoraResourceHtmlRouteProvider.php
  44. 0
      src/FedoraResourceInterface.php
  45. 0
      src/FedoraResourceListBuilder.php
  46. 0
      src/FedoraResourceTypeHtmlRouteProvider.php
  47. 0
      src/FedoraResourceTypeInterface.php
  48. 0
      src/FedoraResourceTypeListBuilder.php
  49. 0
      src/FedoraResourceViewBuilder.php
  50. 0
      src/Form/FedoraResourceDeleteForm.php
  51. 0
      src/Form/FedoraResourceEntityInlineForm.php
  52. 0
      src/Form/FedoraResourceForm.php
  53. 0
      src/Form/FedoraResourceSettingsForm.php
  54. 0
      src/Form/FedoraResourceTypeDeleteForm.php
  55. 0
      src/Form/FedoraResourceTypeForm.php
  56. 0
      src/Form/IslandoraSettingsForm.php
  57. 0
      src/ParamConverter/UuidEntityConverter.php
  58. 0
      src/Plugin/RulesAction/CreateEventGenerator.php
  59. 0
      src/Plugin/RulesAction/DeleteEventGenerator.php
  60. 0
      src/Plugin/RulesAction/UpdateEventGenerator.php
  61. 0
      src/Plugin/Search/FedoraEntitySearch.php
  62. 0
      src/Plugin/views/wizard/FedoraResource.php
  63. 0
      templates/fedora-resource-content-add-list.html.twig
  64. 0
      templates/fedora_resource.html.twig
  65. 0
      tests/src/Kernel/CreateEventGeneratorTest.php
  66. 0
      tests/src/Kernel/DeleteEventGeneratorTest.php
  67. 6
      tests/src/Kernel/EventGeneratorActionTestBase.php
  68. 0
      tests/src/Kernel/EventGeneratorTest.php
  69. 3
      tests/src/Kernel/EventGeneratorTestBase.php
  70. 3
      tests/src/Kernel/IslandoraKernelTestBase.php
  71. 0
      tests/src/Kernel/UpdateEventGeneratorTest.php
  72. 5
      tests/src/Kernel/VectorClockTest.php

2
.travis.yml

@ -33,7 +33,7 @@ install:
script:
- $ISLANDORA_DIR/.scripts/line_endings.sh .
- cd $HOME/drupal/modules/islandora
- php vendor/bin/phpcs --standard=Drupal **/*.module **/*.php --ignore=tests,vendor .
- php vendor/bin/phpcs --standard=Drupal --extensions=module/php,php/php src tests
- php vendor/bin/phpcpd --names *.module,*.inc,*.test,*.php --exclude=vendor .
- cd $HOME/drupal; php core/scripts/run-tests.sh --php `which php` islandora

25
composer.json

@ -1,14 +1,32 @@
{
"name": "drupal/islandora",
"description": "A client for interacting with a Fedora 4 server using CLAW microservices.",
"name": "islandora/islandora",
"description": "Core Islandora module",
"type": "drupal-module",
"keywords": ["Drupal", "Islandora"],
"homepage": "https://github.com/islandora-claw/islandora",
"support": {
"issues": "https://github.com/islandora-claw/CLAW/issues",
"irc": "irc://irc.freenode.net/islandora"
},
"repositories": [
{
"type": "composer",
"url": "https://packages.drupal.org/8"
},
{
"type": "vcs",
"url": "https://github.com/Islandora-CLAW/claw-jsonld"
}
],
"require": {
"drupal/inline_entity_form": "^1.0@beta",
"drupal/rules": "^3.0@alpha",
"drupal/search_api": "^1.0@beta",
"drupal/claw-jsonld": "dev-master"
},
"require-dev": {
"phpunit/phpunit": "^4.8",
"squizlabs/php_codesniffer": "2.7.1",
"drupal/coder": "*",
"sebastian/phpcpd": "*"
},
@ -18,7 +36,6 @@
"name": "Islandora Foundation",
"email": "community@islandora.ca",
"role": "Owner"
},
{
"name": "Daniel Lamb",
@ -31,4 +48,4 @@
"role": "Maintainer"
}
]
}
}

0
islandora/config/install/core.entity_form_display.fedora_resource.rdf_source.default.yml → config/install/core.entity_form_display.fedora_resource.rdf_source.default.yml

0
islandora/config/install/core.entity_view_mode.fedora_resource.teaser.yml → config/install/core.entity_view_mode.fedora_resource.teaser.yml

0
islandora/config/install/field.field.fedora_resource.rdf_source.field_ldp_contains.yml → config/install/field.field.fedora_resource.rdf_source.field_ldp_contains.yml

0
islandora/config/install/field.storage.fedora_resource.rdf_source.field_ldp_contains.yml → config/install/field.storage.fedora_resource.rdf_source.field_ldp_contains.yml

0
islandora/config/install/islandora.fedora_resource_type.non_rdf_source.yml → config/install/islandora.fedora_resource_type.non_rdf_source.yml

0
islandora/config/install/islandora.fedora_resource_type.rdf_source.yml → config/install/islandora.fedora_resource_type.rdf_source.yml

0
islandora/config/install/islandora.settings.yml → config/install/islandora.settings.yml

2
islandora/config/install/rdf.mapping.fedora_resource_type.non_rdf_source.yml → config/install/rdf.mapping.fedora_resource_type.non_rdf_source.yml

@ -40,4 +40,4 @@ fieldMappings:
ldp_contains:
properties:
- 'ldp:contains'
mapping_type: rel
mapping_type: rel

0
islandora/config/install/rdf.mapping.fedora_resource_type.rdf_source.yml → config/install/rdf.mapping.fedora_resource_type.rdf_source.yml

0
islandora/config/install/rules.reaction.broadcast_create_event.yml → config/install/rules.reaction.broadcast_create_event.yml

0
islandora/config/install/rules.reaction.broadcast_delete_event.yml → config/install/rules.reaction.broadcast_delete_event.yml

0
islandora/config/install/rules.reaction.broadcast_update_event.yml → config/install/rules.reaction.broadcast_update_event.yml

0
islandora/config/install/views.view.fedora_entities_reference.yml → config/install/views.view.fedora_entities_reference.yml

0
islandora/config/schema/fedora_resource_type.schema.yml → config/schema/fedora_resource_type.schema.yml

0
islandora/fedora_resource.page.inc → fedora_resource.page.inc

1
islandora/islandora.info.yml → islandora.info.yml

@ -14,4 +14,5 @@ dependencies:
- inline_entity_form
- jsonld
- rules
- search_api
version: '8.x-1.x-dev'

0
islandora/islandora.links.action.yml → islandora.links.action.yml

0
islandora/islandora.links.menu.yml → islandora.links.menu.yml

0
islandora/islandora.links.task.yml → islandora.links.task.yml

0
islandora/islandora.module → islandora.module

0
islandora/islandora.permissions.yml → islandora.permissions.yml

0
islandora/islandora.routing.yml → islandora.routing.yml

0
islandora/islandora.services.yml → islandora.services.yml

14
islandora_collection/composer.json

@ -1,14 +0,0 @@
{
"name": "drupal/islandora_collection",
"type": "drupal-module",
"description": "Islandora Collection",
"keywords": ["Drupal"],
"license": "GPL-2.0+",
"homepage": "https://www.drupal.org/project/islandora_collection",
"minimum-stability": "dev",
"support": {
"issues": "http://drupal.org/project/issues/islandora_collection",
"source": "http://cgit.drupalcode.org/islandora_collection"
},
"require": { }
}

21
islandora_collection/config/install/field.field.fedora_resource.collection.field_description.yml

@ -1,21 +0,0 @@
langcode: en
status: true
dependencies:
config:
- field.storage.fedora_resource.field_description
- islandora.fedora_resource_type.collection
enforced:
module:
- islandora_collection
id: fedora_resource.collection.field_description
field_name: field_description
entity_type: fedora_resource
bundle: collection
label: description
description: 'Description about the collection'
required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
field_type: string_long

30
islandora_collection/config/install/field.field.fedora_resource.collection.field_memberof.yml

@ -1,30 +0,0 @@
langcode: en
status: true
dependencies:
config:
- field.storage.fedora_resource.field_memberof
- islandora.fedora_resource_type.collection
enforced:
module:
- islandora_collection
id: fedora_resource.collection5.field_memberof
field_name: field_memberof
entity_type: fedora_resource
bundle: collection
label: memberOf
description: 'Other collections or bundles this collection is member of.'
required: false
translatable: false
default_value: { }
default_value_callback: ''
settings:
handler: 'default:fedora_resource'
handler_settings:
target_bundles:
collection: collection
sort:
field: _none
auto_create: false
auto_create_bundle: ''
field_type: entity_reference

21
islandora_collection/config/install/field.storage.fedora_resource.field_description.yml

@ -1,21 +0,0 @@
langcode: en
status: true
dependencies:
module:
- islandora
enforced:
module:
- islandora_collection
id: fedora_resource.field_description
field_name: field_description
entity_type: fedora_resource
type: string_long
settings:
case_sensitive: false
module: core
locked: false
cardinality: 1
translatable: true
indexes: { }
persist_with_no_fields: false
custom_storage: false

22
islandora_collection/config/install/field.storage.fedora_resource.field_memberof.yml

@ -1,22 +0,0 @@
langcode: en
status: true
dependencies:
module:
- islandora
enforced:
module:
- islandora_collection
id: fedora_resource.field_memberof
field_name: field_memberof
entity_type: fedora_resource
type: entity_reference
settings:
target_type: fedora_resource
module: core
locked: false
cardinality: 1
translatable: true
indexes: { }
persist_with_no_fields: false
custom_storage: false

9
islandora_collection/config/install/islandora.fedora_resource_type.collection.yml

@ -1,9 +0,0 @@
langcode: en
status: true
dependencies:
enforced:
module:
- islandora_collection
id: collection
label: Collection
description: 'Islandora Collection'

50
islandora_collection/config/install/rdf.mapping.fedora_resource_type.collection.yml

@ -1,50 +0,0 @@
langcode: en
status: true
dependencies:
config:
- islandora.fedora_resource_type.collection
module:
- islandora
enforced:
module:
- islandora_collection
id: fedora_resource.collection
targetEntityType: fedora_resource
bundle: collection
types:
- 'pcdm:Collection'
- 'schema:CollectionPage'
fieldMappings:
field_description:
properties:
- 'dc:description'
field_memberof:
properties:
- 'pcdm:memberOf'
uuid:
properties:
- 'islandora:hasURN'
name:
properties:
- 'dc:title'
created:
properties:
- 'schema:dateCreated'
datatype_callback:
callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
changed:
properties:
- 'schema:dateModified'
datatype_callback:
callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
rdf_type:
properties:
- 'rdf:type'
vclock:
properties:
- 'islandora:vclock'
uid:
properties:
- 'schema:author'
mapping_type: rel

5
islandora_collection/islandora_collection.info.yml

@ -1,5 +0,0 @@
name: islandora_collection
type: module
description: Islandora Collection
core: 8.x
package: islandora

24
islandora_collection/islandora_collection.module

@ -1,24 +0,0 @@
<?php
/**
* @file
* Contains islandora_collection.module..
*/
use Drupal\Core\Routing\RouteMatchInterface;
/**
* Implements hook_help().
*/
function islandora_collection_help($route_name, RouteMatchInterface $route_match) {
switch ($route_name) {
// Main module help for the islandora_collection module.
case 'help.page.islandora_collection':
$output = '';
$output .= '<h3>' . t('About') . '</h3>';
$output .= '<p>' . t('Islandora Collection') . '</p>';
return $output;
default:
}
}

0
islandora/src/Controller/FedoraResourceAddController.php → src/Controller/FedoraResourceAddController.php

0
islandora/src/Entity/FedoraResource.php → src/Entity/FedoraResource.php

0
islandora/src/Entity/FedoraResourceType.php → src/Entity/FedoraResourceType.php

0
islandora/src/Entity/FedoraResourceViewsData.php → src/Entity/FedoraResourceViewsData.php

0
islandora/src/EventGenerator/EventGenerator.php → src/EventGenerator/EventGenerator.php

0
islandora/src/EventGenerator/EventGeneratorActionBase.php → src/EventGenerator/EventGeneratorActionBase.php

0
islandora/src/EventGenerator/EventGeneratorInterface.php → src/EventGenerator/EventGeneratorInterface.php

0
islandora/src/FedoraResourceAccessControlHandler.php → src/FedoraResourceAccessControlHandler.php

0
islandora/src/FedoraResourceHtmlRouteProvider.php → src/FedoraResourceHtmlRouteProvider.php

0
islandora/src/FedoraResourceInterface.php → src/FedoraResourceInterface.php

0
islandora/src/FedoraResourceListBuilder.php → src/FedoraResourceListBuilder.php

0
islandora/src/FedoraResourceTypeHtmlRouteProvider.php → src/FedoraResourceTypeHtmlRouteProvider.php

0
islandora/src/FedoraResourceTypeInterface.php → src/FedoraResourceTypeInterface.php

0
islandora/src/FedoraResourceTypeListBuilder.php → src/FedoraResourceTypeListBuilder.php

0
islandora/src/FedoraResourceViewBuilder.php → src/FedoraResourceViewBuilder.php

0
islandora/src/Form/FedoraResourceDeleteForm.php → src/Form/FedoraResourceDeleteForm.php

0
islandora/src/Form/FedoraResourceEntityInlineForm.php → src/Form/FedoraResourceEntityInlineForm.php

0
islandora/src/Form/FedoraResourceForm.php → src/Form/FedoraResourceForm.php

0
islandora/src/Form/FedoraResourceSettingsForm.php → src/Form/FedoraResourceSettingsForm.php

0
islandora/src/Form/FedoraResourceTypeDeleteForm.php → src/Form/FedoraResourceTypeDeleteForm.php

0
islandora/src/Form/FedoraResourceTypeForm.php → src/Form/FedoraResourceTypeForm.php

0
islandora/src/Form/IslandoraSettingsForm.php → src/Form/IslandoraSettingsForm.php

0
islandora/src/ParamConverter/UuidEntityConverter.php → src/ParamConverter/UuidEntityConverter.php

0
islandora/src/Plugin/RulesAction/CreateEventGenerator.php → src/Plugin/RulesAction/CreateEventGenerator.php

0
islandora/src/Plugin/RulesAction/DeleteEventGenerator.php → src/Plugin/RulesAction/DeleteEventGenerator.php

0
islandora/src/Plugin/RulesAction/UpdateEventGenerator.php → src/Plugin/RulesAction/UpdateEventGenerator.php

0
islandora/src/Plugin/Search/FedoraEntitySearch.php → src/Plugin/Search/FedoraEntitySearch.php

0
islandora/src/Plugin/views/wizard/FedoraResource.php → src/Plugin/views/wizard/FedoraResource.php

0
islandora/templates/fedora-resource-content-add-list.html.twig → templates/fedora-resource-content-add-list.html.twig

0
islandora/templates/fedora_resource.html.twig → templates/fedora_resource.html.twig

0
islandora/tests/src/Kernel/CreateEventGeneratorTest.php → tests/src/Kernel/CreateEventGeneratorTest.php

0
islandora/tests/src/Kernel/DeleteEventGeneratorTest.php → tests/src/Kernel/DeleteEventGeneratorTest.php

6
islandora/tests/src/Kernel/EventGeneratorActionTestBase.php → tests/src/Kernel/EventGeneratorActionTestBase.php

@ -2,10 +2,6 @@
namespace Drupal\Tests\islandora\Kernel;
use Drupal\islandora\Entity\FedoraResource;
use Drupal\islandora\EventGenerator\EventGenerator;
use Drupal\simpletest\UserCreationTrait;
/**
* Base class for testing EventGenerator functionality.
*/
@ -31,7 +27,7 @@ abstract class EventGeneratorActionTestBase extends EventGeneratorTestBase {
public function setUp() {
parent::setUp();
// Get the action manager
// Get the action manager.
$this->actionManager = $this->container->get('plugin.manager.rules_action');
}

0
islandora/tests/src/Kernel/EventGeneratorTest.php → tests/src/Kernel/EventGeneratorTest.php

3
islandora/tests/src/Kernel/EventGeneratorTestBase.php → tests/src/Kernel/EventGeneratorTestBase.php

@ -3,7 +3,6 @@
namespace Drupal\Tests\islandora\Kernel;
use Drupal\islandora\Entity\FedoraResource;
use Drupal\islandora\EventGenerator\EventGenerator;
use Drupal\simpletest\UserCreationTrait;
/**
@ -45,7 +44,7 @@ abstract class EventGeneratorTestBase extends IslandoraKernelTestBase {
"name" => "Test Fixture",
"langcode" => "und",
"status" => 1,
]);
]);
$this->entity->save();
}

3
islandora/tests/src/Kernel/IslandoraKernelTestBase.php → tests/src/Kernel/IslandoraKernelTestBase.php

@ -29,7 +29,7 @@ abstract class IslandoraKernelTestBase extends KernelTestBase {
'typed_data',
'rules',
'jsonld',
'islandora'
'islandora',
];
/**
@ -46,4 +46,3 @@ abstract class IslandoraKernelTestBase extends KernelTestBase {
}
}

0
islandora/tests/src/Kernel/UpdateEventGeneratorTest.php → tests/src/Kernel/UpdateEventGeneratorTest.php

5
islandora/tests/src/Kernel/VectorClockTest.php → tests/src/Kernel/VectorClockTest.php

@ -3,7 +3,6 @@
namespace Drupal\Tests\islandora\Kernel;
use Drupal\islandora\Entity\FedoraResource;
use Drupal\simpletest\UserCreationTrait;
/**
* Tests the basic behavior of a vector clock.
@ -33,7 +32,7 @@ class VectorClockTest extends IslandoraKernelTestBase {
"name" => "Test Fixture",
"langcode" => "und",
"status" => 1,
]);
]);
$this->entity->save();
}
@ -46,7 +45,7 @@ class VectorClockTest extends IslandoraKernelTestBase {
public function testVectorClock() {
// Check the vclock is set to 0 when a new entity is created.
$this->assertTrue($this->entity->getVclock() == 0, "Vector clock must be initialized to zero.");
// Edit the entity.
$this->entity->setName("Edited Test Fixture")->save();
Loading…
Cancel
Save