Author: andy
Date: Sun Dec 8 17:32:48 2013
New Revision: 1549072
URL: http://svn.apache.org/r1549072
Log:
Adjust to ARQ changes.
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java?rev=1549072&r1=1549071&r2=1549072&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java
(original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java
Sun Dec 8 17:32:48 2013
@@ -28,7 +28,7 @@ import org.apache.jena.atlas.lib.MultiMa
import org.apache.jena.atlas.web.ContentType ;
import org.apache.jena.fuseki.servlets.HttpAction ;
import org.apache.jena.riot.Lang ;
-import org.apache.jena.riot.WebContent ;
+import org.apache.jena.riot.RDFLanguages ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
@@ -67,7 +67,7 @@ public class FusekiLib {
String contentTypeHeader = action.request.getContentType() ;
if ( contentTypeHeader == null )
return dft ;
- return WebContent.contentTypeToLang(contentTypeHeader) ;
+ return RDFLanguages.contentTypeToLang(contentTypeHeader) ;
}
static String fmtRequest(HttpServletRequest request) {
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java?rev=1549072&r1=1549071&r2=1549072&view=diff
==============================================================================
---
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java
(original)
+++
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java
Sun Dec 8 17:32:48 2013
@@ -61,7 +61,7 @@ public class REST_Quads extends SPARQL_R
catch (IOException ex) { errorOccurred(ex) ; output = null ; }
TypedOutputStream out = new TypedOutputStream(output, mediaType) ;
- Lang lang = WebContent.contentTypeToLang(mediaType.getContentType()) ;
+ Lang lang = RDFLanguages.contentTypeToLang(mediaType.getContentType())
;
if ( lang == null )
lang = RDFLanguages.TRIG ;
@@ -117,7 +117,7 @@ public class REST_Quads extends SPARQL_R
errorBadRequest("Content-type required for data format") ;
MediaType mediaType = MediaType.create(x) ;
- Lang lang = WebContent.contentTypeToLang(mediaType.getContentType()) ;
+ Lang lang = RDFLanguages.contentTypeToLang(mediaType.getContentType())
;
if ( lang == null )
lang = RDFLanguages.TRIG ;
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java?rev=1549072&r1=1549071&r2=1549072&view=diff
==============================================================================
---
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
(original)
+++
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
Sun Dec 8 17:32:48 2013
@@ -36,6 +36,7 @@ import org.apache.jena.fuseki.conneg.Con
import org.apache.jena.fuseki.conneg.WebLib ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.jena.riot.RDFLanguages ;
import org.apache.jena.riot.WebContent ;
import org.apache.jena.web.HttpSC ;
import org.slf4j.Logger ;
@@ -104,7 +105,7 @@ public class ResponseModel
charset = WebContent.charsetUTF8 ;
}
- Lang lang = WebContent.contentTypeToLang(contentType) ;
+ Lang lang = RDFLanguages.contentTypeToLang(contentType) ;
if ( lang == null )
errorBadRequest("Can't determine output content type:
"+contentType) ;
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java?rev=1549072&r1=1549071&r2=1549072&view=diff
==============================================================================
---
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java
(original)
+++
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java
Sun Dec 8 17:32:48 2013
@@ -53,7 +53,7 @@ public class SPARQL_REST_R extends SPARQ
catch (IOException ex) { errorOccurred(ex) ; output = null ; }
TypedOutputStream out = new TypedOutputStream(output, mediaType) ;
- Lang lang = WebContent.contentTypeToLang(mediaType.getContentType()) ;
+ Lang lang = RDFLanguages.contentTypeToLang(mediaType.getContentType())
;
if ( action.verbose )
log.info(format("[%d] Get: Content-Type=%s, Charset=%s => %s",
@@ -70,7 +70,7 @@ public class SPARQL_REST_R extends SPARQ
errorNotFound("No such graph: <"+target.name+">") ;
// If we want to set the Content-Length, we need to buffer.
//response.setContentLength(??) ;
- String ct = WebContent.mapLangToContentType(lang) ;
+ String ct = lang.getContentType().toHeaderString() ;
action.response.setContentType(ct) ;
Graph g = target.graph() ;
//Special case RDF/XML to be the plain (faster, less readable) form
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java?rev=1549072&r1=1549071&r2=1549072&view=diff
==============================================================================
---
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java
(original)
+++
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java
Sun Dec 8 17:32:48 2013
@@ -28,6 +28,7 @@ import org.apache.jena.atlas.web.Content
import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.fuseki.HttpNames ;
import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFLanguages ;
import org.apache.jena.riot.RiotException ;
import org.apache.jena.riot.WebContent ;
import org.apache.jena.riot.system.StreamRDF ;
@@ -189,7 +190,7 @@ public class SPARQL_REST_RW extends SPAR
private static void incomingData(HttpAction action, StreamRDF dest) {
String base = wholeRequestURL(action.request) ;
ContentType ct = FusekiLib.getContentType(action) ;
- Lang lang = WebContent.contentTypeToLang(ct.getContentType()) ;
+ Lang lang = RDFLanguages.contentTypeToLang(ct.getContentType()) ;
if ( lang == null ) {
errorBadRequest("Unknown content type for triples: " + ct) ;
return ;
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java?rev=1549072&r1=1549071&r2=1549072&view=diff
==============================================================================
---
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
(original)
+++
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
Sun Dec 8 17:32:48 2013
@@ -22,8 +22,8 @@ import static java.lang.String.format ;
import java.io.IOException ;
import java.io.InputStream ;
-import java.io.PrintWriter;
-import java.util.zip.GZIPInputStream;
+import java.io.PrintWriter ;
+import java.util.zip.GZIPInputStream ;
import javax.servlet.ServletException ;
import javax.servlet.http.HttpServletRequest ;
@@ -40,7 +40,6 @@ import org.apache.jena.fuseki.HttpNames
import org.apache.jena.iri.IRI ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFLanguages ;
-import org.apache.jena.riot.WebContent ;
import org.apache.jena.riot.lang.StreamRDFCounting ;
import org.apache.jena.riot.system.* ;
import org.apache.jena.web.HttpSC ;
@@ -222,7 +221,7 @@ public class SPARQL_Upload extends SPARQ
String contentTypeHeader = item.getContentType() ;
ct = ContentType.create(contentTypeHeader) ;
- lang = WebContent.contentTypeToLang(ct.getContentType()) ;
+ lang = RDFLanguages.contentTypeToLang(ct.getContentType())
;
if ( lang == null ) {
lang = RDFLanguages.filenameToLang(name) ;
