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 2011/05/19 12:19:50 UTC
svn commit: r1124662 - in /incubator/jena/Jena2/Fuseki/trunk: ./
src-dev/dev/ src/main/java/org/openjena/fuseki/
src/main/java/org/openjena/fuseki/conneg/
src/main/java/org/openjena/fuseki/server/
src/main/java/org/openjena/fuseki/servlets/
Author: andy
Date: Thu May 19 10:19:49 2011
New Revision: 1124662
URL: http://svn.apache.org/viewvc?rev=1124662&view=rev
Log:
Final alignment of Fuseki codebase and old SourceForge code base.
Removed:
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/conneg/ContentType.java
Modified:
incubator/jena/Jena2/Fuseki/trunk/pom.xml
incubator/jena/Jena2/Fuseki/trunk/src-dev/dev/DevFuseki.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiLib.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Query.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_REST.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Update.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Upload.java
Modified: incubator/jena/Jena2/Fuseki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/pom.xml?rev=1124662&r1=1124661&r2=1124662&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/pom.xml (original)
+++ incubator/jena/Jena2/Fuseki/trunk/pom.xml Thu May 19 10:19:49 2011
@@ -31,7 +31,7 @@
<this.root>${project.artifactId}-${project.version}</this.root>
<ver.jena>2.6.4</ver.jena>
<ver.arq>2.8.9-SNAPSHOT</ver.arq>
- <ver.tdb>0.8.10</ver.tdb>
+ <ver.tdb>0.8.11-SNAPSHOT</ver.tdb>
<!-- But <optional> does not work -->
<!-- <ver.sdb>1.3.3</ver.sdb> -->
<!-- These two go together -->
Modified: incubator/jena/Jena2/Fuseki/trunk/src-dev/dev/DevFuseki.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src-dev/dev/DevFuseki.java?rev=1124662&r1=1124661&r2=1124662&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src-dev/dev/DevFuseki.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src-dev/dev/DevFuseki.java Thu May 19 10:19:49 2011
@@ -2,6 +2,11 @@ package dev;
public class DevFuseki
{
+ // WebContent and ContentType clean up.
+
+ // SOH defualt to not needing 'default'
+ // More error handling.
+
// Migrate ContentType to RIOT
// use in WebContent.
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiLib.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiLib.java?rev=1124662&r1=1124661&r2=1124662&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiLib.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiLib.java Thu May 19 10:19:49 2011
@@ -12,7 +12,7 @@ import java.util.Map ;
import javax.servlet.http.HttpServletRequest ;
import org.openjena.atlas.lib.MultiMap ;
-import org.openjena.fuseki.conneg.ContentType ;
+import org.openjena.riot.ContentType ;
import org.openjena.riot.Lang ;
import org.openjena.riot.RiotException ;
import org.openjena.riot.WebContent ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java?rev=1124662&r1=1124661&r2=1124662&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java Thu May 19 10:19:49 2011
@@ -169,7 +169,6 @@ public class SPARQLServer
}
}
-
if ( installValidators )
{
// Validators
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Query.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Query.java?rev=1124662&r1=1124661&r2=1124662&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Query.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Query.java Thu May 19 10:19:49 2011
@@ -20,9 +20,11 @@ import javax.servlet.http.HttpServletRes
import org.openjena.atlas.io.IO ;
import org.openjena.atlas.io.IndentedLineBuffer ;
+import org.openjena.fuseki.FusekiLib ;
import org.openjena.fuseki.HttpNames ;
import org.openjena.fuseki.http.HttpSC ;
import org.openjena.fuseki.migrate.WebIO ;
+import org.openjena.riot.ContentType ;
import org.openjena.riot.WebContent ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
@@ -84,12 +86,13 @@ public abstract class SPARQL_Query exten
HttpActionQuery action = new HttpActionQuery(id, dsg, request, response, verbose_debug) ;
if ( request.getMethod().equals(HttpNames.METHOD_GET) )
{
- executeForm(action) ;
+ executeWithParameter(action) ;
return ;
}
- // XXX INCLUDES MEDIA TYPE
+
// POST
- String incoming = request.getContentType() ;
+ ContentType ct = FusekiLib.contentType(request) ;
+ String incoming = ct.getContentType() ;
if (WebContent.contentTypeSPARQLQuery.equals(incoming))
{
executeBody(action) ;
@@ -97,7 +100,7 @@ public abstract class SPARQL_Query exten
}
if (WebContent.contentTypeForm.equals(incoming))
{
- executeForm(action) ;
+ executeWithParameter(action) ;
return ;
}
@@ -152,22 +155,33 @@ public abstract class SPARQL_Query exten
/** Helper for validating request */
protected void validate(HttpServletRequest request, Set<String> params)
{
- String incoming = request.getContentType() ;
- if ( incoming != null )
+ ContentType ct = FusekiLib.contentType(request) ;
+ boolean mustHaveQueryParam = true ;
+ if ( ct != null )
{
-
+ String incoming = ct.getContentType() ;
+
if ( WebContent.contentTypeSPARQLQuery.equals(incoming) )
- error(HttpSC.UNSUPPORTED_MEDIA_TYPE_415, "Unofficial "+WebContent.contentTypeSPARQLQuery+" not supported") ;
-
- if ( ! WebContent.contentTypeForm.equals(incoming) )
+ {
+ mustHaveQueryParam = false ;
+ //error(HttpSC.UNSUPPORTED_MEDIA_TYPE_415, "Unofficial "+WebContent.contentTypeSPARQLQuery+" not supported") ;
+ }
+ else if ( WebContent.contentTypeForm.equals(incoming) )
+ ; // OK
+ else
error(HttpSC.UNSUPPORTED_MEDIA_TYPE_415, "Unsupported: "+incoming) ;
}
// GET/POST of a form at this point.
- String queryStr = request.getParameter(HttpNames.paramQuery) ;
- if ( queryStr == null )
- errorBadRequest("SPARQL Query: No query specificied (no 'query=' found)") ;
+ if ( mustHaveQueryParam )
+ {
+ // application/sparql-query does not use a query param.
+ String queryStr = request.getParameter(HttpNames.paramQuery) ;
+
+ if ( queryStr == null )
+ errorBadRequest("SPARQL Query: No query specificied (no 'query=' found)") ;
+ }
if ( params != null )
{
@@ -182,7 +196,7 @@ public abstract class SPARQL_Query exten
}
}
- private void executeForm(HttpActionQuery action)
+ private void executeWithParameter(HttpActionQuery action)
{
String queryString = action.request.getParameter(paramQuery) ;
execute(queryString, action) ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_REST.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_REST.java?rev=1124662&r1=1124661&r2=1124662&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_REST.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_REST.java Thu May 19 10:19:49 2011
@@ -32,8 +32,8 @@ import org.openjena.fuseki.DEF ;
import org.openjena.fuseki.FusekiLib ;
import org.openjena.fuseki.HttpNames ;
import org.openjena.fuseki.conneg.ConNeg ;
-import org.openjena.fuseki.conneg.ContentType ;
import org.openjena.fuseki.conneg.MediaType ;
+import org.openjena.riot.ContentType ;
import org.openjena.riot.ErrorHandler ;
import org.openjena.riot.ErrorHandlerFactory ;
import org.openjena.riot.Lang ;
@@ -304,7 +304,7 @@ public abstract class SPARQL_REST extend
ContentType ct = ContentType.parse(contentTypeHeader) ;
int len = action.request.getContentLength() ;
- Lang lang = FusekiLib.langFromContentType(ct.contentType) ;
+ Lang lang = FusekiLib.langFromContentType(ct.getContentType()) ;
if ( lang == null )
{
errorBadRequest("Unknown: "+contentTypeHeader) ;
@@ -315,10 +315,10 @@ public abstract class SPARQL_REST extend
{
if ( len >= 0 )
serverlog.info(format("[%d] Body: Content-Length=%d, Content-Type=%s, Charset=%s => %s",
- action.id, len, ct.contentType, ct.charset, lang.getName())) ;
+ action.id, len, ct.getContentType(), ct.getCharset(), lang.getName())) ;
else
serverlog.info(format("[%d] Body: Content-Type=%s, Charset=%s => %s",
- action.id, ct.contentType, ct.charset, lang.getName())) ;
+ action.id, ct.getContentType(), ct.getCharset(), lang.getName())) ;
}
try {
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Update.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Update.java?rev=1124662&r1=1124661&r2=1124662&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Update.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Update.java Thu May 19 10:19:49 2011
@@ -23,8 +23,8 @@ import org.openjena.atlas.io.IO ;
import org.openjena.atlas.lib.Bytes ;
import org.openjena.fuseki.FusekiLib ;
import org.openjena.fuseki.HttpNames ;
-import org.openjena.fuseki.conneg.ContentType ;
import org.openjena.fuseki.http.HttpSC ;
+import org.openjena.riot.ContentType ;
import org.openjena.riot.WebContent ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
@@ -105,7 +105,7 @@ public class SPARQL_Update extends SPARQ
if ( incoming == null )
ctStr = WebContent.contentTypeSPARQLUpdate ;
else
- ctStr = incoming.contentType ;
+ ctStr = incoming.getContentType() ;
}
// ----
@@ -131,7 +131,7 @@ public class SPARQL_Update extends SPARQ
if ( incoming == null )
ctStr = WebContent.contentTypeSPARQLUpdate ;
else
- ctStr = incoming.contentType ;
+ ctStr = incoming.getContentType() ;
}
// ----
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Upload.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Upload.java?rev=1124662&r1=1124661&r2=1124662&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Upload.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Upload.java Thu May 19 10:19:49 2011
@@ -23,9 +23,9 @@ import org.apache.commons.fileupload.uti
import org.openjena.atlas.lib.Sink ;
import org.openjena.fuseki.FusekiLib ;
import org.openjena.fuseki.HttpNames ;
-import org.openjena.fuseki.conneg.ContentType ;
import org.openjena.fuseki.http.HttpSC ;
import org.openjena.fuseki.server.DatasetRegistry ;
+import org.openjena.riot.ContentType ;
import org.openjena.riot.ErrorHandler ;
import org.openjena.riot.ErrorHandlerFactory ;
import org.openjena.riot.Lang ;
@@ -150,7 +150,7 @@ public class SPARQL_Upload extends SPARQ
String contentTypeHeader = item.getContentType() ;
ct = ContentType.parse(contentTypeHeader) ;
- lang = FusekiLib.langFromContentType(ct.contentType) ;
+ lang = FusekiLib.langFromContentType(ct.getContentType()) ;
if ( lang == null )
lang = Lang.guess(name) ;
if ( lang == null )
@@ -173,7 +173,7 @@ public class SPARQL_Upload extends SPARQ
if ( graphName == null )
graphName = "default" ;
serverlog.info(format("[%d] Upload: Filename: %s, Content-Type=%s, Charset=%s => (%s,%s,%d triple(s))",
- action.id, name, ct.contentType, ct.charset, graphName, lang.getName(), tripleCount)) ;
+ action.id, name, ct.getContentType(), ct.getCharset(), graphName, lang.getName(), tripleCount)) ;
// Delay updating until all form fields processed to get the graph name
action.beginWrite() ;