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 2014/02/04 23:21:12 UTC

svn commit: r1564534 - in /jena/trunk/jena-fuseki: run-fuseki run_cp run_fuseki soh src/main/java/org/apache/jena/fuseki/DEF.java

Author: andy
Date: Tue Feb  4 22:21:12 2014
New Revision: 1564534

URL: http://svn.apache.org/r1564534
Log:
JENA-633 : JSON-LD Support.

Added:
    jena/trunk/jena-fuseki/run-fuseki
      - copied unchanged from r1560124, jena/trunk/jena-fuseki/run_fuseki
Removed:
    jena/trunk/jena-fuseki/run_fuseki
Modified:
    jena/trunk/jena-fuseki/run_cp
    jena/trunk/jena-fuseki/soh
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DEF.java

Modified: jena/trunk/jena-fuseki/run_cp
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/run_cp?rev=1564534&r1=1564533&r2=1564534&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/run_cp (original)
+++ jena/trunk/jena-fuseki/run_cp Tue Feb  4 22:21:12 2014
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-XCP="/home/afs/.m2/repo/org/apache/jena/jena-arq/2.11.1-SNAPSHOT/jena-arq-2.11.1-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/jena/jena-arq/2.11.1-SNAPSHOT/jena-arq-2.11.1-SNAPSHOT-tests.jar:/home/afs/.m2/repo/org/apache/jena/jena-core/2.11.1-SNAPSHOT/jena-core-2.11.1-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/jena/jena-iri/1.0.1-SNAPSHOT/jena-iri-1.0.1-SNAPSHOT.jar:/home/afs/.m2/repo/xerces/xercesImpl/2.11.0/xercesImpl-2.11.0.jar:/home/afs/.m2/repo/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar:/home/afs/.m2/repo/org/apache/jena/jena-tdb/1.0.1-SNAPSHOT/jena-tdb-1.0.1-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/jena/jena-text/1.0.1-SNAPSHOT/jena-text-1.0.1-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/jena/apache-jena-libs/2.11.1-SNAPSHOT/apache-jena-libs-2.11.1-SNAPSHOT.pom:/home/afs/.m2/repo/org/apache/lucene/lucene-core/4.3.1/lucene-core-4.3.1.jar:/home/afs/.m2/repo/org/apache/lucene/lucene-analyzers-common/4.3.1/lucene-analyzers-common-4.3.1.jar:/home/afs/.m2/repo/org/apache/lucene/luce
 ne-queryparser/4.3.1/lucene-queryparser-4.3.1.jar:/home/afs/.m2/repo/org/apache/lucene/lucene-queries/4.3.1/lucene-queries-4.3.1.jar:/home/afs/.m2/repo/org/apache/lucene/lucene-sandbox/4.3.1/lucene-sandbox-4.3.1.jar:/home/afs/.m2/repo/jakarta-regexp/jakarta-regexp/1.4/jakarta-regexp-1.4.jar:/home/afs/.m2/repo/org/apache/solr/solr-solrj/4.3.1/solr-solrj-4.3.1.jar:/home/afs/.m2/repo/org/apache/zookeeper/zookeeper/3.4.5/zookeeper-3.4.5.jar:/home/afs/.m2/repo/commons-io/commons-io/2.1/commons-io-2.1.jar:/home/afs/.m2/repo/org/noggit/noggit/0.5/noggit-0.5.jar:/home/afs/.m2/repo/org/apache/httpcomponents/httpmime/4.2.3/httpmime-4.2.3.jar:/home/afs/.m2/repo/org/codehaus/woodstox/wstx-asl/3.2.7/wstx-asl-3.2.7.jar:/home/afs/.m2/repo/org/apache/jena/jena-spatial/1.0.1-SNAPSHOT/jena-spatial-1.0.1-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/lucene/lucene-spatial/4.3.1/lucene-spatial-4.3.1.jar:/home/afs/.m2/repo/com/spatial4j/spatial4j/0.3/spatial4j-0.3.jar:/home/afs/.m2/repo/junit/junit/4.11/jun
 it-4.11.jar:/home/afs/.m2/repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:/home/afs/.m2/repo/org/apache/httpcomponents/httpclient/4.2.3/httpclient-4.2.3.jar:/home/afs/.m2/repo/org/apache/httpcomponents/httpcore/4.2.2/httpcore-4.2.2.jar:/home/afs/.m2/repo/commons-codec/commons-codec/1.6/commons-codec-1.6.jar:/home/afs/.m2/repo/commons-fileupload/commons-fileupload/1.2.2/commons-fileupload-1.2.2.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-server/8.1.11.v20130520/jetty-server-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-continuation/8.1.11.v20130520/jetty-continuation-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-http/8.1.11.v20130520/jetty-http-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-io/8.1.11.v20130520/jetty-io-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-servlet/8.1.11.v20130520
 /jetty-servlet-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-servlets/8.1.11.v20130520/jetty-servlets-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-client/8.1.11.v20130520/jetty-client-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-xml/8.1.11.v20130520/jetty-xml-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-security/8.1.11.v20130520/jetty-security-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-util/8.1.11.v20130520/jetty-util-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/apache/velocity/velocity/1.7/velocity-1.7.jar:/home/afs/.m2/repo/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar:/home/afs/.m2/repo/commons-lang/commons-lang/2.4/commons-lang-2.4.jar:/home/afs/.m2/repo/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar:/home/afs/.m2/repo/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar:/home/afs/.m2/repo/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4.jar:/home/afs/.
 m2/repo/log4j/log4j/1.2.16/log4j-1.2.16.jar"
+XCP="/home/afs/.m2/repo/org/apache/jena/jena-arq/2.11.2-SNAPSHOT/jena-arq-2.11.2-SNAPSHOT.jar:/home/afs/.m2/repo/com/github/jsonld-java/jsonld-java/0.2/jsonld-java-0.2.jar:/home/afs/.m2/repo/com/fasterxml/jackson/core/jackson-core/2.2.1/jackson-core-2.2.1.jar:/home/afs/.m2/repo/com/fasterxml/jackson/core/jackson-databind/2.2.1/jackson-databind-2.2.1.jar:/home/afs/.m2/repo/com/fasterxml/jackson/core/jackson-annotations/2.2.1/jackson-annotations-2.2.1.jar:/home/afs/.m2/repo/org/apache/httpcomponents/httpclient-cache/4.2.3/httpclient-cache-4.2.3.jar:/home/afs/.m2/repo/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar:/home/afs/.m2/repo/org/apache/jena/jena-arq/2.11.2-SNAPSHOT/jena-arq-2.11.2-SNAPSHOT-tests.jar:/home/afs/.m2/repo/org/apache/jena/jena-core/2.11.2-SNAPSHOT/jena-core-2.11.2-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/jena/jena-iri/1.0.2-SNAPSHOT/jena-iri-1.0.2-SNAPSHOT.jar:/home/afs/.m2/repo/xerces/xercesImpl/2.11.0/xercesImpl-2.11.0.jar:/home/afs/.m2/repo/xml
 -apis/xml-apis/1.4.01/xml-apis-1.4.01.jar:/home/afs/.m2/repo/org/apache/jena/jena-tdb/1.0.2-SNAPSHOT/jena-tdb-1.0.2-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/jena/jena-text/1.0.2-SNAPSHOT/jena-text-1.0.2-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/jena/apache-jena-libs/2.11.2-SNAPSHOT/apache-jena-libs-2.11.2-SNAPSHOT.pom:/home/afs/.m2/repo/org/apache/lucene/lucene-core/4.3.1/lucene-core-4.3.1.jar:/home/afs/.m2/repo/org/apache/lucene/lucene-analyzers-common/4.3.1/lucene-analyzers-common-4.3.1.jar:/home/afs/.m2/repo/org/apache/lucene/lucene-queryparser/4.3.1/lucene-queryparser-4.3.1.jar:/home/afs/.m2/repo/org/apache/lucene/lucene-queries/4.3.1/lucene-queries-4.3.1.jar:/home/afs/.m2/repo/org/apache/lucene/lucene-sandbox/4.3.1/lucene-sandbox-4.3.1.jar:/home/afs/.m2/repo/jakarta-regexp/jakarta-regexp/1.4/jakarta-regexp-1.4.jar:/home/afs/.m2/repo/org/apache/solr/solr-solrj/4.3.1/solr-solrj-4.3.1.jar:/home/afs/.m2/repo/org/apache/zookeeper/zookeeper/3.4.5/zookeeper-3.4.5.jar:/home/afs/.m2/
 repo/commons-io/commons-io/2.1/commons-io-2.1.jar:/home/afs/.m2/repo/org/noggit/noggit/0.5/noggit-0.5.jar:/home/afs/.m2/repo/org/apache/httpcomponents/httpmime/4.2.3/httpmime-4.2.3.jar:/home/afs/.m2/repo/org/codehaus/woodstox/wstx-asl/3.2.7/wstx-asl-3.2.7.jar:/home/afs/.m2/repo/org/apache/jena/jena-spatial/1.0.2-SNAPSHOT/jena-spatial-1.0.2-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/lucene/lucene-spatial/4.3.1/lucene-spatial-4.3.1.jar:/home/afs/.m2/repo/com/spatial4j/spatial4j/0.3/spatial4j-0.3.jar:/home/afs/.m2/repo/junit/junit/4.11/junit-4.11.jar:/home/afs/.m2/repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:/home/afs/.m2/repo/org/apache/httpcomponents/httpclient/4.2.3/httpclient-4.2.3.jar:/home/afs/.m2/repo/org/apache/httpcomponents/httpcore/4.2.2/httpcore-4.2.2.jar:/home/afs/.m2/repo/commons-codec/commons-codec/1.6/commons-codec-1.6.jar:/home/afs/.m2/repo/commons-fileupload/commons-fileupload/1.2.2/commons-fileupload-1.2.2.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-s
 erver/8.1.11.v20130520/jetty-server-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-continuation/8.1.11.v20130520/jetty-continuation-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-http/8.1.11.v20130520/jetty-http-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-io/8.1.11.v20130520/jetty-io-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-servlet/8.1.11.v20130520/jetty-servlet-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-servlets/8.1.11.v20130520/jetty-servlets-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-client/8.1.11.v20130520/jetty-client-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-xml/8.1.11.v20130520/jetty-xml-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-security/8.1.11.v20130520/jetty-security-8.1.11.v20130520.jar:/home/afs/.m2
 /repo/org/eclipse/jetty/jetty-util/8.1.11.v20130520/jetty-util-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/apache/velocity/velocity/1.7/velocity-1.7.jar:/home/afs/.m2/repo/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar:/home/afs/.m2/repo/commons-lang/commons-lang/2.4/commons-lang-2.4.jar:/home/afs/.m2/repo/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar:/home/afs/.m2/repo/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar:/home/afs/.m2/repo/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4.jar:/home/afs/.m2/repo/log4j/log4j/1.2.16/log4j-1.2.16.jar"
 
 if [ "$CP" != '' ]
 then

Modified: jena/trunk/jena-fuseki/soh
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/soh?rev=1564534&r1=1564533&r2=1564534&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/soh (original)
+++ jena/trunk/jena-fuseki/soh Tue Feb  4 22:21:12 2014
@@ -45,7 +45,9 @@ $proxy = ENV['http_proxy'] ? URI.parse(E
 $mtTurtle           = 'text/turtle;charset=utf-8'
 $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'
@@ -66,6 +68,8 @@ $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'
@@ -73,7 +77,7 @@ $charset = {}
 $charset[$mtTurtle]   = 'utf-8'
 $charset[$mtText]     = 'ascii'
 $charset[$mtTriG]     = 'utf-8'
-$charset[$mtNQuads]   = 'ascii'
+$charset[$mtNQuads]   = 'utf-8'
 
 # Headers
 
@@ -92,8 +96,10 @@ $headers = { "User-Agent" => "#{SOH_NAME
 $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}"
 

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DEF.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DEF.java?rev=1564534&r1=1564533&r2=1564534&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DEF.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DEF.java Tue Feb  4 22:21:12 2014
@@ -18,40 +18,39 @@
 
 package org.apache.jena.fuseki;
 
+import static org.apache.jena.riot.WebContent.* ;
 import org.apache.jena.atlas.web.AcceptList ;
 import org.apache.jena.atlas.web.MediaType ;
-import org.apache.jena.riot.WebContent ;
 
 public class DEF
 {
-    public static final MediaType acceptRDFXML        = MediaType.create(WebContent.contentTypeRDFXML) ;
-    public static final MediaType acceptTurtle1       = MediaType.create(WebContent.contentTypeTurtle) ;
-    public static final MediaType acceptTurtle2       = MediaType.create(WebContent.contentTypeTurtleAlt1) ;
-    public static final MediaType acceptTurtle3       = MediaType.create(WebContent.contentTypeTurtleAlt2) ;
-    public static final MediaType acceptNTriples      = MediaType.create(WebContent.contentTypeNTriples) ;
-    public static final MediaType acceptNTriplesAlt   = MediaType.create(WebContent.contentTypeNTriplesAlt) ;
-    public static final MediaType acceptTriG          = MediaType.create(WebContent.contentTypeTriG) ;
-    public static final MediaType acceptTriGAlt1      = MediaType.create(WebContent.contentTypeTriGAlt1) ;
-    public static final MediaType acceptTriGAlt2      = MediaType.create(WebContent.contentTypeTriGAlt2) ;
-    public static final MediaType acceptRDFJSON       = MediaType.create(WebContent.contentTypeRDFJSON) ; 
-    public static final MediaType acceptNQuads        = MediaType.create(WebContent.contentTypeNQuads) ;
-    public static final MediaType acceptNQuadsAlt1    = MediaType.create(WebContent.contentTypeNQuadsAlt1) ;
-    public static final MediaType acceptNQuadsAlt2    = MediaType.create(WebContent.contentTypeNQuadsAlt2) ;
-   
-    public static final MediaType acceptRSXML         = MediaType.create(WebContent.contentTypeResultsXML) ;
+    public static final MediaType acceptRDFXML        = MediaType.create(contentTypeRDFXML) ;
+    public static final MediaType acceptNQuads        = MediaType.create(contentTypeNQuads) ;
+    public static final MediaType acceptRSXML         = MediaType.create(contentTypeResultsXML) ;
 
-    public static final AcceptList rdfOffer           = AcceptList.create(acceptTurtle1, acceptTurtle2, acceptTurtle3, 
-                                                                          acceptNTriples, acceptNTriplesAlt,
-                                                                          acceptRDFXML, 
-                                                                          acceptRDFJSON) ;
+    public static final AcceptList rdfOffer           = AcceptList.create(contentTypeTurtle, 
+                                                                          contentTypeTurtleAlt1,
+                                                                          contentTypeTurtleAlt2,
+                                                                          contentTypeNTriples,
+                                                                          contentTypeNTriplesAlt,
+                                                                          contentTypeRDFXML,
+                                                                          contentTypeJSONLD,
+                                                                          contentTypeRDFJSON
+                                                                          ) ;
     
-    public static final AcceptList quadsOffer         = AcceptList.create(acceptTriG, acceptTriGAlt1, acceptTriGAlt2,
-                                                                          acceptNQuads, acceptNQuadsAlt1, acceptNQuadsAlt2 
+    public static final AcceptList quadsOffer         = AcceptList.create(contentTypeTriG,
+                                                                          contentTypeTriGAlt1,
+                                                                          contentTypeTriGAlt2,
+                                                                          contentTypeJSONLD,
+                                                                          contentTypeNQuads,
+                                                                          contentTypeNQuadsAlt1,
+                                                                          contentTypeNQuadsAlt2 
                                                                           ) ;
     
-    public static final AcceptList rsOffer            = AcceptList.create(WebContent.contentTypeResultsJSON,
-                                                                          WebContent.contentTypeTextCSV,
-                                                                          WebContent.contentTypeTextTSV,
-                                                                          WebContent.contentTypeResultsXML,
-                                                                          WebContent.contentTypeTextPlain) ;
+    public static final AcceptList rsOffer            = AcceptList.create(contentTypeResultsJSON,
+                                                                          contentTypeTextCSV,
+                                                                          contentTypeTextTSV,
+                                                                          contentTypeResultsXML,
+                                                                          contentTypeTextPlain
+                                                                          ) ;
 }