From 2bdc72081f2f27d7e92e935ae4dd37437b8f93f3 Mon Sep 17 00:00:00 2001 From: dannylamb Date: Wed, 22 Nov 2017 15:11:03 -0400 Subject: [PATCH] Issue 640 (#55) * Adding UUID to gemini's schema on install * Setting config here instead of hook_install() in the core islandora module * Adding UUID to gemini's schema on install * Setting config here instead of hook_install() in the core islandora module * Fixing api-x install issue * Changing up feature deploy order * No longer pulling from my branches --- configs/drupal/filehash.settings.yml | 5 ++++ configs/drupal/rest.resource.entity.media.yml | 26 +++++++++++++++++++ configs/drupal/rest.resource.entity.node.yml | 21 +++++++++++++++ configs/gemini.sql | 1 + configs/karaf/alpaca.script | 10 ++----- 5 files changed, 55 insertions(+), 8 deletions(-) create mode 100644 configs/drupal/filehash.settings.yml create mode 100644 configs/drupal/rest.resource.entity.media.yml create mode 100644 configs/drupal/rest.resource.entity.node.yml diff --git a/configs/drupal/filehash.settings.yml b/configs/drupal/filehash.settings.yml new file mode 100644 index 0000000..aa9c188 --- /dev/null +++ b/configs/drupal/filehash.settings.yml @@ -0,0 +1,5 @@ +algos: + sha1: sha1 + md5: '0' + sha256: '0' +dedupe: false diff --git a/configs/drupal/rest.resource.entity.media.yml b/configs/drupal/rest.resource.entity.media.yml new file mode 100644 index 0000000..dc0c356 --- /dev/null +++ b/configs/drupal/rest.resource.entity.media.yml @@ -0,0 +1,26 @@ +langcode: en +status: true +dependencies: + enforced: + module: + - islandora + module: + - basic_auth + - jsonld + - jwt + - media_entity + - serialization + - user +id: entity.media +plugin_id: 'entity:media' +granularity: resource +configuration: + methods: + - GET + formats: + - jsonld + - json + authentication: + - basic_auth + - jwt_auth + - cookie diff --git a/configs/drupal/rest.resource.entity.node.yml b/configs/drupal/rest.resource.entity.node.yml new file mode 100644 index 0000000..e5c8e45 --- /dev/null +++ b/configs/drupal/rest.resource.entity.node.yml @@ -0,0 +1,21 @@ +langcode: en +status: true +dependencies: + module: + - basic_auth + - jsonld + - jwt + - node + - user +id: entity.node +plugin_id: 'entity:node' +granularity: resource +configuration: + methods: + - GET + formats: + - jsonld + authentication: + - basic_auth + - jwt_auth + - cookie diff --git a/configs/gemini.sql b/configs/gemini.sql index 9d7bed1..bfc18a6 100644 --- a/configs/gemini.sql +++ b/configs/gemini.sql @@ -1,6 +1,7 @@ create database gemini; CREATE TABLE gemini.Gemini ( id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY, + uuid VARCHAR(36) NOT NULL UNIQUE, drupal VARCHAR(2048) NOT NULL UNIQUE, fedora VARCHAR(2048) NOT NULL UNIQUE ) ENGINE=InnoDB; diff --git a/configs/karaf/alpaca.script b/configs/karaf/alpaca.script index dce0ee0..7d8b3b8 100644 --- a/configs/karaf/alpaca.script +++ b/configs/karaf/alpaca.script @@ -3,16 +3,10 @@ config:property-set -p org.fcrepo.apix.registry.http timeout.socket.ms 1000 feature:repo-add file:/home/ubuntu/Alpaca/karaf/build/resources/main/features.xml feature:repo-add mvn:org.fcrepo.apix/fcrepo-api-x-karaf/LATEST/xml/features -feature:install fcrepo-service-camel +feature:install islandora-http-client +feature:install fcrepo-api-x feature:install islandora-connector-broadcast - feature:install islandora-indexing-triplestore - feature:install islandora-indexing-fcrepo - -feature:install islandora-http-client - -feature:install fcrepo-api-x - feature:install fcrepo-indexing-triplestore