You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/05/26 23:15:26 UTC
jena git commit: Align Fuseki1 and Fuseki2 versions of SOH
Repository: jena
Updated Branches:
refs/heads/master 413316e16 -> a1b3182bd
Align Fuseki1 and Fuseki2 versions of SOH
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a1b3182b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a1b3182b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a1b3182b
Branch: refs/heads/master
Commit: a1b3182bdcbe38c763450bd0fdbeff96456455b4
Parents: 413316e
Author: Andy Seaborne <an...@apache.org>
Authored: Tue May 26 22:15:20 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue May 26 22:15:20 2015 +0100
----------------------------------------------------------------------
jena-fuseki2/apache-jena-fuseki/bin/s-delete | 18 +++++++++++-------
jena-fuseki2/apache-jena-fuseki/bin/s-get | 18 +++++++++++-------
jena-fuseki2/apache-jena-fuseki/bin/s-head | 18 +++++++++++-------
jena-fuseki2/apache-jena-fuseki/bin/s-post | 18 +++++++++++-------
jena-fuseki2/apache-jena-fuseki/bin/s-put | 18 +++++++++++-------
jena-fuseki2/apache-jena-fuseki/bin/s-query | 18 +++++++++++-------
jena-fuseki2/apache-jena-fuseki/bin/s-update | 18 +++++++++++-------
jena-fuseki2/apache-jena-fuseki/bin/s-update-form | 18 +++++++++++-------
jena-fuseki2/apache-jena-fuseki/bin/soh | 18 +++++++++++-------
9 files changed, 99 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a1b3182b/jena-fuseki2/apache-jena-fuseki/bin/s-delete
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-delete b/jena-fuseki2/apache-jena-fuseki/bin/s-delete
index dcf7f6e..9f6a619 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-delete
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-delete
@@ -35,7 +35,7 @@ require 'ostruct'
# Follow redirects => 301: puts response["location"] # All headers are lowercase?
SOH_NAME="SOH"
-SOH_VERSION="0.0.1"
+SOH_VERSION="0.0.2"
$proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
@@ -43,10 +43,11 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# Names
$mtTurtle = 'text/turtle;charset=utf-8'
-$mtJsonLD = 'application/ld+json'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
-$mtNQuads = 'text/n-quads'
+$mtNTriples = 'application/n-triples'
+$mtNQuads = 'application/n-quads'
+$mtJSONLD = 'application/ld+json'
$mtTriG = 'application/trig'
$mtSparqlResultsX = 'application/sparql-results+xml'
$mtSparqlResultsJ = 'application/sparql-results+json'
@@ -61,13 +62,14 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['jsonld'] = $mtJsonLD
$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
$fileMediaTypes['nq'] = $mtNQuads
$fileMediaTypes['trig'] = $mtTriG
+$fileMediaTypes['json-ld'] = $mtJSONLD
+$fileMediaTypes['jsonld'] = $mtJSONLD
# Global charset : no entry means "don't set"
$charsetUTF8 = 'utf-8'
@@ -75,7 +77,7 @@ $charset = {}
$charset[$mtTurtle] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
-$charset[$mtNQuads] = 'ascii'
+$charset[$mtNQuads] = 'utf-8'
# Headers
@@ -94,8 +96,10 @@ $headers = { "User-Agent" => "#{SOH_NAME}/Fuseki #{SOH_VERSION}"}
$print_http = false
# Default for GET
-# At least allow anythign (and hope!)
-$accept_rdf="#{$mtRDF};q=0.9 , #{$mtTurtle}"
+# At least allow anything (and hope!)
+$accept_rdf="#{$mtTurtle} , #{$mtNTriples};q=0.9 , #{$mtRDF};q=0.8 , #{$mtJSONLD};q=0.5"
+# Datasets
+$accept_ds="#{$mtTrig} , #{$mtNQuads};q=0.9 , #{$mtJSONLD};q=0.5"
# For SPARQL query
$accept_results="#{$mtSparqlResultsJ} , #{$mtSparqlResultsX};q=0.9 , #{$accept_rdf}"
http://git-wip-us.apache.org/repos/asf/jena/blob/a1b3182b/jena-fuseki2/apache-jena-fuseki/bin/s-get
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-get b/jena-fuseki2/apache-jena-fuseki/bin/s-get
index dcf7f6e..9f6a619 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-get
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-get
@@ -35,7 +35,7 @@ require 'ostruct'
# Follow redirects => 301: puts response["location"] # All headers are lowercase?
SOH_NAME="SOH"
-SOH_VERSION="0.0.1"
+SOH_VERSION="0.0.2"
$proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
@@ -43,10 +43,11 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# Names
$mtTurtle = 'text/turtle;charset=utf-8'
-$mtJsonLD = 'application/ld+json'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
-$mtNQuads = 'text/n-quads'
+$mtNTriples = 'application/n-triples'
+$mtNQuads = 'application/n-quads'
+$mtJSONLD = 'application/ld+json'
$mtTriG = 'application/trig'
$mtSparqlResultsX = 'application/sparql-results+xml'
$mtSparqlResultsJ = 'application/sparql-results+json'
@@ -61,13 +62,14 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['jsonld'] = $mtJsonLD
$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
$fileMediaTypes['nq'] = $mtNQuads
$fileMediaTypes['trig'] = $mtTriG
+$fileMediaTypes['json-ld'] = $mtJSONLD
+$fileMediaTypes['jsonld'] = $mtJSONLD
# Global charset : no entry means "don't set"
$charsetUTF8 = 'utf-8'
@@ -75,7 +77,7 @@ $charset = {}
$charset[$mtTurtle] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
-$charset[$mtNQuads] = 'ascii'
+$charset[$mtNQuads] = 'utf-8'
# Headers
@@ -94,8 +96,10 @@ $headers = { "User-Agent" => "#{SOH_NAME}/Fuseki #{SOH_VERSION}"}
$print_http = false
# Default for GET
-# At least allow anythign (and hope!)
-$accept_rdf="#{$mtRDF};q=0.9 , #{$mtTurtle}"
+# At least allow anything (and hope!)
+$accept_rdf="#{$mtTurtle} , #{$mtNTriples};q=0.9 , #{$mtRDF};q=0.8 , #{$mtJSONLD};q=0.5"
+# Datasets
+$accept_ds="#{$mtTrig} , #{$mtNQuads};q=0.9 , #{$mtJSONLD};q=0.5"
# For SPARQL query
$accept_results="#{$mtSparqlResultsJ} , #{$mtSparqlResultsX};q=0.9 , #{$accept_rdf}"
http://git-wip-us.apache.org/repos/asf/jena/blob/a1b3182b/jena-fuseki2/apache-jena-fuseki/bin/s-head
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-head b/jena-fuseki2/apache-jena-fuseki/bin/s-head
index dcf7f6e..9f6a619 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-head
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-head
@@ -35,7 +35,7 @@ require 'ostruct'
# Follow redirects => 301: puts response["location"] # All headers are lowercase?
SOH_NAME="SOH"
-SOH_VERSION="0.0.1"
+SOH_VERSION="0.0.2"
$proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
@@ -43,10 +43,11 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# Names
$mtTurtle = 'text/turtle;charset=utf-8'
-$mtJsonLD = 'application/ld+json'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
-$mtNQuads = 'text/n-quads'
+$mtNTriples = 'application/n-triples'
+$mtNQuads = 'application/n-quads'
+$mtJSONLD = 'application/ld+json'
$mtTriG = 'application/trig'
$mtSparqlResultsX = 'application/sparql-results+xml'
$mtSparqlResultsJ = 'application/sparql-results+json'
@@ -61,13 +62,14 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['jsonld'] = $mtJsonLD
$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
$fileMediaTypes['nq'] = $mtNQuads
$fileMediaTypes['trig'] = $mtTriG
+$fileMediaTypes['json-ld'] = $mtJSONLD
+$fileMediaTypes['jsonld'] = $mtJSONLD
# Global charset : no entry means "don't set"
$charsetUTF8 = 'utf-8'
@@ -75,7 +77,7 @@ $charset = {}
$charset[$mtTurtle] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
-$charset[$mtNQuads] = 'ascii'
+$charset[$mtNQuads] = 'utf-8'
# Headers
@@ -94,8 +96,10 @@ $headers = { "User-Agent" => "#{SOH_NAME}/Fuseki #{SOH_VERSION}"}
$print_http = false
# Default for GET
-# At least allow anythign (and hope!)
-$accept_rdf="#{$mtRDF};q=0.9 , #{$mtTurtle}"
+# At least allow anything (and hope!)
+$accept_rdf="#{$mtTurtle} , #{$mtNTriples};q=0.9 , #{$mtRDF};q=0.8 , #{$mtJSONLD};q=0.5"
+# Datasets
+$accept_ds="#{$mtTrig} , #{$mtNQuads};q=0.9 , #{$mtJSONLD};q=0.5"
# For SPARQL query
$accept_results="#{$mtSparqlResultsJ} , #{$mtSparqlResultsX};q=0.9 , #{$accept_rdf}"
http://git-wip-us.apache.org/repos/asf/jena/blob/a1b3182b/jena-fuseki2/apache-jena-fuseki/bin/s-post
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-post b/jena-fuseki2/apache-jena-fuseki/bin/s-post
index dcf7f6e..9f6a619 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-post
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-post
@@ -35,7 +35,7 @@ require 'ostruct'
# Follow redirects => 301: puts response["location"] # All headers are lowercase?
SOH_NAME="SOH"
-SOH_VERSION="0.0.1"
+SOH_VERSION="0.0.2"
$proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
@@ -43,10 +43,11 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# Names
$mtTurtle = 'text/turtle;charset=utf-8'
-$mtJsonLD = 'application/ld+json'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
-$mtNQuads = 'text/n-quads'
+$mtNTriples = 'application/n-triples'
+$mtNQuads = 'application/n-quads'
+$mtJSONLD = 'application/ld+json'
$mtTriG = 'application/trig'
$mtSparqlResultsX = 'application/sparql-results+xml'
$mtSparqlResultsJ = 'application/sparql-results+json'
@@ -61,13 +62,14 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['jsonld'] = $mtJsonLD
$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
$fileMediaTypes['nq'] = $mtNQuads
$fileMediaTypes['trig'] = $mtTriG
+$fileMediaTypes['json-ld'] = $mtJSONLD
+$fileMediaTypes['jsonld'] = $mtJSONLD
# Global charset : no entry means "don't set"
$charsetUTF8 = 'utf-8'
@@ -75,7 +77,7 @@ $charset = {}
$charset[$mtTurtle] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
-$charset[$mtNQuads] = 'ascii'
+$charset[$mtNQuads] = 'utf-8'
# Headers
@@ -94,8 +96,10 @@ $headers = { "User-Agent" => "#{SOH_NAME}/Fuseki #{SOH_VERSION}"}
$print_http = false
# Default for GET
-# At least allow anythign (and hope!)
-$accept_rdf="#{$mtRDF};q=0.9 , #{$mtTurtle}"
+# At least allow anything (and hope!)
+$accept_rdf="#{$mtTurtle} , #{$mtNTriples};q=0.9 , #{$mtRDF};q=0.8 , #{$mtJSONLD};q=0.5"
+# Datasets
+$accept_ds="#{$mtTrig} , #{$mtNQuads};q=0.9 , #{$mtJSONLD};q=0.5"
# For SPARQL query
$accept_results="#{$mtSparqlResultsJ} , #{$mtSparqlResultsX};q=0.9 , #{$accept_rdf}"
http://git-wip-us.apache.org/repos/asf/jena/blob/a1b3182b/jena-fuseki2/apache-jena-fuseki/bin/s-put
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-put b/jena-fuseki2/apache-jena-fuseki/bin/s-put
index dcf7f6e..9f6a619 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-put
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-put
@@ -35,7 +35,7 @@ require 'ostruct'
# Follow redirects => 301: puts response["location"] # All headers are lowercase?
SOH_NAME="SOH"
-SOH_VERSION="0.0.1"
+SOH_VERSION="0.0.2"
$proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
@@ -43,10 +43,11 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# Names
$mtTurtle = 'text/turtle;charset=utf-8'
-$mtJsonLD = 'application/ld+json'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
-$mtNQuads = 'text/n-quads'
+$mtNTriples = 'application/n-triples'
+$mtNQuads = 'application/n-quads'
+$mtJSONLD = 'application/ld+json'
$mtTriG = 'application/trig'
$mtSparqlResultsX = 'application/sparql-results+xml'
$mtSparqlResultsJ = 'application/sparql-results+json'
@@ -61,13 +62,14 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['jsonld'] = $mtJsonLD
$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
$fileMediaTypes['nq'] = $mtNQuads
$fileMediaTypes['trig'] = $mtTriG
+$fileMediaTypes['json-ld'] = $mtJSONLD
+$fileMediaTypes['jsonld'] = $mtJSONLD
# Global charset : no entry means "don't set"
$charsetUTF8 = 'utf-8'
@@ -75,7 +77,7 @@ $charset = {}
$charset[$mtTurtle] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
-$charset[$mtNQuads] = 'ascii'
+$charset[$mtNQuads] = 'utf-8'
# Headers
@@ -94,8 +96,10 @@ $headers = { "User-Agent" => "#{SOH_NAME}/Fuseki #{SOH_VERSION}"}
$print_http = false
# Default for GET
-# At least allow anythign (and hope!)
-$accept_rdf="#{$mtRDF};q=0.9 , #{$mtTurtle}"
+# At least allow anything (and hope!)
+$accept_rdf="#{$mtTurtle} , #{$mtNTriples};q=0.9 , #{$mtRDF};q=0.8 , #{$mtJSONLD};q=0.5"
+# Datasets
+$accept_ds="#{$mtTrig} , #{$mtNQuads};q=0.9 , #{$mtJSONLD};q=0.5"
# For SPARQL query
$accept_results="#{$mtSparqlResultsJ} , #{$mtSparqlResultsX};q=0.9 , #{$accept_rdf}"
http://git-wip-us.apache.org/repos/asf/jena/blob/a1b3182b/jena-fuseki2/apache-jena-fuseki/bin/s-query
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-query b/jena-fuseki2/apache-jena-fuseki/bin/s-query
index dcf7f6e..9f6a619 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-query
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-query
@@ -35,7 +35,7 @@ require 'ostruct'
# Follow redirects => 301: puts response["location"] # All headers are lowercase?
SOH_NAME="SOH"
-SOH_VERSION="0.0.1"
+SOH_VERSION="0.0.2"
$proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
@@ -43,10 +43,11 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# Names
$mtTurtle = 'text/turtle;charset=utf-8'
-$mtJsonLD = 'application/ld+json'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
-$mtNQuads = 'text/n-quads'
+$mtNTriples = 'application/n-triples'
+$mtNQuads = 'application/n-quads'
+$mtJSONLD = 'application/ld+json'
$mtTriG = 'application/trig'
$mtSparqlResultsX = 'application/sparql-results+xml'
$mtSparqlResultsJ = 'application/sparql-results+json'
@@ -61,13 +62,14 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['jsonld'] = $mtJsonLD
$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
$fileMediaTypes['nq'] = $mtNQuads
$fileMediaTypes['trig'] = $mtTriG
+$fileMediaTypes['json-ld'] = $mtJSONLD
+$fileMediaTypes['jsonld'] = $mtJSONLD
# Global charset : no entry means "don't set"
$charsetUTF8 = 'utf-8'
@@ -75,7 +77,7 @@ $charset = {}
$charset[$mtTurtle] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
-$charset[$mtNQuads] = 'ascii'
+$charset[$mtNQuads] = 'utf-8'
# Headers
@@ -94,8 +96,10 @@ $headers = { "User-Agent" => "#{SOH_NAME}/Fuseki #{SOH_VERSION}"}
$print_http = false
# Default for GET
-# At least allow anythign (and hope!)
-$accept_rdf="#{$mtRDF};q=0.9 , #{$mtTurtle}"
+# At least allow anything (and hope!)
+$accept_rdf="#{$mtTurtle} , #{$mtNTriples};q=0.9 , #{$mtRDF};q=0.8 , #{$mtJSONLD};q=0.5"
+# Datasets
+$accept_ds="#{$mtTrig} , #{$mtNQuads};q=0.9 , #{$mtJSONLD};q=0.5"
# For SPARQL query
$accept_results="#{$mtSparqlResultsJ} , #{$mtSparqlResultsX};q=0.9 , #{$accept_rdf}"
http://git-wip-us.apache.org/repos/asf/jena/blob/a1b3182b/jena-fuseki2/apache-jena-fuseki/bin/s-update
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-update b/jena-fuseki2/apache-jena-fuseki/bin/s-update
index dcf7f6e..9f6a619 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-update
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-update
@@ -35,7 +35,7 @@ require 'ostruct'
# Follow redirects => 301: puts response["location"] # All headers are lowercase?
SOH_NAME="SOH"
-SOH_VERSION="0.0.1"
+SOH_VERSION="0.0.2"
$proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
@@ -43,10 +43,11 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# Names
$mtTurtle = 'text/turtle;charset=utf-8'
-$mtJsonLD = 'application/ld+json'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
-$mtNQuads = 'text/n-quads'
+$mtNTriples = 'application/n-triples'
+$mtNQuads = 'application/n-quads'
+$mtJSONLD = 'application/ld+json'
$mtTriG = 'application/trig'
$mtSparqlResultsX = 'application/sparql-results+xml'
$mtSparqlResultsJ = 'application/sparql-results+json'
@@ -61,13 +62,14 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['jsonld'] = $mtJsonLD
$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
$fileMediaTypes['nq'] = $mtNQuads
$fileMediaTypes['trig'] = $mtTriG
+$fileMediaTypes['json-ld'] = $mtJSONLD
+$fileMediaTypes['jsonld'] = $mtJSONLD
# Global charset : no entry means "don't set"
$charsetUTF8 = 'utf-8'
@@ -75,7 +77,7 @@ $charset = {}
$charset[$mtTurtle] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
-$charset[$mtNQuads] = 'ascii'
+$charset[$mtNQuads] = 'utf-8'
# Headers
@@ -94,8 +96,10 @@ $headers = { "User-Agent" => "#{SOH_NAME}/Fuseki #{SOH_VERSION}"}
$print_http = false
# Default for GET
-# At least allow anythign (and hope!)
-$accept_rdf="#{$mtRDF};q=0.9 , #{$mtTurtle}"
+# At least allow anything (and hope!)
+$accept_rdf="#{$mtTurtle} , #{$mtNTriples};q=0.9 , #{$mtRDF};q=0.8 , #{$mtJSONLD};q=0.5"
+# Datasets
+$accept_ds="#{$mtTrig} , #{$mtNQuads};q=0.9 , #{$mtJSONLD};q=0.5"
# For SPARQL query
$accept_results="#{$mtSparqlResultsJ} , #{$mtSparqlResultsX};q=0.9 , #{$accept_rdf}"
http://git-wip-us.apache.org/repos/asf/jena/blob/a1b3182b/jena-fuseki2/apache-jena-fuseki/bin/s-update-form
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-update-form b/jena-fuseki2/apache-jena-fuseki/bin/s-update-form
index dcf7f6e..9f6a619 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-update-form
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-update-form
@@ -35,7 +35,7 @@ require 'ostruct'
# Follow redirects => 301: puts response["location"] # All headers are lowercase?
SOH_NAME="SOH"
-SOH_VERSION="0.0.1"
+SOH_VERSION="0.0.2"
$proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
@@ -43,10 +43,11 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# Names
$mtTurtle = 'text/turtle;charset=utf-8'
-$mtJsonLD = 'application/ld+json'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
-$mtNQuads = 'text/n-quads'
+$mtNTriples = 'application/n-triples'
+$mtNQuads = 'application/n-quads'
+$mtJSONLD = 'application/ld+json'
$mtTriG = 'application/trig'
$mtSparqlResultsX = 'application/sparql-results+xml'
$mtSparqlResultsJ = 'application/sparql-results+json'
@@ -61,13 +62,14 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['jsonld'] = $mtJsonLD
$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
$fileMediaTypes['nq'] = $mtNQuads
$fileMediaTypes['trig'] = $mtTriG
+$fileMediaTypes['json-ld'] = $mtJSONLD
+$fileMediaTypes['jsonld'] = $mtJSONLD
# Global charset : no entry means "don't set"
$charsetUTF8 = 'utf-8'
@@ -75,7 +77,7 @@ $charset = {}
$charset[$mtTurtle] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
-$charset[$mtNQuads] = 'ascii'
+$charset[$mtNQuads] = 'utf-8'
# Headers
@@ -94,8 +96,10 @@ $headers = { "User-Agent" => "#{SOH_NAME}/Fuseki #{SOH_VERSION}"}
$print_http = false
# Default for GET
-# At least allow anythign (and hope!)
-$accept_rdf="#{$mtRDF};q=0.9 , #{$mtTurtle}"
+# At least allow anything (and hope!)
+$accept_rdf="#{$mtTurtle} , #{$mtNTriples};q=0.9 , #{$mtRDF};q=0.8 , #{$mtJSONLD};q=0.5"
+# Datasets
+$accept_ds="#{$mtTrig} , #{$mtNQuads};q=0.9 , #{$mtJSONLD};q=0.5"
# For SPARQL query
$accept_results="#{$mtSparqlResultsJ} , #{$mtSparqlResultsX};q=0.9 , #{$accept_rdf}"
http://git-wip-us.apache.org/repos/asf/jena/blob/a1b3182b/jena-fuseki2/apache-jena-fuseki/bin/soh
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/soh b/jena-fuseki2/apache-jena-fuseki/bin/soh
index dcf7f6e..9f6a619 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/soh
+++ b/jena-fuseki2/apache-jena-fuseki/bin/soh
@@ -35,7 +35,7 @@ require 'ostruct'
# Follow redirects => 301: puts response["location"] # All headers are lowercase?
SOH_NAME="SOH"
-SOH_VERSION="0.0.1"
+SOH_VERSION="0.0.2"
$proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
@@ -43,10 +43,11 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# Names
$mtTurtle = 'text/turtle;charset=utf-8'
-$mtJsonLD = 'application/ld+json'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
-$mtNQuads = 'text/n-quads'
+$mtNTriples = 'application/n-triples'
+$mtNQuads = 'application/n-quads'
+$mtJSONLD = 'application/ld+json'
$mtTriG = 'application/trig'
$mtSparqlResultsX = 'application/sparql-results+xml'
$mtSparqlResultsJ = 'application/sparql-results+json'
@@ -61,13 +62,14 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['jsonld'] = $mtJsonLD
$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
$fileMediaTypes['nq'] = $mtNQuads
$fileMediaTypes['trig'] = $mtTriG
+$fileMediaTypes['json-ld'] = $mtJSONLD
+$fileMediaTypes['jsonld'] = $mtJSONLD
# Global charset : no entry means "don't set"
$charsetUTF8 = 'utf-8'
@@ -75,7 +77,7 @@ $charset = {}
$charset[$mtTurtle] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
-$charset[$mtNQuads] = 'ascii'
+$charset[$mtNQuads] = 'utf-8'
# Headers
@@ -94,8 +96,10 @@ $headers = { "User-Agent" => "#{SOH_NAME}/Fuseki #{SOH_VERSION}"}
$print_http = false
# Default for GET
-# At least allow anythign (and hope!)
-$accept_rdf="#{$mtRDF};q=0.9 , #{$mtTurtle}"
+# At least allow anything (and hope!)
+$accept_rdf="#{$mtTurtle} , #{$mtNTriples};q=0.9 , #{$mtRDF};q=0.8 , #{$mtJSONLD};q=0.5"
+# Datasets
+$accept_ds="#{$mtTrig} , #{$mtNQuads};q=0.9 , #{$mtJSONLD};q=0.5"
# For SPARQL query
$accept_results="#{$mtSparqlResultsJ} , #{$mtSparqlResultsX};q=0.9 , #{$accept_rdf}"