From 66fc3c7f18e3ae9f561de545761bdeae5e8a1f70 Mon Sep 17 00:00:00 2001 From: Nick Ruest Date: Fri, 25 Nov 2016 12:28:34 -0500 Subject: [PATCH] Update CLAW-vagrant to fcrepo 4.7.0; Address #423. (#425) * Update CLAW-vagrant to fcrepo 4.7.1; Adress #423. * code review * LOTS OF UPDATES --- install/Vagrantfile | 2 +- install/configs/karaf/fcrepo_camel_toolbox.script | 2 +- .../karaf/islandora_indexing_triplestore.script | 2 +- install/configs/repository.json | 8 +++++--- install/configs/variables | 2 +- install/scripts/blazegraph.sh | 8 ++++++++ install/scripts/drupal.sh | 2 +- install/scripts/fcrepo.sh | 12 +++++++----- islandora | 2 +- 9 files changed, 26 insertions(+), 14 deletions(-) diff --git a/install/Vagrantfile b/install/Vagrantfile index b0ebe8b3b..81e5301b4 100644 --- a/install/Vagrantfile +++ b/install/Vagrantfile @@ -38,7 +38,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.box = "ubuntu/xenial64" # Setup the shared folder - home_dir = "/home/vagrant" + home_dir = "/home/ubuntu" config.vm.synced_folder "../", home_dir + "/islandora" config.vm.network :forwarded_port, guest: 8080, host: 8080 # Tomcat diff --git a/install/configs/karaf/fcrepo_camel_toolbox.script b/install/configs/karaf/fcrepo_camel_toolbox.script index 2cd030444..8efc7dbd9 100644 --- a/install/configs/karaf/fcrepo_camel_toolbox.script +++ b/install/configs/karaf/fcrepo_camel_toolbox.script @@ -1,3 +1,3 @@ -feature:repo-add mvn:org.fcrepo.camel/toolbox-features/4.6.0/xml/features +feature:repo-add mvn:org.fcrepo.camel/toolbox-features/4.6.2/xml/features feature:install fcrepo-service-activemq feature:install fcrepo-indexing-triplestore diff --git a/install/configs/karaf/islandora_indexing_triplestore.script b/install/configs/karaf/islandora_indexing_triplestore.script index 20f5c6579..93ca732af 100644 --- a/install/configs/karaf/islandora_indexing_triplestore.script +++ b/install/configs/karaf/islandora_indexing_triplestore.script @@ -1,2 +1,2 @@ -repo-add file:/home/vagrant/Alpaca/karaf/build/resources/main/features.xml +repo-add file:/home/ubuntu/Alpaca/karaf/build/resources/main/features.xml feature:install islandora-indexing-triplestore diff --git a/install/configs/repository.json b/install/configs/repository.json index f2774e8f4..909021f8f 100644 --- a/install/configs/repository.json +++ b/install/configs/repository.json @@ -7,8 +7,10 @@ "allowCreation" : true }, "storage" : { - "cacheName" : "FedoraRepository", - "cacheConfiguration" : "${fcrepo.ispn.configuration:config/infinispan/leveldb-default/infinispan.xml}", + "persistence": { + "type": "file", + "path" : "${fcrepo.object.directory:target/objects}" + }, "binaryStorage" : { "type" : "file", "directory" : "${fcrepo.binary.directory:target/binaries}", @@ -24,5 +26,5 @@ { "classname" : "org.fcrepo.auth.common.BypassSecurityServletAuthenticationProvider" } ] }, - "node-types" : ["fedora-node-types.cnd", "file:/home/vagrant/islandora/install/configs/claw.cnd"] + "node-types" : ["fedora-node-types.cnd", "file:/opt/fcrepo/configs/claw.cnd"] } diff --git a/install/configs/variables b/install/configs/variables index 5461cf65f..565c82637 100755 --- a/install/configs/variables +++ b/install/configs/variables @@ -2,7 +2,7 @@ HOME_DIR=$1 DOWNLOAD_DIR="$HOME_DIR/islandora/install/downloads" -FEDORA_VERSION=4.6.0 +FEDORA_VERSION=4.7.0 KARAF_VERSION=4.0.5 KARAF_DIR="/opt/karaf" KARAF_CLIENT="$KARAF_DIR/bin/client" diff --git a/install/scripts/blazegraph.sh b/install/scripts/blazegraph.sh index d81ff33c5..83ea2de03 100644 --- a/install/scripts/blazegraph.sh +++ b/install/scripts/blazegraph.sh @@ -16,8 +16,16 @@ cd /var/lib/tomcat7/webapps cp -v "$DOWNLOAD_DIR/bigdata-$BLAZEGRAPH_VERSION.war" "/var/lib/tomcat7/webapps/bigdata.war" chown tomcat7:tomcat7 /var/lib/tomcat7/webapps/bigdata.war +cd /opt +mkdir blazegraph +chown tomcat7:tomcat7 /opt/blazegraph + if [ $(grep -c 'com.bigdata.rdf.sail.webapp' /etc/default/tomcat7) -eq 0 ]; then echo "JAVA_OPTS=\"\$JAVA_OPTS -Dcom.bigdata.rdf.sail.webapp.ConfigParams.propertyFile=/var/lib/tomcat7/webapps/bigdata/WEB-INF/RWStore.properties\"" >> /etc/default/tomcat7 fi service tomcat7 restart +sleep 15 +sed -i 's|log4j.appender.ruleLog.File=rules.log|log4j.appender.ruleLog.File=/var/log/tomcat7/rules.log|g' /var/lib/tomcat7/webapps/bigdata/WEB-INF/classes/log4j.properties +sed -i 's|com.bigdata.journal.AbstractJournal.file=blazegraph.jnl|com.bigdata.journal.AbstractJournal.file=/opt/blazegraph/blazegraph.jnl|g' /var/lib/tomcat7/webapps/bigdata/WEB-INF/RWStore.properties +service tomcat7 restart diff --git a/install/scripts/drupal.sh b/install/scripts/drupal.sh index ca610b183..8b65aa5e0 100755 --- a/install/scripts/drupal.sh +++ b/install/scripts/drupal.sh @@ -107,7 +107,7 @@ cd "$DRUPAL_HOME/modules" git clone https://github.com/DiegoPino/claw-jsonld.git drush en -y jsonld -git clone git@github.com:Islandora-CLAW/islandora.git +git clone https://github.com/Islandora-CLAW/islandora.git drush en -y islandora # Set default theme to bootstrap diff --git a/install/scripts/fcrepo.sh b/install/scripts/fcrepo.sh index 534ea1a3d..d5c6c7877 100644 --- a/install/scripts/fcrepo.sh +++ b/install/scripts/fcrepo.sh @@ -18,16 +18,18 @@ if [ ! -d "/var/lib/tomcat7/fcrepo4-data" ]; then mkdir "/var/lib/tomcat7/fcrepo4-data" fi +cd /opt +mkdir -p fcrepo/configs +cp -v $HOME_DIR/islandora/install/configs/repository.json /opt/fcrepo/configs +cp -v $HOME_DIR/islandora/install/configs/claw.cnd /opt/fcrepo/configs +chown -hR tomcat7:tomcat7 /opt/fcrepo + chown tomcat7:tomcat7 /var/lib/tomcat7/fcrepo4-data chmod g-w /var/lib/tomcat7/fcrepo4-data -echo "CATALINA_OPTS=\"\${CATALINA_OPTS} -Dfcrepo.modeshape.configuration=classpath:/config/minimal-default/repository.json\"" >> /etc/default/tomcat7; +echo "CATALINA_OPTS=\"\${CATALINA_OPTS} -Dfcrepo.modeshape.configuration=file:///opt/fcrepo/configs/repository.json\"" >> /etc/default/tomcat7; cp -v "$DOWNLOAD_DIR/fcrepo-$FEDORA_VERSION.war" /var/lib/tomcat7/webapps/fcrepo.war chown tomcat7:tomcat7 /var/lib/tomcat7/webapps/fcrepo.war sed -i 's#JAVA_OPTS="-Djava.awt.headless=true -Xmx128m -XX:+UseConcMarkSweepGC"#JAVA_OPTS="-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m"#g' /etc/default/tomcat7 service tomcat7 restart - -sleep 10 -cp -v $HOME_DIR/islandora/install/configs/repository.json /var/lib/tomcat7/webapps/fcrepo/WEB-INF/classes/config/minimal-default/repository.json -service tomcat7 restart diff --git a/islandora b/islandora index f854309cb..d0abe9aee 160000 --- a/islandora +++ b/islandora @@ -1 +1 @@ -Subproject commit f854309cb04061309590bba4f2f0f6607779fae3 +Subproject commit d0abe9aee932e5b7da8dfe319a691ad21eaa0f31