--- a/dev/README.md	Tue Nov 08 15:48:01 2016 +0100
+++ b/dev/README.md	Tue Nov 08 18:23:01 2016 +0100
@@ -2,9 +2,9 @@
 
 ## Bootstraping
 
-* Copier ubuntu-bootstrap sur le serveur
+* Copier `bootstrap-puppet.sh` sur le serveur
 
-* executer le script (sudo): `sudo ./ubuntu-bootstrap.sh`. Ce script installe l'agent puppet et ces dépendances.
+* executer le script (sudo): `sudo ./bootstrap-puppet.sh`. Ce script installe l'agent puppet et ces dépendances.
 
 * ajouter l'utilisateur courant au groupe `puppet`
 

--- a/dev/provisioning/custom.yaml.tmpl	Tue Nov 08 15:48:01 2016 +0100
+++ b/dev/provisioning/custom.yaml.tmpl	Tue Nov 08 18:23:01 2016 +0100
@@ -18,10 +18,10 @@
 # database server port
 sysconfig::params::db_port : 3306
 
-# sesame host
-sysconfig::params::sesame_host : 127.0.0.1
-# sesame port
-sysconfig::params::sesame_port : 8080
+# rdf4j host
+sysconfig::params::rdf4j_host : 127.0.0.1
+# rdf4j port
+sysconfig::params::rdf4j_port : 8080
 
 # elasticsearch host
 sysconfig::params::es_host     : 127.0.0.1

--- a/dev/provisioning/default.pp	Tue Nov 08 15:48:01 2016 +0100
+++ b/dev/provisioning/default.pp	Tue Nov 08 18:23:01 2016 +0100
@@ -29,8 +29,8 @@
 # install tomcat
 class { 'sysconfig::tomcat': }
 
-# install sesame
-class { 'sysconfig::sesame': }->
+# install rdf4j
+class { 'sysconfig::rdf4j': }->
 
 # install elasticsearch
 class { 'sysconfig::elasticsearch': }->

--- a/dev/provisioning/modules/archive/CHANGELOG.md	Tue Nov 08 15:48:01 2016 +0100
+++ b/dev/provisioning/modules/archive/CHANGELOG.md	Tue Nov 08 18:23:01 2016 +0100
@@ -1,3 +1,9 @@
+## 2016-08-18 - Release 0.9.0
+
+- Allow to pass $path to init class (fix #63)
+- Add fail_on_http_error parameter to archive::download (fix #64)
+- Fix tests with Puppet 4 (fix #66)
+
 ## 2015-08-21 - Release 0.8.1
 
 Use docker for acceptance tests

--- a/dev/provisioning/modules/archive/Gemfile	Tue Nov 08 15:48:01 2016 +0100
+++ b/dev/provisioning/modules/archive/Gemfile	Tue Nov 08 18:23:01 2016 +0100
@@ -2,7 +2,7 @@
 
 group :development, :unit_tests do
   gem 'rake',                                              :require => false
-  gem 'rspec', '< 3.2',                                    :require => false if RUBY_VERSION =~ /^1.8/
+  gem 'rspec',                                             :require => false
   gem 'rspec-puppet',                                      :require => false
   gem 'puppetlabs_spec_helper',                            :require => false
   gem 'metadata-json-lint',                                :require => false
@@ -17,12 +17,12 @@
   gem 'puppet-lint-trailing_comma-check',                  :require => false
   gem 'puppet-lint-file_ensure-check',                     :require => false
   gem 'puppet-lint-version_comparison-check',              :require => false
-  gem 'puppet-lint-fileserver-check',                      :require => false
   gem 'puppet-lint-file_source_rights-check',              :require => false
   gem 'puppet-lint-alias-check',                           :require => false
   gem 'rspec-puppet-facts',                                :require => false
-  gem 'github_changelog_generator',                        :require => false, :git => 'https://github.com/raphink/github-changelog-generator.git', :branch => 'dev/all_patches' if RUBY_VERSION !~ /^1.8/
-  gem 'puppet-blacksmith',                                 :require => false if RUBY_VERSION !~ /^1.8/
+  gem 'ruby-augeas',                                       :require => false
+  gem 'puppet-blacksmith',                                 :require => false if RUBY_VERSION !~ /^1\./
+  gem 'json_pure', '< 2.0.2',                              :require => false
 end
 
 group :system_tests do
@@ -30,6 +30,7 @@
   gem 'beaker-rspec',        :require => false
   gem 'beaker_spec_helper',  :require => false
   gem 'serverspec',          :require => false
+  gem 'specinfra',           :require => false
 end
 
 if facterversion = ENV['FACTER_GEM_VERSION']

--- a/dev/provisioning/modules/archive/Rakefile	Tue Nov 08 15:48:01 2016 +0100
+++ b/dev/provisioning/modules/archive/Rakefile	Tue Nov 08 18:23:01 2016 +0100
@@ -4,20 +4,14 @@
 Rake::Task[:lint].clear
 PuppetLint::RakeTask.new :lint do |config|
   config.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp", "vendor/**/*.pp"]
-  config.disable_checks = ['80chars']
+  config.disable_checks = ['140chars']
   config.fail_on_warnings = true
 end
 
 PuppetSyntax.exclude_paths = ["spec/fixtures/**/*.pp", "vendor/**/*"]
 
 # Publishing tasks
-unless RUBY_VERSION =~ /^1\.8/
+unless RUBY_VERSION =~ /^1\./
   require 'puppet_blacksmith'
   require 'puppet_blacksmith/rake_tasks'
-  require 'github_changelog_generator/task'
-  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-    m = Blacksmith::Modulefile.new
-    config.future_release = m.version
-    config.release_url = "https://forge.puppetlabs.com/#{m.author}/#{m.name}/%s"
-  end
 end

--- a/dev/provisioning/modules/archive/checksums.json	Tue Nov 08 15:48:01 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-{
-  "CHANGELOG.md": "a270fbc0eb53304a62eb8fb978a5d499",
-  "Gemfile": "fd6a01b07d9008b04417c33e02b4c931",
-  "LICENSE": "3b83ef96387f14655fc854ddc3c6bd57",
-  "README.md": "90d767333b620a8d037bf4282565028e",
-  "Rakefile": "2ca51e1c85d1459ea347efd2213afe73",
-  "manifests/download.pp": "116b320a8a1807f30930b836fbf766bf",
-  "manifests/extract.pp": "1d0a1db6fc107f28576e69199303b040",
-  "manifests/init.pp": "af167aa777f83c05e8c4b5adfde4fe5e",
-  "manifests/tar_gz.pp": "0cf28ed9d33375b7d0addf4190fe6b3c",
-  "manifests/zip.pp": "151b78d9eae3310881690e5c00123c7a",
-  "metadata.json": "6184f3b55064035518567f9193c52b47",
-  "spec/acceptance/nodesets/centos-5-x86_64-docker.yml": "916223adf56a5eae28fc4dbc8d3d5d09",
-  "spec/acceptance/nodesets/centos-6-x86_64-docker.yml": "79ee475e5497307c173a1aba59e1a206",
-  "spec/acceptance/nodesets/centos-6-x86_64-openstack.yml": "5509e2ebb2bee49bec7905141d91535b",
-  "spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml": "f973bde1c355b0af3ba5c08e02311580",
-  "spec/acceptance/nodesets/centos-7-x86_64-docker.yml": "1d4713c4b0788eaaed0a5767ba0268d4",
-  "spec/acceptance/nodesets/centos-7-x86_64-openstack.yml": "554374fca1889b858d90a81226578b82",
-  "spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml": "82b8ada243c70d9a2d8c9a3a4385416c",
-  "spec/acceptance/nodesets/debian-6-x86_64-docker.yml": "d6cb2154bf149715439b5bc64ef627bc",
-  "spec/acceptance/nodesets/debian-6-x86_64-openstack.yml": "83b0b0ecb7212b45179546ac6b6b83b7",
-  "spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml": "d6356946a61858342d0be2b6b670eb55",
-  "spec/acceptance/nodesets/debian-7-x86_64-docker.yml": "2d68216014870420714f306fb3aaa601",
-  "spec/acceptance/nodesets/debian-7-x86_64-openstack.yml": "47f0b02b2d6ea2134574f045e9a315af",
-  "spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml": "2dacc8c1cce7bc4fa8e3b13267df9ecd",
-  "spec/acceptance/nodesets/debian-8-x86_64-docker.yml": "d7fb01335b3273723b8b418faef51538",
-  "spec/acceptance/nodesets/debian-8-x86_64-openstack.yml": "075a6d6389a6b6cbe3b11f7a6e160059",
-  "spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml": "9c33b450b4aa17476acc86d839d79dd2",
-  "spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml": "11480a9d30e9c4daee140dd420176723",
-  "spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml": "46cc4eceef33f04818ce74855630e05b",
-  "spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml": "d1619ba4430c1a61cd9407533ac91de2",
-  "spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml": "5390c092066afa65780816b162dfb4aa",
-  "spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml": "535b98aa7c5d0df88817675af991d2b6",
-  "spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml": "8622e2d9cae7a0923b8510561f1daf5a",
-  "spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml": "df4b8f4bd33f38e0053a806d739db819",
-  "spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml": "cdfa94d70efdcbb4ae0e9caea474c4b1",
-  "spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml": "cefdea8d6ead29b5f492adb971019a81",
-  "spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml": "60a9ce9983e881df4b83c2720dc014ed",
-  "spec/defines/archive_spec.rb": "d1925af41a0f6c20fbb0cad1db4173a2",
-  "spec/spec.opts": "a600ded995d948e393fbe2320ba8e51c",
-  "spec/spec_helper.rb": "706ea71a4048b1f9e6c650d71b5fb331"
-}
\ No newline at end of file

--- a/dev/provisioning/modules/archive/manifests/download.pp	Tue Nov 08 15:48:01 2016 +0100
+++ b/dev/provisioning/modules/archive/manifests/download.pp	Tue Nov 08 18:23:01 2016 +0100
@@ -15,6 +15,7 @@
 # - *$verbose: Default value true.
 # - *$proxy_server: Default value undef.
 # - *$user: The user used to download the archive
+# - *$fail_on_http_error: Whether or not the curl command should throw an error when an http error >= 400 is encountered. Default value undef
 #
 # Example usage:
 #
@@ -24,9 +25,10 @@
 #  }
 #
 #  archive::download {"apache-tomcat-6.0.26.tar.gz":
-#    ensure        => present,
-#    digest_string => "f9eafa9bfd620324d1270ae8f09a8c89",
-#    url           => "http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.26/bin/apache-tomcat-6.0.26.tar.gz",
+#    ensure             => present,
+#    digest_string      => "f9eafa9bfd620324d1270ae8f09a8c89",
+#    url                => "http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.26/bin/apache-tomcat-6.0.26.tar.gz",
+#    fail_on_http_error => true
 #  }
 #
 define archive::download (
@@ -44,8 +46,14 @@
   $path=$::path,
   $proxy_server=undef,
   $user=undef,
+  $fail_on_http_error=undef,
 ) {
 
+  $fail_on_http_error_arg = $fail_on_http_error ? {
+    true    => '-f',
+    default => '',
+  }
+
   $insecure_arg = $allow_insecure ? {
     true    => '-k',
     default => '',
@@ -115,7 +123,7 @@
 
 
             exec {"download digest of archive ${name}":
-              command => "curl ${proxy_option} -s -S ${insecure_arg} ${redirect_arg} -o ${src_target}/${name}.${digest_type} '${digest_src}'",
+              command => "curl ${proxy_option} -s -S ${fail_on_http_error_arg} ${insecure_arg} ${redirect_arg} -o ${src_target}/${name}.${digest_type} '${digest_src}'",
               creates => "${src_target}/${name}.${digest_type}",
               timeout => $timeout,
               path    => $path,
@@ -159,7 +167,7 @@
         default => undef,
       }
       exec {"download archive ${name} and check sum":
-        command     => "curl ${proxy_option} -s -S ${insecure_arg} ${redirect_arg} -o ${src_target}/${name} '${url}'",
+        command     => "curl ${proxy_option} -s -S ${fail_on_http_error_arg} ${insecure_arg} ${redirect_arg} -o ${src_target}/${name} '${url}'",
         creates     => "${src_target}/${name}",
         logoutput   => true,
         timeout     => $timeout,

--- a/dev/provisioning/modules/archive/manifests/extract.pp	Tue Nov 08 15:48:01 2016 +0100
+++ b/dev/provisioning/modules/archive/manifests/extract.pp	Tue Nov 08 18:23:01 2016 +0100
@@ -41,6 +41,10 @@
   $strip_components=0,
   $purge=false,
   $user=undef,
+  $tar_command=$::osfamily ? {
+    'Solaris' => 'gtar',
+    default   => 'tar',
+  },
 ) {
 
   if $root_dir {
@@ -53,9 +57,9 @@
     'present': {
 
       $extract_zip    = "unzip -o ${src_target}/${name}.${extension} -d ${target}"
-      $extract_targz  = "tar --no-same-owner --no-same-permissions --strip-components=${strip_components} -xzf ${src_target}/${name}.${extension} -C ${target}"
-      $extract_tarbz2 = "tar --no-same-owner --no-same-permissions --strip-components=${strip_components} -xjf ${src_target}/${name}.${extension} -C ${target}"
-      $extract_tarxz  = "tar --no-same-owner --no-same-permissions --strip-components=${strip_components} -xpf ${src_target}/${name}.${extension} -C ${target}"
+      $extract_targz  = "${tar_command} --no-same-owner --no-same-permissions --strip-components=${strip_components} -xzf ${src_target}/${name}.${extension} -C ${target}"
+      $extract_tarbz2 = "${tar_command} --no-same-owner --no-same-permissions --strip-components=${strip_components} -xjf ${src_target}/${name}.${extension} -C ${target}"
+      $extract_tarxz  = "${tar_command} --no-same-owner --no-same-permissions --strip-components=${strip_components} -xpf ${src_target}/${name}.${extension} -C ${target}"
 
       $purge_command = $purge ? {
         true    => "rm -rf ${target} && ",

--- a/dev/provisioning/modules/archive/manifests/init.pp	Tue Nov 08 15:48:01 2016 +0100
+++ b/dev/provisioning/modules/archive/manifests/init.pp	Tue Nov 08 18:23:01 2016 +0100
@@ -49,6 +49,8 @@
   $proxy_server=undef,
   $purge_target=false,
   $user=undef,
+  $tar_command=undef,
+  $path = $::path,
 ) {
 
   archive::download {"${name}.${extension}":
@@ -65,6 +67,7 @@
     verbose          => $verbose,
     proxy_server     => $proxy_server,
     user             => $user,
+    path             => $path,
   }
 
   archive::extract {$name:
@@ -76,7 +79,9 @@
     extension        => $extension,
     timeout          => $timeout,
     strip_components => $strip_components,
+    tar_command      => $tar_command,
     require          => Archive::Download["${name}.${extension}"],
     user             => $user,
+    path             => $path,
   }
 }

--- a/dev/provisioning/modules/archive/metadata.json	Tue Nov 08 15:48:01 2016 +0100
+++ b/dev/provisioning/modules/archive/metadata.json	Tue Nov 08 18:23:01 2016 +0100
@@ -1,16 +1,16 @@
 {
   "name": "camptocamp-archive",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "author": "Camptocamp",
   "summary": "Camptocamp Archive Module",
   "license": "Apache-2.0",
   "source": "https://github.com/camptocamp/puppet-archive",
   "project_page": "https://github.com/camptocamp/puppet-archive",
   "issues_url": "https://github.com/camptocamp/puppet-archive/issues",
+  "description": "Archive Module for Puppet",
   "dependencies": [
-  
+
   ],
-  "description": "Archive Module for Puppet",
   "operatingsystem_support": [
     {
       "operatingsystem": "Debian",

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/provisioning/modules/archive/spec/acceptance/nodesets/centos-5.yml	Tue Nov 08 18:23:01 2016 +0100
@@ -0,0 +1,16 @@
+HOSTS:
+  centos-5-x64:
+    default_apply_opts:
+      order: random
+      strict_variables:
+    platform: el-5-x86_64
+    hypervisor : docker
+    image: tianon/centos:5.10
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'yum install -y crontabs tar wget which'
+      - 'sed -i -e "/mingetty/d" /etc/inittab'
+CONFIG:
+  type: aio
+  log_level: debug

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/provisioning/modules/archive/spec/acceptance/nodesets/centos-6.yml	Tue Nov 08 18:23:01 2016 +0100
@@ -0,0 +1,17 @@
+HOSTS:
+  centos-6-x64:
+    default_apply_opts:
+      order: random
+      strict_variables:
+    platform: el-6-x86_64
+    hypervisor : docker
+    image: centos:6
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'rm -rf /var/run/network/*'
+      - 'yum install -y crontabs tar wget'
+      - 'rm /etc/init/tty.conf'
+CONFIG:
+  type: aio
+  log_level: debug

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/provisioning/modules/archive/spec/acceptance/nodesets/centos-7.yml	Tue Nov 08 18:23:01 2016 +0100
@@ -0,0 +1,15 @@
+HOSTS:
+  centos-7-x64:
+    default_apply_opts:
+      order: random
+      strict_variables:
+    platform: el-7-x86_64
+    hypervisor : docker
+    image: centos:7
+    docker_preserve_image: true
+    docker_cmd: '["/usr/sbin/init"]'
+    docker_image_commands:
+      - 'yum install -y crontabs tar wget'
+CONFIG:
+  type: aio
+  log_level: debug

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/provisioning/modules/archive/spec/acceptance/nodesets/debian-6.yml	Tue Nov 08 18:23:01 2016 +0100
@@ -0,0 +1,15 @@
+HOSTS:
+  debian-6-x64:
+    default_apply_opts:
+      order: random
+      strict_variables:
+    platform: debian-6-amd64
+    hypervisor : docker
+    image: debian/eol:squeeze
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y cron locales-all net-tools wget'
+CONFIG:
+  type: aio
+  log_level: debug

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/provisioning/modules/archive/spec/acceptance/nodesets/debian-7.yml	Tue Nov 08 18:23:01 2016 +0100
@@ -0,0 +1,15 @@
+HOSTS:
+  debian-7-x64:
+    default_apply_opts:
+      order: random
+      strict_variables:
+    platform: debian-7-amd64
+    hypervisor : docker
+    image: debian:7
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y cron locales-all net-tools wget'
+CONFIG:
+  type: aio
+  log_level: debug

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/provisioning/modules/archive/spec/acceptance/nodesets/debian-8.yml	Tue Nov 08 18:23:01 2016 +0100
@@ -0,0 +1,16 @@
+HOSTS:
+  debian-8-x64:
+    default_apply_opts:
+      order: random
+      strict_variables:
+    platform: debian-8-amd64
+    hypervisor : docker
+    image: debian:8
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y cron locales-all net-tools wget'
+      - 'rm -f /usr/sbin/policy-rc.d'
+CONFIG:
+  type: aio
+  log_level: debug

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/provisioning/modules/archive/spec/acceptance/nodesets/ubuntu-12.04.yml	Tue Nov 08 18:23:01 2016 +0100
@@ -0,0 +1,16 @@
+HOSTS:
+  ubuntu-1204-x64:
+    default_apply_opts:
+      order: random
+      strict_variables:
+    platform: ubuntu-12.04-amd64
+    hypervisor : docker
+    image: ubuntu:12.04
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y net-tools wget'
+      - 'locale-gen en_US.UTF-8'
+CONFIG:
+  type: aio
+  log_level: debug

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/provisioning/modules/archive/spec/acceptance/nodesets/ubuntu-14.04.yml	Tue Nov 08 18:23:01 2016 +0100
@@ -0,0 +1,18 @@
+HOSTS:
+  ubuntu-1404-x64:
+    default_apply_opts:
+      order: random
+      strict_variables:
+    platform: ubuntu-14.04-amd64
+    hypervisor : docker
+    image: ubuntu:14.04
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'rm /usr/sbin/policy-rc.d'
+      - 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl'
+      - 'apt-get install -y net-tools wget'
+      - 'locale-gen en_US.UTF-8'
+CONFIG:
+  type: aio
+  log_level: debug

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/provisioning/modules/archive/spec/acceptance/nodesets/ubuntu-14.10.yml	Tue Nov 08 18:23:01 2016 +0100
@@ -0,0 +1,18 @@
+HOSTS:
+  ubuntu-1410-x64:
+    default_apply_opts:
+      order: random
+      strict_variables:
+    platform: ubuntu-14.10-amd64
+    hypervisor : docker
+    image: ubuntu:14.10
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'rm /usr/sbin/policy-rc.d'
+      - 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl'
+      - 'apt-get install -y net-tools wget'
+      - 'locale-gen en_US.UTF-8'
+CONFIG:
+  type: aio
+  log_level: debug

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/provisioning/modules/archive/spec/acceptance/nodesets/ubuntu-15.04.yml	Tue Nov 08 18:23:01 2016 +0100
@@ -0,0 +1,16 @@
+HOSTS:
+  ubuntu-1504-x64:
+    default_apply_opts:
+      order: random
+      strict_variables:
+    platform: ubuntu-15.04-amd64
+    hypervisor : docker
+    image: ubuntu:15.04
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y net-tools wget'
+      - 'locale-gen en_US.UTF-8'
+CONFIG:
+  type: aio
+  log_level: debug

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/provisioning/modules/archive/spec/acceptance/nodesets/ubuntu-15.10.yml	Tue Nov 08 18:23:01 2016 +0100
@@ -0,0 +1,16 @@
+HOSTS:
+  ubuntu-1510-x64:
+    default_apply_opts:
+      order: random
+      strict_variables:
+    platform: ubuntu-15.10-amd64
+    hypervisor : docker
+    image: ubuntu:15.10
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y net-tools wget'
+      - 'locale-gen en_US.UTF-8'
+CONFIG:
+  type: aio
+  log_level: debug

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/provisioning/modules/archive/spec/acceptance/nodesets/ubuntu-16.04.yml	Tue Nov 08 18:23:01 2016 +0100
@@ -0,0 +1,16 @@
+HOSTS:
+  ubuntu-1604-x64:
+    default_apply_opts:
+      order: random
+      strict_variables:
+    platform: ubuntu-16.04-amd64
+    hypervisor : docker
+    image: ubuntu:16.04
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y net-tools wget'
+      - 'locale-gen en_US.UTF-8'
+CONFIG:
+  type: aio
+  log_level: debug

--- a/dev/provisioning/modules/archive/spec/defines/archive_spec.rb	Tue Nov 08 15:48:01 2016 +0100
+++ b/dev/provisioning/modules/archive/spec/defines/archive_spec.rb	Tue Nov 08 18:23:01 2016 +0100
@@ -10,7 +10,7 @@
       end
 
       context 'without parameters' do
-        it { expect { is_expected.to compile.with_all_deps }.to raise_error(/Must pass/) }
+        it { expect { is_expected.to compile.with_all_deps }.to raise_error(/url/) }
       end
 
       context 'with url, without target' do
@@ -20,7 +20,7 @@
           }
         end
 
-        it { expect { is_expected.to compile.with_all_deps }.to raise_error(/Must pass target/) }
+        it { expect { is_expected.to compile.with_all_deps }.to raise_error(/target/) }
       end
 
       context 'with target, without url' do
@@ -30,7 +30,7 @@
           }
         end
         
-        it { expect { is_expected.to compile.with_all_deps }.to raise_error(/Must pass url/) }
+        it { expect { is_expected.to compile.with_all_deps }.to raise_error(/url/) }
       end
 
       context 'with url and target' do
@@ -67,6 +67,19 @@
 
         it { is_expected.to compile.with_all_deps }
       end
+
+      context 'with custom tar command' do
+        let(:params) do
+          {
+            :url         => 'http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.26/bin/apache-tomcat-6.0.26.tar.gz',
+            :target      => '/opt',
+            :tar_command => 'xtar',
+          }
+        end
+
+        it { is_expected.to compile.with_all_deps }
+        it { should contain_archive__extract('apache-tomcat-6.0.26').with_tar_command('xtar') }
+      end
     end
   end
 end

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/provisioning/modules/archive/spec/defines/extract_spec.rb	Tue Nov 08 18:23:01 2016 +0100
@@ -0,0 +1,27 @@
+require 'spec_helper'
+ 
+describe 'archive::extract' do
+
+  default_facts = {
+    :path => '/usr/bin:/bin',
+    :osfamily => 'Debian'
+  }
+
+  let(:title) { 'apache-tomcat-6.0.26' }
+  let(:params) {{
+    :target => '/opt'
+  }}
+
+  context 'with minimal parameters' do
+    let(:facts) { default_facts }
+    it { should contain_exec('apache-tomcat-6.0.26 unpack').with_command(/&& tar /) }
+  end
+
+  context 'in Solaris' do
+    let (:facts) { default_facts.merge({
+      :osfamily => 'Solaris'
+    }) }
+    it { should contain_exec('apache-tomcat-6.0.26 unpack').with_command(/&& gtar /) }
+  end
+  
+end
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/provisioning/modules/sysconfig/files/rdf4j/console_commands.txt	Tue Nov 08 18:23:01 2016 +0100
@@ -0,0 +1,19 @@
+connect http://localhost:8080/rdf4j-server
+create native
+corpus
+Corpus repo
+
+
+create native
+corpus_raw
+Corpus raw repo
+
+
+create native
+lexvo
+Lexvo
+
+
+open lexvo
+load file:///tmp/lexvo/lexvo.rdf
+quit

Binary file dev/provisioning/modules/sysconfig/files/rdf4j/lexvo_2013-02-09_cleaned.rdf.bz2 has changed

--- a/dev/provisioning/modules/sysconfig/files/sesame/console_commands.txt	Tue Nov 08 15:48:01 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-connect http://localhost:8080/openrdf-sesame
-create native
-corpus
-Corpus repo
-
-
-create native
-corpus_raw
-Corpus raw repo
-
-
-create native
-lexvo
-Lexvo
-
-
-open lexvo
-load file:///tmp/lexvo/lexvo.rdf
-quit

Binary file dev/provisioning/modules/sysconfig/files/sesame/lexvo_2013-02-09_cleaned.rdf.bz2 has changed

--- a/dev/provisioning/modules/sysconfig/manifests/corpus.pp	Tue Nov 08 15:48:01 2016 +0100
+++ b/dev/provisioning/modules/sysconfig/manifests/corpus.pp	Tue Nov 08 18:23:01 2016 +0100
@@ -7,8 +7,8 @@
     $db_pw             = hiera('sysconfig::params::db_pw',             $sysconfig::params::db_pw),
     $db_host           = hiera('sysconfig::params::db_host',           $sysconfig::params::db_host),
     $db_port           = hiera('sysconfig::params::db_port',           $sysconfig::params::db_port),
-    $sesame_host       = hiera('sysconfig::params::sesame_host',       $sysconfig::params::sesame_host),
-    $sesame_port       = hiera('sysconfig::params::sesame_port',       $sysconfig::params::sesame_port),
+    $rdf4j_host        = hiera('sysconfig::params::rdf4j_host',        $sysconfig::params::rdf4j_host),
+    $rdf4j_port        = hiera('sysconfig::params::rdf4j_port',        $sysconfig::params::rdf4j_port),
     $es_host           = hiera('sysconfig::params::es_host',           $sysconfig::params::es_host),
     $es_port           = hiera('sysconfig::params::es_port',           $sysconfig::params::es_port),
     $es_instance       = hiera('sysconfig::params::es_instance',       $sysconfig::params::es_instance),

--- a/dev/provisioning/modules/sysconfig/manifests/params.pp	Tue Nov 08 15:48:01 2016 +0100
+++ b/dev/provisioning/modules/sysconfig/manifests/params.pp	Tue Nov 08 18:23:01 2016 +0100
@@ -7,8 +7,8 @@
     $db_host = hiera('sysconfig::params::db_host','127.0.0.1')
     $db_port = hiera('sysconfig::params::db_port','3306')
 
-    $sesame_host = hiera('sysconfig::params::sesame_host', '127.0.0.1')
-    $sesame_port = hiera('sysconfig::params::sesame_port', '8080')
+    $rdf4j_host = hiera('sysconfig::params::rdf4j_host', '127.0.0.1')
+    $rdf4j_port = hiera('sysconfig::params::rdf4j_port', '8080')
 
     $es_host     = hiera('sysconfig::params::es_host', '127.0.0.1')
     $es_port     = hiera('sysconfig::params::es_port', '9200')

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/provisioning/modules/sysconfig/manifests/rdf4j.pp	Tue Nov 08 18:23:01 2016 +0100
@@ -0,0 +1,102 @@
+class sysconfig::rdf4j (
+) inherits sysconfig::params {
+
+    define create_lexvo_repository($unless = undef) {
+
+        file { "lexvo_tmp_dir":
+            path => "/tmp/lexvo",
+            ensure => directory,
+        }->
+        file { "lexvo_data_archive":
+            path => "/tmp/lexvo/lexvo.rdf.bz2",
+            ensure => present,
+            source => "puppet:///modules/sysconfig/rdf4j/lexvo_2013-02-09_cleaned.rdf.bz2",
+        }->
+        exec { "lexvo_data_extract":
+            command => "/usr/bin/bunzip2 /tmp/lexvo/lexvo.rdf.bz2",
+            unless => $unless,
+            creates => "/tmp/lexvo/lexvo.rdf"
+        }->
+        file { "lexvo_commands":
+            path => "/tmp/lexvo/console_commands.txt",
+            ensure => present,
+            source => "puppet:///modules/sysconfig/rdf4j/console_commands.txt",
+        }->
+        exec { "lexvo_console":
+            command => "/opt/rdf4j/bin/console.sh < /tmp/lexvo/console_commands.txt",
+            cwd => "/opt/rdf4j/bin",
+            creates => "/opt/rdf4j/.lexvo_loaded",
+            unless => $unless
+        }->
+        exec { "lexvo_data_archive_delete":
+            command => "/usr/bin/rm -fr /tmp/lexvo"
+        }->
+        file { "/opt/rdf4j/.lexvo_loaded":
+            ensure => present,
+            content => "",
+        }
+
+        #->
+        # File <| title == "lexvo_tmp_dir" |> {
+        #     path => "/tmp/lexvo",
+        #     ensure => absent,
+        # }
+    }
+
+    file { "/tmp/rdf4j":
+        ensure => directory,
+    }->
+    archive { 'rdf4j-2.1.1':
+        ensure => present,
+        url => "http://www.eclipse.org/downloads/download.php?file=/rdf4j/eclipse-rdf4j-2.1.1-sdk.zip&r=1",
+        checksum => false,
+        extension => "zip",
+        follow_redirects => true,
+        strip_components => 1,
+        target => "/tmp/rdf4j",
+        purge_target => true,
+        src_target => '/tmp',
+        timeout => 500,
+    }->
+    file { "/opt/rdf4j":
+        ensure => directory,
+        source => "file:///tmp/rdf4j/eclipse-rdf4j-2.1.1",
+        recurse => true,
+        purge => true
+    }->
+    file { [ "/var/lib/rdf4j",
+             "/var/lib/rdf4j/data" ]:
+        ensure => directory,
+        owner => "tomcat",
+        group => "tomcat",
+        require => Package['tomcat']
+    }->
+    augeas { "etc-sysconfig/tomcat":
+        context => "/files/etc/sysconfig/tomcat",
+        changes => [
+            "set JAVA_OPTS '\"-Dinfo.aduna.platform.appdata.basedir=/var/lib/rdf4j/data -Xms512m -Xmx512m\"'"
+        ],
+        notify => Service['tomcat']
+    }->
+    exec { "undeploy-rdf4j-tomcat":
+         command => "/usr/bin/rm -f /var/lib/tomcat/webapps/openrdf-*.war && /bin/sleep 10",
+         notify => Service['tomcat'],
+         path => "/usr/bin:/bin"
+    }->
+    exec { "copy-rdf4j-tomcat":
+         command => "/usr/bin/cp /opt/rdf4j/war/*.war /var/lib/tomcat/webapps",
+         notify => Service['tomcat']
+    }->
+    create_lexvo_repository { "create-lexvo-repository":
+        unless => '/usr/bin/curl -s -f -I http://localhost:8080/rdf4j-server/repositories/lexvo/statements'
+    }
+
+
+#
+#download archive
+
+#put war at the right place
+
+#create the repository if not exists
+
+}

--- a/dev/provisioning/modules/sysconfig/manifests/sesame.pp	Tue Nov 08 15:48:01 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-class sysconfig::sesame (
-) inherits sysconfig::params {
-
-    define create_lexvo_repository($unless = undef) {
-
-        file { "lexvo_tmp_dir":
-            path => "/tmp/lexvo",
-            ensure => directory,
-        }->
-        file { "lexvo_data_archive":
-            path => "/tmp/lexvo/lexvo.rdf.bz2",
-            ensure => present,
-            source => "puppet:///modules/sysconfig/sesame/lexvo_2013-02-09_cleaned.rdf.bz2",
-        }->
-        exec { "lexvo_data_extract":
-            command => "/usr/bin/bunzip2 /tmp/lexvo/lexvo.rdf.bz2",
-            unless => $unless,
-            creates => "/tmp/lexvo/lexvo.rdf"
-        }->
-        file { "lexvo_commands":
-            path => "/tmp/lexvo/console_commands.txt",
-            ensure => present,
-            source => "puppet:///modules/sysconfig/sesame/console_commands.txt",
-        }->
-        exec { "lexvo_console":
-            command => "/opt/sesame/bin/console.sh < /tmp/lexvo/console_commands.txt",
-            cwd => "/opt/sesame/bin",
-            creates => "/opt/sesame/.lexvo_loaded",
-            unless => $unless
-        }->
-        exec { "lexvo_data_archive_delete":
-            command => "/usr/bin/rm -fr /tmp/lexvo"
-        }->
-        file { "/opt/sesame/.lexvo_loaded":
-            ensure => present,
-            content => "",
-        }
-
-        #->
-        # File <| title == "lexvo_tmp_dir" |> {
-        #     path => "/tmp/lexvo",
-        #     ensure => absent,
-        # }
-    }
-
-    file { "/opt/sesame":
-        ensure => directory,
-    }->
-    archive { 'openrdf-sesame-4.1.1':
-        ensure => present,
-        url => "http://downloads.sourceforge.net/project/sesame/Sesame%204/4.1.1/openrdf-sesame-4.1.1-sdk.tar.gz",
-        checksum => false,
-        follow_redirects => true,
-        strip_components => 1,
-        target => "/opt/sesame",
-        src_target => '/tmp',
-        timeout => 500,
-    }->
-    file { [ "/var/lib/sesame",
-             "/var/lib/sesame/data" ]:
-        ensure => directory,
-        owner => "tomcat",
-        group => "tomcat",
-        require => Package['tomcat']
-    }->
-    augeas { "etc-sysconfig/tomcat":
-        context => "/files/etc/sysconfig/tomcat",
-        changes => [
-            "set JAVA_OPTS '\"-Dinfo.aduna.platform.appdata.basedir=/var/lib/sesame/data -Xms512m -Xmx512m\"'"
-        ],
-        notify => Service['tomcat']
-    }->
-    exec { "undeploy-sesame-tomcat":
-         command => "/usr/bin/rm -f /var/lib/tomcat/webapps/openrdf-*.war && /bin/sleep 10",
-         notify => Service['tomcat'],
-         path => "/usr/bin:/bin"
-    }->
-    exec { "copy-sesame-tomcat":
-         command => "/usr/bin/cp /opt/sesame/war/*.war /var/lib/tomcat/webapps",
-         notify => Service['tomcat']
-    }->
-    create_lexvo_repository { "create-lexvo-repository":
-        unless => '/usr/bin/curl -s -f -I http://localhost:8080/openrdf-sesame/repositories/lexvo/statements'
-    }
-
-
-#
-#download archive
-
-#put war at the right place
-
-#create the repository if not exists
-
-}

--- a/dev/provisioning/modules/sysconfig/templates/corpus/corpus_env.conf.erb	Tue Nov 08 15:48:01 2016 +0100
+++ b/dev/provisioning/modules/sysconfig/templates/corpus/corpus_env.conf.erb	Tue Nov 08 18:23:01 2016 +0100
@@ -21,10 +21,10 @@
 
 SetEnv CORPUSPAROLE_COCOON_RDF_BASE_URI http://cocoon.huma-num.fr/exist/crdo/rdf/
 SetEnv CORPUSPAROLE_COCOON_OAIPMH_URL http://cocoon.huma-num.fr/crdo_servlet/oai-pmh
-SetEnv CORPUSPAROLE_SESAME_BASE_URL http://<%= @sesame_host %>:<%= @sesame_port %>/openrdf-sesame
-SetEnv CORPUSPAROLE_SESAME_REPOSITORY corpus
-SetEnv CORPUSPAROLE_SESAME_REPOSITORY_RAW corpus_raw
-SetEnv CORPUSPAROLE_SESAME_LEXVO_REPOSITORY lexvo
+SetEnv CORPUSPAROLE_RDF4J_BASE_URL http://<%= @rdf4j_host %>:<%= @rdf4j_port %>/rdf4j-server
+SetEnv CORPUSPAROLE_RDF4J_REPOSITORY corpus
+SetEnv CORPUSPAROLE_RDF4J_REPOSITORY_RAW corpus_raw
+SetEnv CORPUSPAROLE_RDF4J_LEXVO_REPOSITORY lexvo
 
 SetEnv EASYRDF_HTTP_CLIENT_TIMEOUT 5000
 

--- a/dev/provisioning/modules/sysconfig/templates/corpus/local.env.erb	Tue Nov 08 15:48:01 2016 +0100
+++ b/dev/provisioning/modules/sysconfig/templates/corpus/local.env.erb	Tue Nov 08 18:23:01 2016 +0100
@@ -21,10 +21,10 @@
 
 CORPUSPAROLE_COCOON_RDF_BASE_URI=http://cocoon.huma-num.fr/exist/crdo/rdf/
 CORPUSPAROLE_COCOON_OAIPMH_URL=http://cocoon.huma-num.fr/crdo_servlet/oai-pmh
-CORPUSPAROLE_SESAME_BASE_URL=http://<%= @sesame_host %>:<%= @sesame_port %>/openrdf-sesame
-CORPUSPAROLE_SESAME_REPOSITORY=corpus
-CORPUSPAROLE_SESAME_REPOSITORY_RAW=corpus_raw
-CORPUSPAROLE_SESAME_LEXVO_REPOSITORY=lexvo
+CORPUSPAROLE_RDF4J_BASE_URL=http://<%= @rdf4j_host %>:<%= @rdf4j_port %>/rdf4j-server
+CORPUSPAROLE_RDF4J_REPOSITORY=corpus
+CORPUSPAROLE_RDF4J_REPOSITORY_RAW=corpus_raw
+CORPUSPAROLE_RDF4J_LEXVO_REPOSITORY=lexvo
 
 EASYRDF_HTTP_CLIENT_TIMEOUT=5000
 

--- a/server/src/.env.example	Tue Nov 08 15:48:01 2016 +0100
+++ b/server/src/.env.example	Tue Nov 08 18:23:01 2016 +0100
@@ -23,10 +23,10 @@
 
 CORPUSPAROLE_COCOON_RDF_BASE_URI=
 CORPUSPAROLE_COCOON_OAIPMH_URL=
-CORPUSPAROLE_SESAME_BASE_URL=http://172.16.1.5:8080/openrdf-sesame
-CORPUSPAROLE_SESAME_REPOSITORY=
-CORPUSPAROLE_SESAME_REPOSITORY_RAW=
-CORPUSPAROLE_SESAME_LEXVO_REPOSITORY=
+CORPUSPAROLE_RDF4J_BASE_URL=http://172.16.1.5:8080/rdf4j-server
+CORPUSPAROLE_RDF4J_REPOSITORY=
+CORPUSPAROLE_RDF4J_REPOSITORY_RAW=
+CORPUSPAROLE_RDF4J_LEXVO_REPOSITORY=
 
 
 EASYRDF_HTTP_CLIENT_TIMEOUT=20

--- a/server/src/app/Console/Commands/ImportCocoonRDF.php	Tue Nov 08 15:48:01 2016 +0100
+++ b/server/src/app/Console/Commands/ImportCocoonRDF.php	Tue Nov 08 18:23:01 2016 +0100
@@ -82,8 +82,8 @@
         $this->comment("Skipping $skip records");
         $this->comment("Recording raw queries: ".($raw?'TRUE':'FALSE'));
 
-        $gs = new \EasyRdf\Sparql\Client(Config::get('corpusparole.sesame_query_url'), Config::get('corpusparole.sesame_update_url'));
-        $gs_raw = new \EasyRdf\Sparql\Client(Config::get('corpusparole.sesame_query_url_raw'), Config::get('corpusparole.sesame_update_url_raw'));
+        $gs = new \EasyRdf\Sparql\Client(Config::get('corpusparole.rdf4j_query_url'), Config::get('corpusparole.rdf4j_update_url'));
+        $gs_raw = new \EasyRdf\Sparql\Client(Config::get('corpusparole.rdf4j_query_url_raw'), Config::get('corpusparole.rdf4j_update_url_raw'));
 
 
         $client = new Client(Config::get('corpusparole.cocoon_oaipmh_url'));

--- a/server/src/app/Http/Controllers/Sparql/SparqlClientController.php	Tue Nov 08 15:48:01 2016 +0100
+++ b/server/src/app/Http/Controllers/Sparql/SparqlClientController.php	Tue Nov 08 18:23:01 2016 +0100
@@ -59,13 +59,13 @@
         if(is_null($timeout)) {
             $timeout = config('corpusparole.sparql_client_timeout');
         }
-        $queryUrl = config('corpusparole.sesame_query_url');
+        $queryUrl = config('corpusparole.rdf4j_query_url');
         if($timeout > 0) {
             $queryUrl = $queryUrl .
                 ((strlen(parse_url($queryUrl, PHP_URL_QUERY)) > 0)?"&":"?").
                 "timeout=$timeout";
         }
-        return new \EasyRdf\Sparql\Client($queryUrl, config('corpusparole.sesame_update_url'));
+        return new \EasyRdf\Sparql\Client($queryUrl, config('corpusparole.rdf4j_update_url'));
     }
 
     // display form
@@ -274,10 +274,10 @@
 
         $queryParams = $request->all();
         $queryParams['timeout'] = config('corpusparole.sparql_client_timeout');
-        $queryUrl = config('corpusparole.sesame_query_url');
+        $queryUrl = config('corpusparole.rdf4j_query_url');
 
         try {
-            $sesameResp = $this->httpClient->post($queryUrl, ['form_params' => $queryParams, 'headers' => $headers]);
+            $rdf4jResp = $this->httpClient->post($queryUrl, ['form_params' => $queryParams, 'headers' => $headers]);
         } catch(\GuzzleHttp\Exception\ServerException $exception) {
             if($exception->getCode() == 503) {
                 $this->abort(408, "Time-out causé par la requête SPARQL", $exception);
@@ -297,8 +297,8 @@
             $this->abort(500, "Erreur serveur lors de la requête", $exception);
         }
 
-        $resp = response((string)$sesameResp->getBody(), $sesameResp->getStatusCode());
-        foreach ($sesameResp->getHeaders() as $name => $values) {
+        $resp = response((string)$rdf4jResp->getBody(), $rdf4jResp->getStatusCode());
+        foreach ($rdf4jResp->getHeaders() as $name => $values) {
             if($name != 'Transfer-Encoding') {
                 $resp->header($name, $values);
             }

--- a/server/src/app/Libraries/Mappers/CocoonSoundRdfMapper.php	Tue Nov 08 15:48:01 2016 +0100
+++ b/server/src/app/Libraries/Mappers/CocoonSoundRdfMapper.php	Tue Nov 08 18:23:01 2016 +0100
@@ -14,7 +14,7 @@
 /**
  *
  * rdf:type
- * sesame:directType
+ * rdf4j:directType
  ** <http://purl.org/dc/elements/1.1/description> -> providedCHO
  * <http://purl.org/dc/elements/1.1/format> -> webRepresentation
  * <http://purl.org/dc/elements/1.1/language> -> providedCHO

--- a/server/src/app/Libraries/Sparql/SparqlClient.php	Tue Nov 08 15:48:01 2016 +0100
+++ b/server/src/app/Libraries/Sparql/SparqlClient.php	Tue Nov 08 18:23:01 2016 +0100
@@ -38,8 +38,8 @@
             return false;
         }
         //Log::debug('http_client base uri: ' . $this->getHttpClient()->getConfig('base_uri'));
-        $sesameRepository = config('corpusparole.sesame_repository');
-        $resp = $this->getHttpClient()->post("$sesameRepository/transactions", ['query' => ['isolation-level' => 'http://www.openrdf.org/schema/sesame#SNAPSHOT_READ']]);
+        $rdf4jRepository = config('corpusparole.rdf4j_repository');
+        $resp = $this->getHttpClient()->post("$rdf4jRepository/transactions", ['query' => ['isolation-level' => 'http://www.openrdf.org/schema/sesame#SNAPSHOT_READ']]);
         //$resp = $this->getHttpClient()->post('transactions');
         //TODO check errors
         if($resp->getStatusCode() != 201) {
@@ -108,8 +108,8 @@
 
         // doc : http://rdf4j.org/doc/4/articles/REST-API/transaction-operations.docbook?view
         // cf. bug : https://openrdf.atlassian.net/browse/SES-2295
-        // and PR https://bitbucket.org/openrdf/sesame/commits/62b680d8650caca7bc1673f6aaac48a5b6e85d23?at=2.8.x
-        // The put form has been chosen over the post, because it seems that this is the form choosed in the sesame http client
+        // and PR https://bitbucket.org/openrdf/rdf4j/commits/62b680d8650caca7bc1673f6aaac48a5b6e85d23?at=2.8.x
+        // The put form has been chosen over the post, because it seems that this is the form choosed in the rdf4j http client
         $resp = $this->getHttpClient()->put(
             $this->currentTransactionUrl, [
                 'headers' => ["Content-Type" => "application/sparql-update; charset=utf-8"],
@@ -146,8 +146,8 @@
 
         // doc : http://rdf4j.org/doc/4/articles/REST-API/transaction-operations.docbook?view
         // cf. bug : https://openrdf.atlassian.net/browse/SES-2295
-        // and PR https://bitbucket.org/openrdf/sesame/commits/62b680d8650caca7bc1673f6aaac48a5b6e85d23?at=2.8.x
-        // The put form has been chosen over the post, because it seems that this is the form choosed in the sesame http client
+        // and PR https://bitbucket.org/openrdf/rdf4j/commits/62b680d8650caca7bc1673f6aaac48a5b6e85d23?at=2.8.x
+        // The put form has been chosen over the post, because it seems that this is the form choosed in the rdf4j http client
         $resp = $this->getHttpClient()->put(
             $this->currentTransactionUrl, [
                 'headers' => ["Content-Type" => "application/sparql-update; charset=utf-8"],

--- a/server/src/app/Providers/LexvoServiceProvider.php	Tue Nov 08 15:48:01 2016 +0100
+++ b/server/src/app/Providers/LexvoServiceProvider.php	Tue Nov 08 18:23:01 2016 +0100
@@ -16,7 +16,7 @@
     public function register()
     {
         $this->app->bind('CorpusParole\Services\LexvoResolverInterface', function($app) {
-            $sparqlClient = $app->make('EasyRdf\Sparql\Client', [config('corpusparole.lexvo_sesame_query_url'), null]);
+            $sparqlClient = $app->make('EasyRdf\Sparql\Client', [config('corpusparole.lexvo_rdf4j_query_url'), null]);
             return $app->make('CorpusParole\Services\LexvoResolver', [$sparqlClient,]);
         });
     }

--- a/server/src/app/Providers/RepositoryServiceProvider.php	Tue Nov 08 15:48:01 2016 +0100
+++ b/server/src/app/Providers/RepositoryServiceProvider.php	Tue Nov 08 18:23:01 2016 +0100
@@ -12,8 +12,8 @@
         $this->app->bind(
             'CorpusParole\Repositories\DocumentRepository',
             function($app) {
-                // $httpClient = $app->make('GuzzleHttp\Client', [[ 'base_uri' => config('corpusparole.sesame_query_url'), 'http_errors' => false]]);
-                // $sparqlClient = $app->make('EasyRdf\Sparql\Client', [config('corpusparole.sesame_query_url'), config('corpusparole.sesame_update_url')]);
+                // $httpClient = $app->make('GuzzleHttp\Client', [[ 'base_uri' => config('corpusparole.rdf4j_query_url'), 'http_errors' => false]]);
+                // $sparqlClient = $app->make('EasyRdf\Sparql\Client', [config('corpusparole.rdf4j_query_url'), config('corpusparole.rdf4j_update_url')]);
                 // $cpSparqlClient = $app->make('CorpusParole\Libraries\Sparql\SparqlClient', [$httpClient, $sparqlClient]);
                 $cpSparqlClient = $app->make('CorpusParole\Libraries\Sparql\SparqlClient');
                 return $app->make('CorpusParole\Repositories\RdfDocumentRepository', [$cpSparqlClient,]);

--- a/server/src/app/Providers/SparqlClientServiceProvider.php	Tue Nov 08 15:48:01 2016 +0100
+++ b/server/src/app/Providers/SparqlClientServiceProvider.php	Tue Nov 08 18:23:01 2016 +0100
@@ -13,8 +13,8 @@
         $this->app->bind(
             'CorpusParole\Libraries\Sparql\SparqlClient',
             function($app) {
-                $httpClient = $app->make('GuzzleHttp\Client', [[ 'base_uri' => config('corpusparole.sesame_query_url'), 'http_errors' => false]]);
-                $sparqlClient = $app->make('EasyRdf\Sparql\Client', [config('corpusparole.sesame_query_url'), config('corpusparole.sesame_update_url')]);
+                $httpClient = $app->make('GuzzleHttp\Client', [[ 'base_uri' => config('corpusparole.rdf4j_query_url'), 'http_errors' => false]]);
+                $sparqlClient = $app->make('EasyRdf\Sparql\Client', [config('corpusparole.rdf4j_query_url'), config('corpusparole.rdf4j_update_url')]);
                 return new SparqlClient($httpClient, $sparqlClient);
             }
         );

--- a/server/src/app/Repositories/RdfDocumentRepository.php	Tue Nov 08 15:48:01 2016 +0100
+++ b/server/src/app/Repositories/RdfDocumentRepository.php	Tue Nov 08 18:23:01 2016 +0100
@@ -277,7 +277,7 @@
         $docUri = Config::get('corpusparole.corpus_doc_id_base_uri').$id;
 
         // We want the CBD (Concise Bounded Description, cf. http://www.w3.org/Submission/CBD/)
-        // WARNING: This seems to work in sesame for our dataset.
+        // WARNING: This seems to work in rdf4j for our dataset.
         $doc = $this->sparqlClient->query(
             "CONSTRUCT { ?s ?p ?o } WHERE { GRAPH <$docUri> { ?s ?p ?o } }"
         );

--- a/server/src/config/corpusparole.php	Tue Nov 08 15:48:01 2016 +0100
+++ b/server/src/config/corpusparole.php	Tue Nov 08 18:23:01 2016 +0100
@@ -1,6 +1,6 @@
 <?php
 
-$sesameBaseUrl = rtrim(env('CORPUSPAROLE_SESAME_BASE_URL'),'/').'/';
+$rdf4jBaseUrl = rtrim(env('CORPUSPAROLE_RDF4J_BASE_URL'),'/').'/';
 $baseUrl = parse_url(env('APP_URL','http://localhost'), PHP_URL_PATH);
 $baseUrl = ($baseUrl && strlen($baseUrl)>0)?$baseUrl:"/";
 
@@ -11,14 +11,14 @@
 
     'elasticsearch_index' => env('ELASTICSEARCH_INDEX'),
 
-    'sesame_base_url' => $sesameBaseUrl,
-    'sesame_repository' => env('CORPUSPAROLE_SESAME_REPOSITORY'),
-    'sesame_repository_raw' => env('CORPUSPAROLE_SESAME_REPOSITORY_RAW'),
+    'rdf4j_base_url' => $rdf4jBaseUrl,
+    'rdf4j_repository' => env('CORPUSPAROLE_RDF4J_REPOSITORY'),
+    'rdf4j_repository_raw' => env('CORPUSPAROLE_RDF4J_REPOSITORY_RAW'),
     'max_load_retry' => env('CORPUSPAROLE_MAX_LOAD_RETRY', 5),
-    'sesame_query_url' => $sesameBaseUrl.'repositories/'.env('CORPUSPAROLE_SESAME_REPOSITORY'),
-    'sesame_update_url' => $sesameBaseUrl.'repositories/'.env('CORPUSPAROLE_SESAME_REPOSITORY').'/statements',
-    'sesame_query_url_raw' => $sesameBaseUrl.'repositories/'.env('CORPUSPAROLE_SESAME_REPOSITORY_RAW'),
-    'sesame_update_url_raw' => $sesameBaseUrl.'repositories/'.env('CORPUSPAROLE_SESAME_REPOSITORY_RAW').'/statements',
+    'rdf4j_query_url' => $rdf4jBaseUrl.'repositories/'.env('CORPUSPAROLE_RDF4J_REPOSITORY'),
+    'rdf4j_update_url' => $rdf4jBaseUrl.'repositories/'.env('CORPUSPAROLE_RDF4J_REPOSITORY').'/statements',
+    'rdf4j_query_url_raw' => $rdf4jBaseUrl.'repositories/'.env('CORPUSPAROLE_RDF4J_REPOSITORY_RAW'),
+    'rdf4j_update_url_raw' => $rdf4jBaseUrl.'repositories/'.env('CORPUSPAROLE_RDF4J_REPOSITORY_RAW').'/statements',
     'corpus_ontology_url' => env('CORPUSPAROLE_ONTOLOGY_URL', 'http://corpusdelaparole.culture.fr/ontology/'),
 
     'cocoon_rdf_base_uri' => env('CORPUSPAROLE_COCOON_RDF_BASE_URI'),
@@ -127,7 +127,7 @@
     'lexvo_url_regexp' => '/http[s]?\:\/\/lexvo\.org\/id\/iso639\-3\/([[:alpha:]]{3})\/?/',
     'lexvo_cache_expiration' => 60*24*30,
     'lexvo_max_ids' => 50,
-    'lexvo_sesame_query_url' => $sesameBaseUrl.'repositories/'.env('CORPUSPAROLE_SESAME_LEXVO_REPOSITORY'),
+    'lexvo_rdf4j_query_url' => $rdf4jBaseUrl.'repositories/'.env('CORPUSPAROLE_RDF4J_LEXVO_REPOSITORY'),
 
     'bnf_base_url' => 'http://data.bnf.fr/',
     'bnf_ark_base_url' => 'http://ark.bnf.fr/',

--- a/server/src/phpunit.xml	Tue Nov 08 15:48:01 2016 +0100
+++ b/server/src/phpunit.xml	Tue Nov 08 18:23:01 2016 +0100
@@ -32,6 +32,6 @@
         <env name="DATABASE_DRIVER" value="pgsql_test"/>
         <env name="SESSION_DRIVER" value="array"/>
         <env name="QUEUE_DRIVER" value="sync"/>
-        <env name="CORPUSPAROLE_SESAME_REPOSITORY" value="cocoon_test"/>
+        <env name="CORPUSPAROLE_RDF4J_REPOSITORY" value="cocoon_test"/>
     </php>
 </phpunit>

--- a/server/src/tests/Libraries/Handle/HandleClientIntegrationTest.php	Tue Nov 08 15:48:01 2016 +0100
+++ b/server/src/tests/Libraries/Handle/HandleClientIntegrationTest.php	Tue Nov 08 18:23:01 2016 +0100
@@ -101,7 +101,7 @@
             unlink($ftd);
         }
 
-        //$this->httpClient->delete("repositories/$this->sesameRepository");
+        //$this->httpClient->delete("repositories/$this->rdf4jRepository");
         parent::tearDown();
     }
 

--- a/server/src/tests/Libraries/Sparql/SparqlClientTest.php	Tue Nov 08 15:48:01 2016 +0100
+++ b/server/src/tests/Libraries/Sparql/SparqlClientTest.php	Tue Nov 08 18:23:01 2016 +0100
@@ -46,8 +46,8 @@
 
     public function setUp() {
         parent::setUp();
-        $this->sesameRepository = config('corpusparole.sesame_repository');
-        $this->transactionUrl = config('corpusparole.sesame_query_url').'/transactions/64a5937f-c112-d014-a044-f0123b93';
+        $this->rdf4jRepository = config('corpusparole.rdf4j_repository');
+        $this->transactionUrl = config('corpusparole.rdf4j_query_url').'/transactions/64a5937f-c112-d014-a044-f0123b93';
 
         $this->addGraph = new EasyRdf\Graph("http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-ALA_608", SparqlClientTest::TEST_DOC_ADD);
         $this->deleteGraph = new EasyRdf\Graph("http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-ALA_608", SparqlClientTest::TEST_DOC_DELETE);
@@ -86,7 +86,7 @@
 
         $this->assertCount(1, $container, 'One request');
         $req = $container[0]['request'];
-        $this->assertEquals("http:{$this->sesameRepository}/transactions?isolation-level=http%3A%2F%2Fwww.openrdf.org%2Fschema%2Fsesame%23SNAPSHOT_READ", (string)$req->getUri(), "url must be ok");
+        $this->assertEquals("http:{$this->rdf4jRepository}/transactions?isolation-level=http%3A%2F%2Fwww.openrdf.org%2Fschema%2Fsesame%23SNAPSHOT_READ", (string)$req->getUri(), "url must be ok");
         $this->assertEquals('POST', $container[0]['request']->getMethod(), "methos is POST");
     }
 

--- a/server/src/tests/Repositories/DocumentRepositoryIntegrationTest.php	Tue Nov 08 15:48:01 2016 +0100
+++ b/server/src/tests/Repositories/DocumentRepositoryIntegrationTest.php	Tue Nov 08 18:23:01 2016 +0100
@@ -28,25 +28,25 @@
         parent::setUp();
         $this->graph = new EasyRdf\Graph(config('corpusparole.corpus_doc_id_base_uri')."crdo-ALA_738", sprintf(file_get_contents(DocumentRepositoryIntegrationTest::TEST_DOC), config('corpusparole.corpus_doc_id_base_uri')));
 
-        $this->httpClient = new Client(['base_uri' => config('corpusparole.sesame_base_url')]);
-        $this->sesameRepository = config('corpusparole.sesame_repository');
+        $this->httpClient = new Client(['base_uri' => config('corpusparole.rdf4j_base_url')]);
+        $this->rdf4jRepository = config('corpusparole.rdf4j_repository');
         $this->corpusDocIdBaseUri = config('corpusparole.corpus_doc_id_base_uri');
 
         $this->documentRepository = $this->app->make('CorpusParole\Repositories\DocumentRepository');
         $uniqueid = uniqid('corpusparole', true);
-        $repoCreateStmt = sprintf(file_get_contents(DocumentRepositoryIntegrationTest::REPO_CREATION_TTL), $this->sesameRepository);
-        $this->httpClient->delete("repositories/$this->sesameRepository", ['http_errors' => false]);
+        $repoCreateStmt = sprintf(file_get_contents(DocumentRepositoryIntegrationTest::REPO_CREATION_TTL), $this->rdf4jRepository);
+        $this->httpClient->delete("repositories/$this->rdf4jRepository", ['http_errors' => false]);
         $this->httpClient->post('repositories/SYSTEM/statements', [
             'headers' => ['Content-type' => 'application/x-turtle;charset=UTF-8'],
             'query' => ['context' => "_:$uniqueid"],
             'body' => $repoCreateStmt,
         ]);
-        $this->httpClient->put("repositories/$this->sesameRepository/statements", [
+        $this->httpClient->put("repositories/$this->rdf4jRepository/statements", [
             'headers' => ['Content-type' => 'text/turtle;charset=UTF-8'],
             'body' => sprintf(file_get_contents(DocumentRepositoryIntegrationTest::TEST_DOC), config('corpusparole.corpus_doc_id_base_uri')),
             'query' => ['context' => "<".config('corpusparole.corpus_doc_id_base_uri')."crdo-ALA_738>"],
         ]);
-        $this->httpClient->put("repositories/$this->sesameRepository/statements", [
+        $this->httpClient->put("repositories/$this->rdf4jRepository/statements", [
             'headers' => ['Content-type' => 'text/turtle;charset=UTF-8'],
             'body' => sprintf(file_get_contents(DocumentRepositoryIntegrationTest::TEST_DOC_NO_GEO), config('corpusparole.corpus_doc_id_base_uri')),
             'query' => ['context' => "<".config('corpusparole.corpus_doc_id_base_uri')."crdo-ALA_739>"],
@@ -55,7 +55,7 @@
     }
 
     public function tearDown() {
-        $this->httpClient->delete("repositories/$this->sesameRepository");
+        $this->httpClient->delete("repositories/$this->rdf4jRepository");
         parent::tearDown();
     }
 

--- a/server/src/tests/Services/LexvoResolverTest.php	Tue Nov 08 15:48:01 2016 +0100
+++ b/server/src/tests/Services/LexvoResolverTest.php	Tue Nov 08 18:23:01 2016 +0100
@@ -449,7 +449,7 @@
      */
     public function testQuery() {
 
-        $expectedUri = config('corpusparole.lexvo_sesame_query_url')."?query=PREFIX+rdfs%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F2000%2F01%2Frdf-schema%23%3E%0ASELECT+%3Fs+%3Fo+WHERE+%7B%7B%3Chttp%3A%2F%2Flexvo.org%2Fid%2Fiso639-3%2Ffra%3E+rdfs%3Alabel+%3Fo.+%3Fs+rdfs%3Alabel+%3Fo+FILTER%28%3Fs+%3D+%3Chttp%3A%2F%2Flexvo.org%2Fid%2Fiso639-3%2Ffra%3E+%26%26+%28lang%28%3Fo%29+%3D+%22fr%22+%7C%7C+lang%28%3Fo%29+%3D+%22en%22%29%29%7D+UNION+%7B%3Chttp%3A%2F%2Flexvo.org%2Fid%2Fiso639-3%2Fafr%3E+rdfs%3Alabel+%3Fo.+%3Fs+rdfs%3Alabel+%3Fo+FILTER%28%3Fs+%3D+%3Chttp%3A%2F%2Flexvo.org%2Fid%2Fiso639-3%2Fafr%3E+%26%26+%28lang%28%3Fo%29+%3D+%22fr%22+%7C%7C+lang%28%3Fo%29+%3D+%22en%22%29%29%7D%7D";
+        $expectedUri = config('corpusparole.lexvo_rdf4j_query_url')."?query=PREFIX+rdfs%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F2000%2F01%2Frdf-schema%23%3E%0ASELECT+%3Fs+%3Fo+WHERE+%7B%7B%3Chttp%3A%2F%2Flexvo.org%2Fid%2Fiso639-3%2Ffra%3E+rdfs%3Alabel+%3Fo.+%3Fs+rdfs%3Alabel+%3Fo+FILTER%28%3Fs+%3D+%3Chttp%3A%2F%2Flexvo.org%2Fid%2Fiso639-3%2Ffra%3E+%26%26+%28lang%28%3Fo%29+%3D+%22fr%22+%7C%7C+lang%28%3Fo%29+%3D+%22en%22%29%29%7D+UNION+%7B%3Chttp%3A%2F%2Flexvo.org%2Fid%2Fiso639-3%2Fafr%3E+rdfs%3Alabel+%3Fo.+%3Fs+rdfs%3Alabel+%3Fo+FILTER%28%3Fs+%3D+%3Chttp%3A%2F%2Flexvo.org%2Fid%2Fiso639-3%2Fafr%3E+%26%26+%28lang%28%3Fo%29+%3D+%22fr%22+%7C%7C+lang%28%3Fo%29+%3D+%22en%22%29%29%7D%7D";
         $response = m::mock('EasyRdf\Http\Response')
             ->shouldReceive('isSuccessful')->andReturn(true)
             ->shouldReceive('getBody')->andReturn(self::LEXVO_EMPTY_RDF_RESP) //result not important
@@ -478,7 +478,7 @@
      */
     public function testQueryFullId() {
 
-        $expectedUri = config('corpusparole.lexvo_sesame_query_url')."?query=PREFIX+rdfs%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F2000%2F01%2Frdf-schema%23%3E%0ASELECT+%3Fs+%3Fo+WHERE+%7B%7B%3Chttp%3A%2F%2Flexvo.org%2Fid%2Fiso639-3%2Ffra%3E+rdfs%3Alabel+%3Fo.+%3Fs+rdfs%3Alabel+%3Fo+FILTER%28%3Fs+%3D+%3Chttp%3A%2F%2Flexvo.org%2Fid%2Fiso639-3%2Ffra%3E+%26%26+%28lang%28%3Fo%29+%3D+%22fr%22+%7C%7C+lang%28%3Fo%29+%3D+%22en%22%29%29%7D+UNION+%7B%3Chttp%3A%2F%2Flexvo.org%2Fid%2Fiso639-3%2Fafr%3E+rdfs%3Alabel+%3Fo.+%3Fs+rdfs%3Alabel+%3Fo+FILTER%28%3Fs+%3D+%3Chttp%3A%2F%2Flexvo.org%2Fid%2Fiso639-3%2Fafr%3E+%26%26+%28lang%28%3Fo%29+%3D+%22fr%22+%7C%7C+lang%28%3Fo%29+%3D+%22en%22%29%29%7D%7D";
+        $expectedUri = config('corpusparole.lexvo_rdf4j_query_url')."?query=PREFIX+rdfs%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F2000%2F01%2Frdf-schema%23%3E%0ASELECT+%3Fs+%3Fo+WHERE+%7B%7B%3Chttp%3A%2F%2Flexvo.org%2Fid%2Fiso639-3%2Ffra%3E+rdfs%3Alabel+%3Fo.+%3Fs+rdfs%3Alabel+%3Fo+FILTER%28%3Fs+%3D+%3Chttp%3A%2F%2Flexvo.org%2Fid%2Fiso639-3%2Ffra%3E+%26%26+%28lang%28%3Fo%29+%3D+%22fr%22+%7C%7C+lang%28%3Fo%29+%3D+%22en%22%29%29%7D+UNION+%7B%3Chttp%3A%2F%2Flexvo.org%2Fid%2Fiso639-3%2Fafr%3E+rdfs%3Alabel+%3Fo.+%3Fs+rdfs%3Alabel+%3Fo+FILTER%28%3Fs+%3D+%3Chttp%3A%2F%2Flexvo.org%2Fid%2Fiso639-3%2Fafr%3E+%26%26+%28lang%28%3Fo%29+%3D+%22fr%22+%7C%7C+lang%28%3Fo%29+%3D+%22en%22%29%29%7D%7D";
         $response = m::mock('EasyRdf\Http\Response')
             ->shouldReceive('isSuccessful')->andReturn(true)
             ->shouldReceive('getBody')->andReturn(self::LEXVO_EMPTY_RDF_RESP) //result not important