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/01/07 12:18:10 UTC
svn commit: r1556181 - in /jena/branches/jena-fuseki-new-ui: src-dev/dev/
src/main/java/org/apache/jena/fuseki/
src/main/java/org/apache/jena/fuseki/conneg/
src/main/java/org/apache/jena/fuseki/mgt/
src/main/java/org/apache/jena/fuseki/server/ src/main...
Author: andy
Date: Tue Jan 7 11:18:09 2014
New Revision: 1556181
URL: http://svn.apache.org/r1556181
Log:
Switch to using one place for HttpNames.
DatasetRef to use a getter for the dataset and a final for the name.
Added:
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionAsync.java
Removed:
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/HttpNames.java
Modified:
jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java
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/conneg/ConNeg.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/conneg/WebLib.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/ActionStats.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/FusekiErrorHandler.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionREST.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_R.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseOps.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_GSP.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_GSP_R.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_GSP_RW.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Protocol.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/validation/ValidatorBaseJson.java
Modified: jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java?rev=1556181&r1=1556180&r2=1556181&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java (original)
+++ jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java Tue Jan 7 11:18:09 2014
@@ -21,11 +21,15 @@ package dev;
public class PROJECT {
// Naming
// fuseki:Service is the endpoints = dataset
-
+
// Test for servlet context
// async operations e.g. backup, stats
+ // RDF patch
+ // /ds/patch service to apply a patch.
+ // "This DSG is that DSG + wrapper"
+
// TDB and server configuration parameters.
// per database -> assembler.
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=1556181&r1=1556180&r2=1556181&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 Tue Jan 7 11:18:09 2014
@@ -21,6 +21,7 @@ package org.apache.jena.fuseki;
import java.util.Iterator ;
import javax.servlet.http.HttpServletRequest ;
+import javax.servlet.http.HttpServletResponse ;
import org.apache.jena.atlas.lib.MultiMap ;
import org.apache.jena.atlas.lib.MultiMapToList ;
@@ -28,6 +29,7 @@ import org.apache.jena.atlas.web.Content
import org.apache.jena.fuseki.servlets.HttpAction ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.web.HttpNames ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
@@ -71,6 +73,11 @@ public class FusekiLib {
return RDFLanguages.contentTypeToLang(contentTypeHeader) ;
}
+ public static void setNoCache(HttpServletResponse response) {
+ response.setHeader(HttpNames.hCacheControl, "must-revalidate,no-cache,no-store");
+ response.setHeader(HttpNames.hPragma, "no-cache");
+ }
+
static String fmtRequest(HttpServletRequest request) {
StringBuffer sbuff = new StringBuffer() ;
sbuff.append(request.getMethod()) ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/conneg/ConNeg.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/conneg/ConNeg.java?rev=1556181&r1=1556180&r2=1556181&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/conneg/ConNeg.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/conneg/ConNeg.java Tue Jan 7 11:18:09 2014
@@ -18,7 +18,7 @@
package org.apache.jena.fuseki.conneg;
-import static org.apache.jena.fuseki.HttpNames.hAcceptCharset ;
+import static org.apache.jena.riot.web.HttpNames.hAcceptCharset ;
import javax.servlet.http.HttpServletRequest ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/conneg/WebLib.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/conneg/WebLib.java?rev=1556181&r1=1556180&r2=1556181&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/conneg/WebLib.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/conneg/WebLib.java Tue Jan 7 11:18:09 2014
@@ -22,7 +22,7 @@ import java.util.Enumeration ;
import javax.servlet.http.HttpServletRequest ;
-import org.apache.jena.fuseki.HttpNames ;
+import org.apache.jena.riot.web.HttpNames ;
public class WebLib
{
Added: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionAsync.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionAsync.java?rev=1556181&view=auto
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionAsync.java (added)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionAsync.java Tue Jan 7 11:18:09 2014
@@ -0,0 +1,49 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.fuseki.mgt;
+
+import java.io.IOException ;
+
+import javax.servlet.http.HttpServletRequest ;
+import javax.servlet.http.HttpServletResponse ;
+
+import org.apache.jena.fuseki.FusekiLib ;
+import org.apache.jena.fuseki.servlets.HttpAction ;
+
+public class ActionAsync extends ActionCtl {
+
+ @Override
+ protected void perform(HttpAction action) {
+
+ }
+
+
+ @Override
+ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ doCommon(request, response) ;
+ }
+
+ @Override
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ FusekiLib.setNoCache(response) ;
+ doCommon(request, response) ;
+ }
+
+}
+
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=1556181&r1=1556180&r2=1556181&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 Tue Jan 7 11:18:09 2014
@@ -44,8 +44,7 @@ public abstract class ActionCtl extends
else {
// This is a placeholder when creating new DatasetRefs
// and also if addressing a container, not a dataset
- dsRef = new DatasetRef() ;
- dsRef.name = dsURI ;
+ dsRef = new DatasetRef(dsURI) ;
}
action.setControlRef(dsRef, dsURI) ;
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=1556181&r1=1556180&r2=1556181&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 Tue Jan 7 11:18:09 2014
@@ -152,7 +152,7 @@ public class ActionDatasets extends Acti
private JsonValue execGetDataset(HttpAction action) {
action.log.info(format("[%d] GET dataset %s", action.id, action.dsRef.name)) ;
JsonBuilder builder = new JsonBuilder() ;
- String datasetPath = DatasetRef.canocialDatasetPath(action.dsRef.name) ;
+ String datasetPath = DatasetRef.canonicalDatasetPath(action.dsRef.name) ;
DatasetRef dsDesc = DatasetRegistry.get().get(datasetPath) ;
if ( dsDesc == null )
ServletOps.errorNotFound("Not found: dataset "+action.dsRef.name);
@@ -178,7 +178,7 @@ public class ActionDatasets extends Acti
name = "" ;
action.log.info(format("[%d] POST dataset %s", action.id, name)) ;
- if ( action.dsRef.dataset == null )
+ if ( action.dsRef.getDataset() == null )
ServletOps.errorNotFound("Not found: dataset "+action.dsRef.name);
DatasetRef dsDesc = action.dsRef ;
String s = action.request.getParameter("state") ;
@@ -241,12 +241,12 @@ public class ActionDatasets extends Acti
action.log.warn(format("[%d] Service name '%s' is not a string", action.id, FmtUtils.stringForRDFNode(object)));
String datasetName = object.getLexicalForm() ;
- String datasetPath = DatasetRef.canocialDatasetPath(datasetName) ;
+ String datasetPath = DatasetRef.canonicalDatasetPath(datasetName) ;
action.log.info(format("[%d] Create database : name = %s", action.id, datasetPath)) ;
if ( DatasetRegistry.get().isRegistered(datasetPath) )
// And abort.
- ServletOps.error(HttpSC.CONFLICT_409, "Name already registered "+datasetName) ;
+ ServletOps.error(HttpSC.CONFLICT_409, "Name already registered "+datasetPath) ;
model.removeAll(null, pStatus, null) ;
model.add(subject, pStatus, FusekiVocab.stateActive) ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionStats.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionStats.java?rev=1556181&r1=1556180&r2=1556181&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionStats.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionStats.java Tue Jan 7 11:18:09 2014
@@ -90,7 +90,7 @@ public class ActionStats extends ActionC
action.log.info(format("[%d] GET stats dataset %s", action.id, action.dsRef.name)) ;
JsonBuilder builder = new JsonBuilder() ;
- String datasetPath = DatasetRef.canocialDatasetPath(action.dsRef.name) ;
+ String datasetPath = DatasetRef.canonicalDatasetPath(action.dsRef.name) ;
builder.startObject("TOP") ;
builder.key("datasets") ;
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=1556181&r1=1556180&r2=1556181&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 Tue Jan 7 11:18:09 2014
@@ -35,8 +35,11 @@ import com.hp.hpl.jena.tdb.transaction.D
public class DatasetRef implements DatasetMXBean, Counters
{
- public String name = null ;
- public DatasetGraph dataset = null ;
+ public final String name ;
+
+ // EITHER a link OR a dataset
+ private DatasetGraph dataset = null ;
+ private DatasetRef link = null ;
public ServiceRef query = new ServiceRef("query") ;
public ServiceRef update = new ServiceRef("update") ;
@@ -53,7 +56,7 @@ public class DatasetRef implements Datas
private List<ServiceRef> serviceRefs = new ArrayList<ServiceRef>() ;
private volatile DatasetStatus state = UNINITIALIZED ;
- public DatasetRef() {}
+ public DatasetRef(String name) { this.name = DatasetRef.canonicalDatasetPath(name) ; }
public boolean isActive() { return getState() == ACTIVE ; }
@@ -108,6 +111,14 @@ public class DatasetRef implements Datas
endpoints.put(ep, srvRef) ;
}
+ public DatasetGraph getDataset() {
+ return dataset ;
+ }
+
+ public void setDataset(DatasetGraph dataset) {
+ this.dataset = dataset ;
+ }
+
public ServiceRef getServiceRef(String service) {
if ( ! isActive() )
Fuseki.serverLog.error("Not active: dataset = "+name) ;
@@ -278,7 +289,9 @@ public class DatasetRef implements Datas
cs.add(CounterName.GSPoptionsBad) ;
}
- public static String canocialDatasetPath(String datasetPath) {
+ public static String canonicalDatasetPath(String datasetPath) {
+ if ( datasetPath == null )
+ return datasetPath ;
if ( datasetPath.equals("/") )
datasetPath = "" ;
else
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=1556181&r1=1556180&r2=1556181&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 Tue Jan 7 11:18:09 2014
@@ -34,7 +34,7 @@ import org.apache.jena.atlas.iterator.It
import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.fuseki.Fuseki ;
import org.apache.jena.fuseki.FusekiConfigException ;
-import org.apache.jena.fuseki.HttpNames ;
+import org.apache.jena.riot.web.HttpNames ;
import org.apache.jena.riot.RDFDataMgr ;
import org.slf4j.Logger ;
@@ -77,12 +77,11 @@ public class FusekiConfig {
// ---- DatasetRef used where there isn't a real Dataset e.g. the SPARQL processor.
- private static DatasetRef noDataset = new DatasetRef() ;
+ private static DatasetRef noDataset = new DatasetRef("") ;
private static DatasetGraph dummyDSG = new DatasetGraphReadOnly(DatasetGraphFactory.createMemFixed()) ;
static {
- noDataset.name = "" ;
- noDataset.dataset = dummyDSG ;
+ noDataset.setDataset(dummyDSG) ;
noDataset.query.endpoints.add(HttpNames.ServiceQuery) ;
noDataset.query.endpoints.add(HttpNames.ServiceQueryAlt) ;
noDataset.allowDatasetUpdate = false ;
@@ -108,9 +107,8 @@ public class FusekiConfig {
if ( params.fusekiConfigFile != null )
log.warn("Configuration file found while processing command line dataset configuration") ;
- DatasetRef dbDesc = new DatasetRef() ;
- dbDesc.name = DatasetRef.canocialDatasetPath(params.datasetPath) ;
- dbDesc.dataset = params.dsg ;
+ DatasetRef dbDesc = new DatasetRef(params.datasetPath) ;
+ dbDesc.setDataset(params.dsg) ;
dbDesc.query.endpoints.add(HttpNames.ServiceQuery) ;
dbDesc.query.endpoints.add(HttpNames.ServiceQueryAlt) ;
@@ -296,9 +294,9 @@ public class FusekiConfig {
/** Build a DatasetRef from an assember starting at Resource svc */
public static DatasetRef processService(Resource svc) {
log.info("Service: " + nodeLabel(svc)) ;
- DatasetRef sDesc = new DatasetRef() ;
- sDesc.name = ((Literal)getOne(svc, "fu:name")).getLexicalForm() ;
- sDesc.name = DatasetRef.canocialDatasetPath(sDesc.name) ;
+
+ String name = ((Literal)getOne(svc, "fu:name")).getLexicalForm() ;
+ DatasetRef sDesc = new DatasetRef(name) ;
log.info(" name = " + sDesc.name) ;
addServiceEP("query", sDesc.name, sDesc.query, svc, "fu:serviceQuery") ;
@@ -321,7 +319,7 @@ public class FusekiConfig {
throw new FusekiConfigException("No rdf:type for dataset " + nodeLabel(datasetDesc)) ;
Dataset ds = (Dataset)Assembler.general.open(datasetDesc) ;
- sDesc.dataset = ds.asDatasetGraph() ;
+ sDesc.setDataset(ds.asDatasetGraph()) ;
return sDesc ;
}
@@ -334,9 +332,7 @@ public class FusekiConfig {
}
public static void configureOneDataset(DatasetRef dsDesc) {
- String datasetPath = DatasetRef.canocialDatasetPath(dsDesc.name) ;
- registerDataset(datasetPath, dsDesc) ;
- // Add JMX beans to record dataset and it's services.
+ registerDataset(dsDesc.name, dsDesc) ;
addJMX(dsDesc) ;
}
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiErrorHandler.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiErrorHandler.java?rev=1556181&r1=1556180&r2=1556181&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiErrorHandler.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiErrorHandler.java Tue Jan 7 11:18:09 2014
@@ -26,8 +26,8 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse ;
import org.apache.jena.fuseki.Fuseki ;
+import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.web.HttpSC ;
-import org.eclipse.jetty.http.HttpHeaders ;
import org.eclipse.jetty.http.HttpMethods ;
import org.eclipse.jetty.http.MimeTypes ;
import org.eclipse.jetty.server.AbstractHttpConnection ;
@@ -47,7 +47,7 @@ public class FusekiErrorHandler extends
return;
response.setContentType(MimeTypes.TEXT_PLAIN_UTF_8) ;
- response.setHeader(HttpHeaders.CACHE_CONTROL, "must-revalidate,no-cache,no-store") ;
+ FusekiLib.setNoCache(response) ;
ByteArrayOutputStream bytes = new ByteArrayOutputStream(1024) ;
//String writer = IO.UTF8(null) ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java?rev=1556181&r1=1556180&r2=1556181&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java Tue Jan 7 11:18:09 2014
@@ -28,10 +28,8 @@ import javax.servlet.ServletException ;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
-
-//import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.fuseki.Fuseki ;
-import org.apache.jena.fuseki.HttpNames ;
+import org.apache.jena.riot.web.HttpNames ;
import org.apache.jena.web.HttpSC ;
import org.slf4j.Logger ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionREST.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionREST.java?rev=1556181&r1=1556180&r2=1556181&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionREST.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionREST.java Tue Jan 7 11:18:09 2014
@@ -18,7 +18,7 @@
package org.apache.jena.fuseki.servlets;
-import static org.apache.jena.fuseki.HttpNames.* ;
+import static org.apache.jena.riot.web.HttpNames.* ;
import java.io.IOException ;
import java.util.Locale ;
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=1556181&r1=1556180&r2=1556181&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 Tue Jan 7 11:18:09 2014
@@ -105,11 +105,11 @@ public class HttpAction
throw new FusekiException("Redefintion of DatasetRef in the request action") ;
this.dsRef = desc ;
- if ( desc == null || desc.dataset == null )
+ if ( desc == null || desc.getDataset() == null )
throw new FusekiException("Null DatasetRef in the request action") ;
this.datasetName = datasetUri ;
- this.dsg = desc.dataset ;
+ this.dsg = desc.getDataset() ;
DatasetGraph basedsg = unwrap(dsg) ;
if ( isTransactional(basedsg) && isTransactional(dsg) ) {
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads_R.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads_R.java?rev=1556181&r1=1556180&r2=1556181&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads_R.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads_R.java Tue Jan 7 11:18:09 2014
@@ -26,7 +26,7 @@ import javax.servlet.ServletOutputStream
import org.apache.jena.atlas.web.MediaType ;
import org.apache.jena.atlas.web.TypedOutputStream ;
-import org.apache.jena.fuseki.HttpNames ;
+import org.apache.jena.riot.web.HttpNames ;
import org.apache.jena.riot.* ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseOps.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseOps.java?rev=1556181&r1=1556180&r2=1556181&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseOps.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseOps.java Tue Jan 7 11:18:09 2014
@@ -24,7 +24,7 @@ import java.util.Map ;
import javax.servlet.http.HttpServletRequest ;
-import org.apache.jena.fuseki.HttpNames ;
+import org.apache.jena.riot.web.HttpNames ;
public class ResponseOps
{
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java?rev=1556181&r1=1556180&r2=1556181&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java Tue Jan 7 11:18:09 2014
@@ -34,6 +34,7 @@ import org.apache.jena.atlas.web.AcceptL
import org.apache.jena.atlas.web.MediaType ;
import org.apache.jena.fuseki.DEF ;
import org.apache.jena.fuseki.FusekiException ;
+import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.fuseki.conneg.ConNeg ;
import org.apache.jena.web.HttpSC ;
import org.slf4j.Logger ;
@@ -155,10 +156,7 @@ public class ResponseResultSet
// ---- Set up HTTP Response
// Stop caching (not that ?queryString URLs are cached anyway)
if ( true )
- {
- action.response.setHeader("Cache-Control", "no-cache") ;
- action.response.setHeader("Pragma", "no-cache") ;
- }
+ FusekiLib.setNoCache(action.response) ;
// See: http://www.w3.org/International/O-HTTP-charset.html
if ( contentType != null )
{
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_GSP.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_GSP.java?rev=1556181&r1=1556180&r2=1556181&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_GSP.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_GSP.java Tue Jan 7 11:18:09 2014
@@ -22,7 +22,7 @@ import java.util.Enumeration ;
import javax.servlet.http.HttpServletRequest ;
-import org.apache.jena.fuseki.HttpNames ;
+import org.apache.jena.riot.web.HttpNames ;
import org.apache.jena.riot.system.IRIResolver ;
import com.hp.hpl.jena.graph.Graph ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_GSP_R.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_GSP_R.java?rev=1556181&r1=1556180&r2=1556181&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_GSP_R.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_GSP_R.java Tue Jan 7 11:18:09 2014
@@ -26,7 +26,7 @@ import javax.servlet.ServletOutputStream
import org.apache.jena.atlas.web.MediaType ;
import org.apache.jena.atlas.web.TypedOutputStream ;
-import org.apache.jena.fuseki.HttpNames ;
+import org.apache.jena.riot.web.HttpNames ;
import org.apache.jena.riot.* ;
import com.hp.hpl.jena.graph.Graph ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_GSP_RW.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_GSP_RW.java?rev=1556181&r1=1556180&r2=1556181&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_GSP_RW.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_GSP_RW.java Tue Jan 7 11:18:09 2014
@@ -20,7 +20,7 @@ package org.apache.jena.fuseki.servlets;
import org.apache.jena.atlas.web.ContentType ;
import org.apache.jena.fuseki.FusekiLib ;
-import org.apache.jena.fuseki.HttpNames ;
+import org.apache.jena.riot.web.HttpNames ;
import org.apache.jena.riot.RiotException ;
import static org.apache.jena.riot.WebContent.* ;
import org.apache.jena.riot.system.StreamRDF ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Protocol.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Protocol.java?rev=1556181&r1=1556180&r2=1556181&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Protocol.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Protocol.java Tue Jan 7 11:18:09 2014
@@ -18,8 +18,8 @@
package org.apache.jena.fuseki.servlets;
-import static org.apache.jena.fuseki.HttpNames.paramDefaultGraphURI ;
-import static org.apache.jena.fuseki.HttpNames.paramNamedGraphURI ;
+import static org.apache.jena.riot.web.HttpNames.paramDefaultGraphURI ;
+import static org.apache.jena.riot.web.HttpNames.paramNamedGraphURI ;
import java.util.Arrays ;
import java.util.Collections ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java?rev=1556181&r1=1556180&r2=1556181&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java Tue Jan 7 11:18:09 2014
@@ -19,7 +19,7 @@
package org.apache.jena.fuseki.servlets ;
import static java.lang.String.format ;
-import static org.apache.jena.fuseki.HttpNames.* ;
+import static org.apache.jena.riot.web.HttpNames.* ;
import static org.apache.jena.fuseki.server.CounterName.QueryExecErrors ;
import static org.apache.jena.fuseki.server.CounterName.QueryTimeouts ;
import static org.apache.jena.fuseki.server.CounterName.RequestsBad ;
@@ -36,7 +36,7 @@ import org.apache.jena.atlas.io.Indented
import org.apache.jena.atlas.web.ContentType ;
import org.apache.jena.fuseki.FusekiException ;
import org.apache.jena.fuseki.FusekiLib ;
-import org.apache.jena.fuseki.HttpNames ;
+import org.apache.jena.riot.web.HttpNames ;
import static org.apache.jena.riot.WebContent.* ;
import org.apache.jena.riot.web.HttpOp ;
import org.apache.jena.web.HttpSC ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java?rev=1556181&r1=1556180&r2=1556181&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java Tue Jan 7 11:18:09 2014
@@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.jena.atlas.web.MediaType ;
import org.apache.jena.fuseki.DEF ;
import org.apache.jena.fuseki.FusekiException ;
-import org.apache.jena.fuseki.HttpNames ;
+import org.apache.jena.riot.web.HttpNames ;
import org.apache.jena.fuseki.conneg.ConNeg ;
import org.apache.jena.fuseki.server.DatasetRef ;
import org.apache.jena.fuseki.server.ServiceRef ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java?rev=1556181&r1=1556180&r2=1556181&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java Tue Jan 7 11:18:09 2014
@@ -20,10 +20,7 @@ package org.apache.jena.fuseki.servlets;
import static java.lang.String.format ;
import static org.apache.jena.fuseki.Fuseki.requestLog ;
-import static org.apache.jena.fuseki.HttpNames.paramRequest ;
-import static org.apache.jena.fuseki.HttpNames.paramUpdate ;
-import static org.apache.jena.fuseki.HttpNames.paramUsingGraphURI ;
-import static org.apache.jena.fuseki.HttpNames.paramUsingNamedGraphURI ;
+import static org.apache.jena.riot.web.HttpNames.* ;
import static org.apache.jena.fuseki.server.CounterName.UpdateExecErrors ;
import java.io.ByteArrayInputStream ;
@@ -42,7 +39,7 @@ import org.apache.jena.atlas.io.IO ;
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.HttpNames ;
+import org.apache.jena.riot.web.HttpNames ;
import org.apache.jena.iri.IRI ;
import static org.apache.jena.riot.WebContent.* ;
import org.apache.jena.riot.system.IRIResolver ;
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=1556181&r1=1556180&r2=1556181&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 Tue Jan 7 11:18:09 2014
@@ -36,7 +36,7 @@ import org.apache.commons.fileupload.uti
import org.apache.jena.atlas.lib.Pair ;
import org.apache.jena.atlas.web.ContentType ;
import org.apache.jena.fuseki.FusekiLib ;
-import org.apache.jena.fuseki.HttpNames ;
+import org.apache.jena.riot.web.HttpNames ;
import org.apache.jena.iri.IRI ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFLanguages ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java?rev=1556181&r1=1556180&r2=1556181&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java Tue Jan 7 11:18:09 2014
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.fuseki.Fuseki ;
-import org.apache.jena.fuseki.HttpNames ;
+import org.apache.jena.riot.web.HttpNames ;
// Move statics to a lib (ActionLib?)
public abstract class ServletBase extends HttpServlet {
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/validation/ValidatorBaseJson.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/validation/ValidatorBaseJson.java?rev=1556181&r1=1556180&r2=1556181&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/validation/ValidatorBaseJson.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/validation/ValidatorBaseJson.java Tue Jan 7 11:18:09 2014
@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.jena.atlas.json.JSON ;
import org.apache.jena.atlas.json.JsonObject ;
import org.apache.jena.fuseki.Fuseki ;
-import org.apache.jena.fuseki.HttpNames ;
+import org.apache.jena.riot.web.HttpNames ;
import org.apache.jena.fuseki.servlets.ActionErrorException ;
import org.apache.jena.fuseki.servlets.ActionLib ;
import org.apache.jena.fuseki.servlets.ServletBase ;