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 2013/12/08 18:34:49 UTC
svn commit: r1549074 - in /jena/branches/jena-fuseki-new-ui: ./
src/main/java/org/apache/jena/fuseki/
src/main/java/org/apache/jena/fuseki/mgt/
src/main/java/org/apache/jena/fuseki/server/
src/main/java/org/apache/jena/fuseki/servlets/
Author: andy
Date: Sun Dec 8 17:34:48 2013
New Revision: 1549074
URL: http://svn.apache.org/r1549074
Log:
Admin request lifecycle. Align to ARQ changes
Modified:
jena/branches/jena-fuseki-new-ui/ (props changed)
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiLib.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ManagementServer.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/DatasetRef.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionSPARQL.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
Propchange: jena/branches/jena-fuseki-new-ui/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Dec 8 17:34:48 2013
@@ -15,3 +15,4 @@ log
configure
systems
datasets
+system
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiLib.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiLib.java?rev=1549074&r1=1549073&r2=1549074&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiLib.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiLib.java Sun Dec 8 17:34: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/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java?rev=1549074&r1=1549073&r2=1549074&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java Sun Dec 8 17:34:48 2013
@@ -44,7 +44,7 @@ import org.apache.jena.web.HttpSC ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.util.Utils ;
-public class ActionBackup extends ActionCtl
+public class ActionBackup extends ActionCtl /* XXX This is a RequestAction not a control action */
{
public ActionBackup() { super() ; }
@@ -81,7 +81,7 @@ public class ActionBackup extends Action
}
DatasetRef ref = DatasetRegistry.get().get(dataset) ;
- action.setDataset(ref);
+ action.setRequestRef(ref);
scheduleBackup(action) ;
success(action) ;
}
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java?rev=1549074&r1=1549073&r2=1549074&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java Sun Dec 8 17:34:48 2013
@@ -44,7 +44,7 @@ public abstract class ActionCtl extends
dsRef.name = name ;
}
action.datasetName = name ;
- action.setDataset(dsRef) ;
+ action.setControlRef(dsRef) ;
executeAction(action) ;
}
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java?rev=1549074&r1=1549073&r2=1549074&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java Sun Dec 8 17:34:48 2013
@@ -34,15 +34,13 @@ import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.json.JSON ;
import org.apache.jena.atlas.json.JsonBuilder ;
import org.apache.jena.atlas.json.JsonValue ;
+import org.apache.jena.atlas.lib.InternalErrorException ;
import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.atlas.web.ContentType ;
import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.fuseki.server.* ;
import org.apache.jena.fuseki.servlets.HttpAction ;
-import org.apache.jena.riot.Lang ;
-import org.apache.jena.riot.RiotException ;
-import org.apache.jena.riot.RiotReader ;
-import org.apache.jena.riot.WebContent ;
+import org.apache.jena.riot.* ;
import org.apache.jena.riot.lang.LangRIOT ;
import org.apache.jena.riot.system.ErrorHandler ;
import org.apache.jena.riot.system.ErrorHandlerFactory ;
@@ -67,16 +65,9 @@ import com.hp.hpl.jena.update.UpdateRequ
public class ActionDatasets extends ActionCtl {
// XXX DatasetRef to include UUID : see execPostDataset
- // XXX Build registry from system database
- // XXX Put the system database somewhere on disk.
- // XXX
// DatasetRef ref = processService(s) ;
// Needs to do the state.
- // DORMANT on restart excludes on counters. Not initialised.
- // DORMANT - close or not close?
- // ACTIVE - initialize.
-
private static Dataset system = SystemState.dataset ;
private static DatasetGraphTransaction systemDSG = SystemState.dsg ;
@@ -187,6 +178,7 @@ public class ActionDatasets extends Acti
if ( s == null || s.isEmpty() )
errorBadRequest("No state change given") ;
+ // setDatasetState is a transaction on the pesistent state of the server.
if ( s.equalsIgnoreCase("active") ) {
setDatasetState(name, FusekiVocab.stateActive) ;
dsDesc.activate() ;
@@ -238,14 +230,19 @@ public class ActionDatasets extends Acti
Model model = system.getNamedModel(newURI) ;
StreamRDF dest = StreamRDFLib.graph(model.getGraph()) ;
bodyAsGraph(action, dest) ;
- // Find name.
+ // Find name. SPARQL?
- StmtIterator sIter = model.listStatements(null, pServiceName, (RDFNode)null ) ;
- if ( ! sIter.hasNext() )
- errorBadRequest("No name given in description of Fuseki service") ;
- Statement stmt = sIter.next() ;
- if ( sIter.hasNext() )
- errorBadRequest("Multiple names given in description of Fuseki service") ;
+ Statement stmt = getOne(model, null, pServiceName, null) ;
+ if ( stmt == null ) {
+ StmtIterator sIter = model.listStatements(null, pServiceName, (RDFNode)null ) ;
+ if ( ! sIter.hasNext() )
+ errorBadRequest("No name given in description of Fuseki service") ;
+ sIter.next() ;
+ if ( sIter.hasNext() )
+ errorBadRequest("Multiple names given in description of Fuseki service") ;
+ throw new InternalErrorException("Inconsistent: getOne didn't fail the second time") ;
+ }
+
if ( ! stmt.getObject().isLiteral() )
errorBadRequest("Found "+FmtUtils.stringForRDFNode(stmt.getObject())+" : Service names are strings, then used to build the external URI") ;
@@ -260,6 +257,7 @@ public class ActionDatasets extends Acti
model.add(subject, pStatus, FusekiVocab.stateActive) ;
String datasetPath = DatasetRef.canocialDatasetPath(datasetName) ;
+ // Need to be in Resource space at this point.
DatasetRef dsRef = FusekiConfig.processService(subject) ;
SPARQLServer.registerDataset(datasetPath, dsRef) ;
system.commit();
@@ -315,7 +313,16 @@ public class ActionDatasets extends Acti
return q ;
}
-
+ private Statement getOne(Model m, Resource s, Property p, RDFNode o) {
+ StmtIterator iter = m.listStatements(s, p, o) ;
+ if ( ! iter.hasNext() )
+ return null ;
+ Statement stmt = iter.next() ;
+ if ( iter.hasNext() )
+ return null ;
+ return stmt ;
+ }
+
private static void copyFile(File source, File dest) {
try {
@SuppressWarnings("resource")
@@ -334,7 +341,7 @@ public class ActionDatasets extends Acti
HttpServletRequest request = action.request ;
String base = wholeRequestURL(request) ;
ContentType ct = FusekiLib.getContentType(request) ;
- 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/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ManagementServer.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ManagementServer.java?rev=1549074&r1=1549073&r2=1549074&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ManagementServer.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ManagementServer.java Sun Dec 8 17:34:48 2013
@@ -56,8 +56,8 @@ public class ManagementServer
context.setErrorHandler(new FusekiErrorHandler()) ;
server.setHandler(context);
return server ;
- }
-
+ }
+
public static void addServerFunctions(ServletContextHandler context, String base) {
Fuseki.serverLog.info("Adding server information functions") ;
if ( !base.endsWith("/" ) )
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/DatasetRef.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/DatasetRef.java?rev=1549074&r1=1549073&r2=1549074&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/DatasetRef.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/DatasetRef.java Sun Dec 8 17:34:48 2013
@@ -55,14 +55,6 @@ public class DatasetRef implements Datas
public DatasetRef() {}
- public void activate() {
- if ( getState() == ACTIVE )
- Fuseki.serverLog.warn("Already active: dataset = "+name) ;
- if ( getState() == UNINITIALIZED )
- initServices() ;
- setState(ACTIVE) ;
- }
-
public boolean isActive() { return getState() == ACTIVE ; }
public DatasetStatus getStatus() { return state ; }
@@ -76,6 +68,21 @@ public class DatasetRef implements Datas
state = newState ;
}
+ public void enable() {
+ if ( getState() == UNINITIALIZED )
+ setState(ACTIVE) ;
+ if ( serviceRefs.isEmpty() )
+ initServices() ;
+ }
+
+ public void activate() {
+ if ( getState() == ACTIVE )
+ Fuseki.serverLog.warn("Already active: dataset = "+name) ;
+ if ( getState() == UNINITIALIZED )
+ initServices() ;
+ setState(ACTIVE) ;
+ }
+
public void dormant() {
if ( getState() == DORMANT )
Fuseki.serverLog.warn("Already dormant: dataset = "+name) ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java?rev=1549074&r1=1549073&r2=1549074&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java Sun Dec 8 17:34:48 2013
@@ -106,28 +106,6 @@ public class FusekiConfig {
}
} ;
-// public static void additional(ServerConfig config) {
-// // server/
-// // configure/
-// // databases/
-//
-// File d = new File(configurationsDirectory) ;
-// String[] assemblerFiles = d.list(visibleFiles) ;
-//
-// if ( assemblerFiles == null ) {
-// log.warn("No configurtion directory '"+configurationsDirectory+"'") ;
-// }
-//
-// String x = Iter.asString(Arrays.asList(assemblerFiles));
-// log.info("Files: "+x);
-//
-// for ( String fn : assemblerFiles ) {
-// Model m = RDFDataMgr.loadModel(configurationsDirectory+"/"+fn);
-// List<DatasetRef> refs = readConfiguration(m);
-// config.datasets.addAll(refs) ;
-// }
-// }
-
public static void additional(ServerConfig config) {
String qs = StrUtils.strjoinNL
(SystemState.PREFIXES ,
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java?rev=1549074&r1=1549073&r2=1549074&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java Sun Dec 8 17:34:48 2013
@@ -303,7 +303,7 @@ public class SPARQLServer {
}
public static void registerDataset(String datasetPath, DatasetRef dsDesc) {
- dsDesc.activate() ;
+ dsDesc.enable() ;
if ( DatasetRegistry.get().isRegistered(datasetPath) )
throw new FusekiConfigException("Already registered: key = "+datasetPath) ;
DatasetRegistry.get().put(datasetPath, dsDesc) ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionSPARQL.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionSPARQL.java?rev=1549074&r1=1549073&r2=1549074&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionSPARQL.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionSPARQL.java Sun Dec 8 17:34:48 2013
@@ -50,7 +50,7 @@ public abstract class ActionSPARQL exten
} else
dsRef = FusekiConfig.serviceOnlyDatasetRef() ;
- action.setDataset(dsRef) ;
+ action.setRequestRef(dsRef) ;
String uri = action.request.getRequestURI() ;
String serviceName = ActionLib.mapRequestToService(dsRef, uri, datasetUri) ;
ServiceRef srvRef = dsRef.getServiceRef(serviceName) ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java?rev=1549074&r1=1549073&r2=1549074&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java Sun Dec 8 17:34:48 2013
@@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.atlas.web.MediaType ;
import org.apache.jena.fuseki.DEF ;
+import org.apache.jena.fuseki.FusekiException ;
import org.apache.jena.fuseki.conneg.ConNeg ;
import org.apache.jena.fuseki.server.DatasetRef ;
import org.apache.jena.fuseki.server.ServiceRef ;
@@ -53,6 +54,7 @@ public class HttpAction
// it would mean there are downcasts to the specific type.
// -- Valid only for operational actions (e.g. SPARQL).
+
private DatasetGraph dsg = null ;
public ServiceRef srvRef = null ;
private Transactional transactional = null ;
@@ -62,10 +64,12 @@ public class HttpAction
// -- Valid only for administration actions.
+ /** Name of dataset being acted upon in a admin operation (may be null) */
public String datasetName = null ;
// -- Shared items (but exact meaning may differ)
+ /** Handle to dataset+services being acted on (maybe null) */
public DatasetRef dsRef = null ;
// ----
@@ -97,10 +101,14 @@ public class HttpAction
this.verbose = verbose ;
}
- public void setDataset(DatasetRef desc) {
+ /** Initialization after action creation during lifecycle setup */
+ public void setRequestRef(DatasetRef desc) {
+ if ( this.dsRef != null )
+ throw new FusekiException("Redefintion of DatasetRef in the request action") ;
+
this.dsRef = desc ;
if ( desc == null || desc.dataset == null )
- return ;
+ throw new FusekiException("Null DatasetRef in the request action") ;
this.dsg = desc.dataset ;
DatasetGraph basedsg = unwrap(dsg) ;
@@ -116,7 +124,16 @@ public class HttpAction
isTransactional = false ;
}
}
+
+ public void setControlRef(DatasetRef desc) {
+ if ( desc == null )
+ throw new FusekiException("Null DatasetRef in the control action") ;
+ if ( this.dsRef != null )
+ throw new FusekiException("Redefintion of DatasetRef in the control action") ;
+ this.dsRef = desc ;
+ }
+
private static boolean isTransactional(DatasetGraph dsg) {
return (dsg instanceof Transactional) ;
}
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java?rev=1549074&r1=1549073&r2=1549074&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java Sun Dec 8 17:34:48 2013
@@ -28,7 +28,10 @@ import org.apache.jena.atlas.web.MediaTy
import org.apache.jena.atlas.web.TypedOutputStream ;
import org.apache.jena.fuseki.Fuseki ;
import org.apache.jena.fuseki.HttpNames ;
-import org.apache.jena.riot.* ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.RiotReader ;
import org.apache.jena.riot.lang.LangRIOT ;
import org.apache.jena.riot.system.StreamRDF ;
import org.apache.jena.riot.system.StreamRDFLib ;
@@ -61,7 +64,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 +120,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/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java?rev=1549074&r1=1549073&r2=1549074&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java Sun Dec 8 17:34: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 ;
@@ -101,7 +102,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/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java?rev=1549074&r1=1549073&r2=1549074&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java Sun Dec 8 17:34: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 )
action.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/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java?rev=1549074&r1=1549073&r2=1549074&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java Sun Dec 8 17:34: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/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java?rev=1549074&r1=1549073&r2=1549074&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java Sun Dec 8 17:34:48 2013
@@ -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.IRIResolver ;
import org.apache.jena.riot.system.StreamRDF ;
@@ -222,7 +221,7 @@ public class SPARQL_Upload extends Actio
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) ;