From 946afb2e035794daec01cc4d83ed6ba25a36200b Mon Sep 17 00:00:00 2001
From: nruest <ruestn@gmail.com>
Date: Tue, 14 Apr 2015 22:40:56 -0400
Subject: [PATCH] Update fuskei to 2.0.0 and deploy via war. Closes #13.

---
 install/README.md   |  2 +-
 install/Vagrantfile |  2 --
 install/fuseki.sh   | 23 +++++++++++------------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/install/README.md b/install/README.md
index 65751ea5c..8802eb437 100644
--- a/install/README.md
+++ b/install/README.md
@@ -56,7 +56,7 @@ The default VM login details are:
 - Camel 2.14.1
 - Fedora 4.1.0
 - Fedora Camel Component 4.1.0
-- Fuseki 1.1.1
+- Fuseki 2.0
 - Sync 0.0.0
 - Islandora 7.x-2.x
 - PHP 5.5.9 
diff --git a/install/Vagrantfile b/install/Vagrantfile
index d427d3322..70f62f881 100644
--- a/install/Vagrantfile
+++ b/install/Vagrantfile
@@ -18,8 +18,6 @@ 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: 80, host: 8000 # Apache
-  config.vm.network :forwarded_port, guest: 8181, host: 8181 # Karaf
-  config.vm.network :forwarded_port, guest: 3030, host: 3030 # Fuseki
 
   config.vm.provider "virtualbox" do |vb|
     if ENV['VIM']
diff --git a/install/fuseki.sh b/install/fuseki.sh
index b581593de..ddcc4c40d 100644
--- a/install/fuseki.sh
+++ b/install/fuseki.sh
@@ -1,15 +1,14 @@
-echo "Installing Fuseki"
+FUSEKI_VERSION=2.0.0
+FUSEKI_DEPLOY=/var/lib/tomcat7/webapps
+FUSEKI_BASE=/etc/fuseki
 
-FUSEKI_VERSION=1.1.1
-FUSEKI_HOME=/usr/share/fuseki
-
-mkdir $FUSEKI_HOME
+mkdir $FUSEKI_BASE
+chown -hR tomcat7:tomcat7 $FUSEKI_BASE
 
 cd /tmp
-wget http://www.apache.org/dist/jena/binaries/jena-fuseki-"$FUSEKI_VERSION"-distribution.tar.gz
-tar -xzvf jena-fuseki-"$FUSEKI_VERSION"-distribution.tar.gz
-cd jena-fuseki-"$FUSEKI_VERSION"
-mv -v * $FUSEKI_HOME
-chown -hR tomcat7:tomcat7 $FUSEKI_HOME
-cd $FUSEKI_HOME
-./fuseki-server --update --mem /fcrepo &
+wget http://www.apache.org/dist/jena/binaries/apache-jena-fuseki-"$FUSEKI_VERSION".tar.gz
+tar -xzvf apache-jena-fuseki-"$FUSEKI_VERSION".tar.gz
+cd apache-jena-fuseki-"$FUSEKI_VERSION"
+mv -v fuseki.war $FUSEKI_DEPLOY
+chown -hR tomcat7:tomcat7 $FUSEKI_DEPLOY/fuseki.war
+service tomcat7 restart