From 5962c4732865a6c10f27993bac53aa921266f56c Mon Sep 17 00:00:00 2001 From: nruest Date: Sat, 29 Oct 2016 00:17:07 -0400 Subject: [PATCH 1/3] Move to Solr 6.2.1; Address #379. --- Alpaca | 2 +- install/README.md | 2 +- install/Vagrantfile | 1 + install/configs/variables | 3 +-- install/scripts/solr.sh | 31 ++++--------------------------- islandora | 2 +- 6 files changed, 9 insertions(+), 32 deletions(-) diff --git a/Alpaca b/Alpaca index e16d33799..6cdd0d784 160000 --- a/Alpaca +++ b/Alpaca @@ -1 +1 @@ -Subproject commit e16d337995b457f6128b17938341895b33c4570b +Subproject commit 6cdd0d7843a6fe6af6362c7695edcade3585930a diff --git a/install/README.md b/install/README.md index 404394f8a..de0996e12 100644 --- a/install/README.md +++ b/install/README.md @@ -88,7 +88,7 @@ The default VM login details are: - MySQL 5.7.15 - Apache 2.4.18 - Tomcat 7.0.68.0 -- Solr 4.10.3 +- Solr 6.2.1 - Camel 2.15.1 - Fedora 4.6.0 - Fedora Camel Component 4.4.0 diff --git a/install/Vagrantfile b/install/Vagrantfile index 012246e6e..4ff919b00 100644 --- a/install/Vagrantfile +++ b/install/Vagrantfile @@ -47,6 +47,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.network :forwarded_port, guest: 3306, host: 3306 # MySQL config.vm.network :forwarded_port, guest: 5432, host: 5432 # PostgreSQL config.vm.network :forwarded_port, guest: 8383, host: 8383 # Loris + config.vm.network :forwarded_port, guest: 8983, host: 8983 # Solr config.vm.provider "virtualbox" do |vb| vb.customize ["modifyvm", :id, "--memory", $memory] diff --git a/install/configs/variables b/install/configs/variables index 6c8bb57cf..767c22bea 100755 --- a/install/configs/variables +++ b/install/configs/variables @@ -8,8 +8,7 @@ KARAF_DIR="/opt/karaf" KARAF_CLIENT="$KARAF_DIR/bin/client" KARAF_CONFIGS="$HOME_DIR/islandora/install/configs/karaf/" CAMEL_VERSION=4.4.0 -SOLR_VERSION=4.10.3 -SOLR_HOME="/var/lib/tomcat7/solr" +SOLR_VERSION=6.2.1 BLAZEGRAPH_VERSION=2.1.4 DRUPAL_HOME="/var/www/html/drupal" DRUPAL_VERSION=8.1.8 diff --git a/install/scripts/solr.sh b/install/scripts/solr.sh index 55d9a754f..57bde63c5 100644 --- a/install/scripts/solr.sh +++ b/install/scripts/solr.sh @@ -13,32 +13,9 @@ if [ ! -f "$DOWNLOAD_DIR/solr-$SOLR_VERSION.tgz" ]; then wget -q -O "$DOWNLOAD_DIR/solr-$SOLR_VERSION.tgz" "http://archive.apache.org/dist/lucene/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz" fi -# Prepare SOLR_HOME -if [ ! -d "$SOLR_HOME" ]; then - mkdir "$SOLR_HOME" -fi - cp -v "$DOWNLOAD_DIR/solr-$SOLR_VERSION.tgz" /tmp cd /tmp -tar -xzf solr-"$SOLR_VERSION".tgz -cp "solr-$SOLR_VERSION/dist/solr-$SOLR_VERSION.war" /var/lib/tomcat7/webapps/solr.war -chown tomcat7:tomcat7 /var/lib/tomcat7/webapps/solr.war - -if [ ! -f "$DOWNLOAD_DIR/commons-logging-1.1.2.jar" ]; then - echo "Downloading commons-logging-1.1.2.jar" - wget -q -O "$DOWNLOAD_DIR/commons-logging-1.1.2.jar" "http://repo1.maven.org/maven2/commons-logging/commons-logging/1.1.2/commons-logging-1.1.2.jar" -fi -cp "$DOWNLOAD_DIR/commons-logging-1.1.2.jar" /usr/share/tomcat7/lib -cp /tmp/solr-"$SOLR_VERSION"/example/lib/ext/slf4j* /usr/share/tomcat7/lib -cp /tmp/solr-"$SOLR_VERSION"/example/lib/ext/log4j* /usr/share/tomcat7/lib - -chown -hR tomcat7:tomcat7 /usr/share/tomcat7/lib - -cp -R /tmp/solr-"$SOLR_VERSION"/example/solr/* "$SOLR_HOME" - -chown -hR tomcat7:tomcat7 "$SOLR_HOME" - -touch /var/lib/tomcat7/velocity.log -chown tomcat7:tomcat7 /var/lib/tomcat7/velocity.log - -service tomcat7 restart +tar xzf solr-"$SOLR_VERSION".tgz solr-"$SOLR_VERSION"/bin/install_solr_service.sh --strip-components=2 +bash ./install_solr_service.sh solr-"$SOLR_VERSION".tgz +cd /opt/solr +sudo -u solr bin/solr create_core -c CLAW diff --git a/islandora b/islandora index 8a0fb3c0f..3158fc97a 160000 --- a/islandora +++ b/islandora @@ -1 +1 @@ -Subproject commit 8a0fb3c0f2477f32e41b7dc5295b33e9634e2c6e +Subproject commit 3158fc97aa9e333ebd85632c767b37897793d397 From c22c2520ddc4c3101176b9cdf9a69e98524d0afc Mon Sep 17 00:00:00 2001 From: nruest Date: Tue, 1 Nov 2016 09:51:26 -0400 Subject: [PATCH 2/3] fix submodules --- .gitmodules | 26 +++++++++++++++----------- Alpaca | 2 +- islandora | 2 +- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.gitmodules b/.gitmodules index 73138008b..c720ce272 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,16 +1,20 @@ [submodule "Crayfish"] - path = Crayfish - url = https://github.com/Islandora-CLAW/Crayfish + path = Crayfish + url = https://github.com/Islandora-CLAW/Crayfish + branch = master [submodule "Alpaca"] - path = Alpaca - url = https://github.com/Islandora-CLAW/Alpaca + path = Alpaca + url = https://github.com/Islandora-CLAW/Alpaca + branch = master [submodule "pdx"] - path = pdx - url = https://github.com/Islandora-CLAW/pdx + path = pdx + url = https://github.com/Islandora-CLAW/pdx + branch = master [submodule "chullo"] - path = chullo - url = https://github.com/Islandora-CLAW/chullo + path = chullo + url = https://github.com/Islandora-CLAW/chullo + branch = master [submodule "islandora"] - path = islandora - url = https://github.com/Islandora-CLAW/islandora - branch = 8.x-1.x + path = islandora + url = https://github.com/Islandora-CLAW/islandora + branch = 8.x-1.x diff --git a/Alpaca b/Alpaca index 6cdd0d784..958e14b6b 160000 --- a/Alpaca +++ b/Alpaca @@ -1 +1 @@ -Subproject commit 6cdd0d7843a6fe6af6362c7695edcade3585930a +Subproject commit 958e14b6b28f912b7cab303c3d88aac6cb7cdca7 diff --git a/islandora b/islandora index 3158fc97a..8a0fb3c0f 160000 --- a/islandora +++ b/islandora @@ -1 +1 @@ -Subproject commit 3158fc97aa9e333ebd85632c767b37897793d397 +Subproject commit 8a0fb3c0f2477f32e41b7dc5295b33e9634e2c6e From 1a19e1f9e32b1f567cb853666c188ca7f60b1833 Mon Sep 17 00:00:00 2001 From: nruest Date: Mon, 21 Nov 2016 22:10:55 -0500 Subject: [PATCH 3/3] rebase --- Alpaca | 2 +- Crayfish | 2 +- islandora | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Alpaca b/Alpaca index 958e14b6b..3cfce82c5 160000 --- a/Alpaca +++ b/Alpaca @@ -1 +1 @@ -Subproject commit 958e14b6b28f912b7cab303c3d88aac6cb7cdca7 +Subproject commit 3cfce82c59578b5c4214d609b4af58b8306b120f diff --git a/Crayfish b/Crayfish index c740b684f..bbd0dfd0a 160000 --- a/Crayfish +++ b/Crayfish @@ -1 +1 @@ -Subproject commit c740b684fa827209f241487aa5a2ca43dad01951 +Subproject commit bbd0dfd0aa1a6a0ca0bf6f743c3e07ec29daf4f7 diff --git a/islandora b/islandora index 8a0fb3c0f..f854309cb 160000 --- a/islandora +++ b/islandora @@ -1 +1 @@ -Subproject commit 8a0fb3c0f2477f32e41b7dc5295b33e9634e2c6e +Subproject commit f854309cb04061309590bba4f2f0f6607779fae3