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 2012/08/22 17:20:58 UTC
svn commit: r1376096 - in
/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets:
HttpAction.java SPARQL_Query.java SPARQL_QueryDataset.java
SPARQL_ServletBase.java
Author: andy
Date: Wed Aug 22 15:20:57 2012
New Revision: 1376096
URL: http://svn.apache.org/viewvc?rev=1376096&view=rev
Log:
Sync Fuseki with ARQ/TDB reorg.
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java?rev=1376096&r1=1376095&r2=1376096&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java Wed Aug 22 15:20:57 2012
@@ -18,7 +18,6 @@
package org.apache.jena.fuseki.servlets;
-
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
@@ -32,8 +31,8 @@ import com.hp.hpl.jena.query.ReadWrite ;
import com.hp.hpl.jena.shared.Lock ;
import com.hp.hpl.jena.sparql.SystemARQ ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
+import com.hp.hpl.jena.sparql.core.DatasetGraphWithLock ;
import com.hp.hpl.jena.sparql.core.Transactional ;
-import com.hp.hpl.jena.tdb.migrate.DatasetGraphWithLock ;
public class HttpAction
{
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java?rev=1376096&r1=1376095&r2=1376096&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java Wed Aug 22 15:20:57 2012
@@ -137,15 +137,6 @@ public abstract class SPARQL_Query exten
paramCallback,
paramForceAccept,
paramTimeout) ;
- protected static List<String> dsParams = Arrays.asList(paramQuery,
- // paramDefaultGraphURI, paramNamedGraphURI,
- paramQueryRef,
- paramStyleSheet,
- paramAccept,
- paramOutput1, paramOutput2,
- paramCallback,
- paramForceAccept,
- paramTimeout) ;
/** Called to validate arguments */
@Override
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java?rev=1376096&r1=1376095&r2=1376096&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java Wed Aug 22 15:20:57 2012
@@ -25,6 +25,7 @@ import org.apache.jena.fuseki.HttpNames
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.DatasetFactory ;
import com.hp.hpl.jena.query.Query ;
+import com.hp.hpl.jena.sparql.core.DatasetDescription ;
public class SPARQL_QueryDataset extends SPARQL_Query
{
@@ -48,7 +49,8 @@ public class SPARQL_QueryDataset extends
errorNotFound("Service Description: "+request.getRequestURI()) ;
}
- validate(request, dsParams) ;
+ // Use of the dataset describing parameters is check later.
+ validate(request, allParams) ;
}
@Override
@@ -58,6 +60,11 @@ public class SPARQL_QueryDataset extends
@Override
protected Dataset decideDataset(HttpActionQuery action, Query query, String queryStringLog)
{
+ // Protocol.
+ DatasetDescription dsDesc = getDatasetDescription(action) ;
+ if (dsDesc != null )
+ warning("SPARQL Query: Ignoring dataset description in the protocol request") ;
+
return DatasetFactory.create(action.getActiveDSG()) ;
}
}
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java?rev=1376096&r1=1376095&r2=1376096&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java Wed Aug 22 15:20:57 2012
@@ -37,8 +37,8 @@ import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.query.QueryCancelledException ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
+import com.hp.hpl.jena.sparql.core.DatasetGraphReadOnly ;
import com.hp.hpl.jena.sparql.util.Context ;
-import com.hp.hpl.jena.tdb.migrate.DatasetGraphReadOnly ;
public abstract class SPARQL_ServletBase extends ServletBase
{