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/03/07 16:19:05 UTC
svn commit: r1575288 - in /jena/branches/jena-fuseki-new-ui/src/main:
java/org/apache/jena/fuseki/ java/org/apache/jena/fuseki/servlets/ webapp/
Author: andy
Date: Fri Mar 7 15:19:04 2014
New Revision: 1575288
URL: http://svn.apache.org/r1575288
Log:
Always explicitly set base URI
Modified:
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/Fuseki.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_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/webapp/upload.html
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/Fuseki.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/Fuseki.java?rev=1575288&r1=1575287&r2=1575288&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/Fuseki.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/Fuseki.java Fri Mar 7 15:19:04 2014
@@ -53,8 +53,14 @@ public class Fuseki {
*/
static public String FusekiSymbolIRI = "http://jena.apache.org/fuseki#" ;
- /** TODO Default location of the pages for the Fuseki UI */
+ /** Default location of the pages for the Fuseki UI */
static public String PagesStatic = "pages" ;
+
+ /** Dummy base URi string for parsing SPARQL Query and Update requests */
+ static public final String BaseParserSPARQL = "http://server/unset-base/" ;
+
+ /** Dummy base URi string for parsing SPARQL Query and Update requests */
+ static public final String BaseUpload = "http://server/unset-base/" ;
/**
* A relative resources path to the location of
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=1575288&r1=1575287&r2=1575288&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 Fri Mar 7 15:19:04 2014
@@ -47,6 +47,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.io.IndentedLineBuffer ;
import org.apache.jena.atlas.web.ContentType ;
+import org.apache.jena.fuseki.Fuseki ;
import org.apache.jena.fuseki.FusekiException ;
import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.riot.web.HttpNames ;
@@ -58,7 +59,10 @@ import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.sparql.core.Prologue ;
import com.hp.hpl.jena.sparql.resultset.SPARQLResult ;
-public abstract class SPARQL_Query extends SPARQL_Protocol {
+public abstract class SPARQL_Query extends SPARQL_Protocol
+{
+ private static final String QueryParseBase = Fuseki.BaseParserSPARQL ;
+
public SPARQL_Query() {
super() ;
}
@@ -214,7 +218,7 @@ public abstract class SPARQL_Query exten
Query query = null ;
try {
// NB syntax is ARQ (a superset of SPARQL)
- query = QueryFactory.create(queryString, Syntax.syntaxARQ) ;
+ query = QueryFactory.create(queryString, QueryParseBase, Syntax.syntaxARQ) ;
queryStringLog = formatForLog(query) ;
validateQuery(action, query) ;
} catch (ActionErrorException ex) {
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=1575288&r1=1575287&r2=1575288&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 Fri Mar 7 15:19:04 2014
@@ -38,6 +38,7 @@ import javax.servlet.http.HttpServletRes
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.Fuseki ;
import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.riot.web.HttpNames ;
import org.apache.jena.iri.IRI ;
@@ -55,10 +56,10 @@ import com.hp.hpl.jena.update.UpdateExce
import com.hp.hpl.jena.update.UpdateFactory ;
import com.hp.hpl.jena.update.UpdateRequest ;
-public class SPARQL_Update extends SPARQL_Protocol
+public class SPARQL_Update extends SPARQL_Protocol
{
// Base URI used to isolate parsing from the current directory of the server.
- private static final String UpdateParseBase = "http://example/update-base/" ;
+ private static final String UpdateParseBase = Fuseki.BaseParserSPARQL ;
private static final IRIResolver resolver = IRIResolver.create(UpdateParseBase) ;
public SPARQL_Update()
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=1575288&r1=1575287&r2=1575288&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 Fri Mar 7 15:19:04 2014
@@ -35,8 +35,8 @@ import org.apache.commons.fileupload.ser
import org.apache.commons.fileupload.util.Streams ;
import org.apache.jena.atlas.lib.Pair ;
import org.apache.jena.atlas.web.ContentType ;
+import org.apache.jena.fuseki.Fuseki ;
import org.apache.jena.fuseki.FusekiLib ;
-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 ;
@@ -44,6 +44,7 @@ import org.apache.jena.riot.lang.StreamR
import org.apache.jena.riot.system.IRIResolver ;
import org.apache.jena.riot.system.StreamRDF ;
import org.apache.jena.riot.system.StreamRDFLib ;
+import org.apache.jena.riot.web.HttpNames ;
import org.apache.jena.web.HttpSC ;
import com.hp.hpl.jena.graph.Graph ;
@@ -80,7 +81,7 @@ public class SPARQL_Upload extends Actio
boolean isMultipart = ServletFileUpload.isMultipartContent(action.request);
if ( ! isMultipart )
ServletOps.error(HttpSC.BAD_REQUEST_400 , "Not a file upload") ;
- long count = upload(action, "http://example/upload-base/") ;
+ long count = upload(action, Fuseki.BaseUpload) ;
try {
action.response.setContentType("text/html") ;
action.response.setStatus(HttpSC.OK_200);
Modified: jena/branches/jena-fuseki-new-ui/src/main/webapp/upload.html
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/webapp/upload.html?rev=1575288&r1=1575287&r2=1575288&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/webapp/upload.html (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/webapp/upload.html Fri Mar 7 15:19:04 2014
@@ -102,8 +102,10 @@
<div class="col-md-12 well">
<div class="query-chrome">
+ <!--
<form class="form-inline" role="form">
-
+ -->
+ <form class="form-inline" action="/ds/upload" enctype="multipart/form-data" method="post">
<div class="form-group">
<label for="uploadEndpoint"></label>
<div class="dropdown ">
@@ -124,10 +126,13 @@
Choose Files<input type="file" class="form-control" id="uploadFiles" multiple=""/>
</span>
</div>
+ <!--
<div class="form-group">
<label> </label>
<a href="#" class="btn btn-success run-upload form-control">upload</a>
</div>
+ -->
+ <input type="submit" value="Upload">
</form>
</div>
<!--
@@ -135,6 +140,7 @@
Graph: <input name="graph" size="20" value="default"/><br/>
</div>
-->
+
</div>
</div>