Issue 572 (#50)

* Install openseadragon and fix cantaloupe.

* Configure cantaloupe and install openseadragon

* Switch to Islandora-CLAW organization

Author: whikloj

Vagrantfile

@@ -49,6 +49,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provision :shell, :path => "./scripts/activemq.sh", :args => home_dir
   config.vm.provision :shell, :path => "./scripts/composer.sh", :args => home_dir, :privileged =>false
   config.vm.provision :shell, :path => "./scripts/drupal.sh", :args => home_dir
+  config.vm.provision :shell, :path => "./scripts/openseadragon.sh", :args => home_dir
   config.vm.provision :shell, :path => "./scripts/fcrepo.sh", :args => home_dir
   config.vm.provision :shell, :path => "./scripts/blazegraph.sh", :args => home_dir
   config.vm.provision :shell, :path => "./scripts/syn.sh", :args => home_dir

configs/cantaloupe/cantaloupe.properties

@@ -126,7 +126,7 @@ FilesystemResolver.lookup_strategy = BasicLookupStrategy
 
 # Server-side path that will be prefixed to the identifier in the URL.
 # Trailing slash is important.
-FilesystemResolver.BasicLookupStrategy.path_prefix = /opt/cantaloupe/images/
+FilesystemResolver.BasicLookupStrategy.path_prefix = /var/www/html/drupal/web/
 
 
 # Server-side path or extension that will be suffixed to the identifier in
@@ -321,7 +321,7 @@ KakaduProcessor.path_to_binaries =
 
 # Optional absolute path of the directory containing the OpenJPEG binaries.
 # Overrides the PATH.
-OpenJpegProcessor.path_to_binaries = /usr/local/bin
+OpenJpegProcessor.path_to_binaries = /opt/openjpeg/bin
 
 #----------------------------------------
 # PdfBoxProcessor

configs/variables

@@ -18,3 +18,6 @@ MYSQL_USER=root
 MYSQL_PASS=islandora
 MYSQL_CONNECTOR_VERSION=6.0.4
 ACTIVEMQ_VERSION=5.14.5
+OPENSEADRAGON_VERSION=2.2.1
+CANTALOUPE_VERSION=3.3.1
+OPENJPEG_VERSION=2.1.2

scripts/activemq.sh

@@ -16,4 +16,7 @@ cp "$DOWNLOAD_DIR/apache-activemq-$ACTIVEMQ_VERSION-bin.tar.gz" /tmp
 tar -xzf "$DOWNLOAD_DIR/apache-activemq-$ACTIVEMQ_VERSION-bin.tar.gz" -C /opt
 mv /opt/apache-activemq-$ACTIVEMQ_VERSION /opt/activemq
 chown -hR ubuntu:ubuntu /opt/activemq
-/opt/activemq/bin/activemq start
+
+ln -snf /opt/activemq/bin/activemq /etc/init.d/activemq
+update-rc.d activemq defaults
+service activemq start

scripts/cantaloupe.sh

@@ -7,36 +7,30 @@ if [ -f "$HOME_DIR/islandora/configs/variables" ]; then
   . "$HOME_DIR"/islandora/configs/variables
 fi
 
-if [ ! -f "$DOWNLOAD_DIR/cantaloupe.zip" ]; then
-  echo "Downloading Cantaloupe"
-  wget -q -O "$DOWNLOAD_DIR/cantaloupe.zip" "https://github.com/medusa-project/cantaloupe/releases/download/v3.3/Cantaloupe-3.3.zip"
+if [ ! -f "$DOWNLOAD_DIR/Cantaloupe-${CANTALOUPE_VERSION}.zip" ]; then
+  echo "Downloading Cantaloupe version ${CANTALOUPE_VERSION}"
+  wget -q -O "$DOWNLOAD_DIR/Cantaloupe-${CANTALOUPE_VERSION}.zip" "https://github.com/medusa-project/cantaloupe/releases/download/v${CANTALOUPE_VERSION}/Cantaloupe-${CANTALOUPE_VERSION}.zip"
 fi
 
-if [ ! -f "$DOWNLOAD_DIR/openjpeg-source.tar.gz" ]; then
-  echo "Downloading OpenJPEG"
-  wget -q -O "$DOWNLOAD_DIR/openjpeg-source.tar.gz" "https://github.com/uclouvain/openjpeg/archive/v2.1.2.tar.gz"
+if [ ! -f "$DOWNLOAD_DIR/openjpeg-v${OPENJPEG_VERSION}-linux-x86_64.tar.gz" ]; then
+  echo "Downloading OpenJPEG ${OPENJPEG_VERSION}"
+  wget -q -O "$DOWNLOAD_DIR/openjpeg-v${OPENJPEG_VERSION}-linux-x86_64.tar.gz" "https://github.com/uclouvain/openjpeg/releases/download/v${OPENJPEG_VERSION}/openjpeg-v${OPENJPEG_VERSION}-linux-x86_64.tar.gz"
 fi
 
-apt-get -y -qq install liblcms2-dev
-apt-get -y -qq install libpng-dev
-apt-get -y -qq install libtiff-dev
-apt-get -y -qq install cmake
-
-tar -xvzf "$DOWNLOAD_DIR/openjpeg-source.tar.gz" -C /tmp 
-mkdir "/tmp/openjpeg-2.1.2/build"
-cd "/tmp/openjpeg-2.1.2/build"
-cmake ..
-make
-make install
-ldconfig
+tar xf "$DOWNLOAD_DIR/openjpeg-v${OPENJPEG_VERSION}-linux-x86_64.tar.gz" -C /opt
+mv "/opt/openjpeg-v${OPENJPEG_VERSION}-linux-x86_64" /opt/openjpeg
 
 mkdir /opt/cantaloupe
 mkdir /opt/cantaloupe/images
 mkdir /var/log/cantaloupe
-unzip "$DOWNLOAD_DIR/cantaloupe.zip" -d /opt/cantaloupe
+unzip "$DOWNLOAD_DIR/Cantaloupe-${CANTALOUPE_VERSION}.zip" -d /opt/cantaloupe
 cp "$HOME_DIR/islandora/configs/cantaloupe/cantaloupe.properties" "/opt/cantaloupe/cantaloupe.properties"
-echo 'CATALINA_OPTS="${CATALINA_OPTS} -Dcantaloupe.config=/opt/cantaloupe/cantaloupe.properties"' >> /etc/default/tomcat8
+echo 'CATALINA_OPTS="${CATALINA_OPTS} -Dcantaloupe.config=/opt/cantaloupe/cantaloupe.properties -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true"' >> /etc/default/tomcat8
 chown -R tomcat8:tomcat8 /opt/cantaloupe
 chown -R tomcat8:tomcat8 /var/log/cantaloupe
 service tomcat8 restart
-mv /opt/cantaloupe/Cantaloupe-3.3/Cantaloupe-3.3.war /var/lib/tomcat8/webapps/cantaloupe.war
+mv /opt/cantaloupe/Cantaloupe-${CANTALOUPE_VERSION}/Cantaloupe-${CANTALOUPE_VERSION}.war /var/lib/tomcat8/webapps/cantaloupe.war
+
+cd $DRUPAL_HOME
+$DRUPAL_CMD config:override openseadragon.settings iiif_server "http://localhost:8080/cantaloupe/iiif/2"
+

scripts/openseadragon.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+echo "Installing OpenSeadragon module and libraries"
+
+HOME_DIR=$1
+
+if [ -f "$HOME_DIR/islandora/configs/variables" ]; then
+  . "$HOME_DIR"/islandora/configs/variables
+fi
+
+cd $DRUPAL_HOME
+composer require drupal/libraries dev-3.x
+
+cd "$DRUPAL_HOME/web/modules/contrib"
+# Cloning openseadragon module down
+git clone https://github.com/Islandora-CLAW/openseadragon.git
+cd openseadragon
+$DRUSH_CMD en -y openseadragon
+
+# Copy openseadragon library definition to correct location.
+cp openseadragon.json "$DRUPAL_HOME/web/sites/default/files/library-definitions/"
+
+if [ ! -f "$DOWNLOAD_DIR/openseadragon-bin-${OPENSEADRAGON_VERSION}.tar.gz" ]; then
+  wget -O "$DOWNLOAD_DIR/openseadragon-bin-${OPENSEADRAGON_VERSION}.tar.gz" "https://github.com/openseadragon/openseadragon/releases/download/v${OPENSEADRAGON_VERSION}/openseadragon-bin-${OPENSEADRAGON_VERSION}.tar.gz"
+fi
+
+cd "$DRUPAL_HOME/web/sites/"
+if [ ! -d "all/assets/vendor" ]; then
+  mkdir -p all/assets/vendor
+fi
+
+cp "$DOWNLOAD_DIR/openseadragon-bin-${OPENSEADRAGON_VERSION}.tar.gz" .
+tar xf "$DOWNLOAD_DIR/openseadragon-bin-${OPENSEADRAGON_VERSION}.tar.gz" -C "$DRUPAL_HOME/web/sites/all/assets/vendor"
+cd "$DRUPAL_HOME/web/sites/all/assets/vendor"
+mv "openseadragon-bin-${OPENSEADRAGON_VERSION}" openseadragon
+