jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1426080 - in /jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki: http/ migrate/ servlets/ validation/
Date Wed, 26 Dec 2012 22:50:13 GMT
Author: andy
Date: Wed Dec 26 22:50:13 2012
New Revision: 1426080

URL: http://svn.apache.org/viewvc?rev=1426080&view=rev
Log:
Align to RIOT changes.

Modified:
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java?rev=1426080&r1=1426079&r2=1426080&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java
(original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java
Wed Dec 26 22:50:13 2012
@@ -296,7 +296,7 @@ public class DatasetGraphAccessorHTTP im
         if ( lang == null )
             throw new FusekiException("Unknown lang for "+ts.getMediaType()) ;
         RDFParserOutput dest = RDFParserOutputLib.graph(graph) ;
-        LangRIOT parser = RiotReader.createParserTriples(ts, lang, base, dest) ;
+        LangRIOT parser = RiotReader.createParser(ts, lang, base, dest) ;
         parser.parse() ;
         IO.close(ts) ;
     }    

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java?rev=1426080&r1=1426079&r2=1426080&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java
(original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java
Wed Dec 26 22:50:13 2012
@@ -83,7 +83,7 @@ public class GraphLoadUtils
         InputStream input = Fuseki.webFileManager.open(uri) ;
         
         RDFParserOutput dest = RDFParserOutputLib.sinkTriples(sink) ;
-        LangRIOT parser = RiotReader.createParserTriples(input, lang, uri, dest) ;
+        LangRIOT parser = RiotReader.createParser(input, lang, uri, dest) ;
         try {
             parser.parse() ;
         } catch (RiotException ex) { throw ex ; }

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java?rev=1426080&r1=1426079&r2=1426080&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java Wed
Dec 26 22:50:13 2012
@@ -142,7 +142,7 @@ public class REST_Quads extends SPARQL_R
             Node gn = Node.createURI(name) ;
             Graph g = dsg.getGraph(gn) ;
             RDFParserOutput dest = RDFParserOutputLib.graph(g) ;
-            LangRIOT parser = RiotReader.createParserTriples(action.request.getInputStream(),
lang, name , dest) ;
+            LangRIOT parser = RiotReader.createParser(action.request.getInputStream(), lang,
name , dest) ;
             parser.parse() ;
             log.info(format("[%d] Location: %s", action.id, name)) ;
             action.response.setHeader("Location",  name) ;

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java?rev=1426080&r1=1426079&r2=1426080&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
(original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
Wed Dec 26 22:50:13 2012
@@ -364,7 +364,7 @@ public abstract class SPARQL_REST extend
         Graph graphTmp = GraphFactory.createGraphMem() ;
         
         RDFParserOutput dest = RDFParserOutputLib.graph(graphTmp) ;
-        LangRIOT parser = RiotReader.createParserTriples(input, lang, base, dest) ;
+        LangRIOT parser = RiotReader.createParser(input, lang, base, dest) ;
         parser.getProfile().setHandler(errorHandler) ;
         try { parser.parse() ; } 
         catch (RiotException ex) { errorBadRequest("Parse error: "+ex.getMessage()) ; }

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java?rev=1426080&r1=1426079&r2=1426080&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
(original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
Wed Dec 26 22:50:13 2012
@@ -209,7 +209,7 @@ public class SPARQL_Upload extends SPARQ
                     // We read into a in-memory graph, then (if successful) update the dataset.
                     // This isolates errors.
                     RDFParserOutput dest = RDFParserOutputLib.graph(graphDst) ;
-                    LangRIOT parser = RiotReader.createParserTriples(stream, lang, base,
dest) ;
+                    LangRIOT parser = RiotReader.createParser(stream, lang, base, dest) ;
                     parser.getProfile().setHandler(errorHandler) ;
                     log.info(format("[%d] Upload: Filename: %s, Content-Type=%s, Charset=%s
=> %s", 
                                     action.id, name,  ct.getContentType(), ct.getCharset(),
lang.getName())) ;

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java?rev=1426080&r1=1426079&r2=1426080&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java
(original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java
Wed Dec 26 22:50:13 2012
@@ -167,7 +167,7 @@ public class DataValidator extends Valid
         } ;
 
         RDFParserOutput dest = RDFParserOutputLib.sinkQuads(sink) ;
-        LangRIOT parser = RiotReader.createParserQuads(tokenizer, language, null, dest) ;
+        LangRIOT parser = RiotReader.createParser(tokenizer, language, null, dest) ;
         // Don't resolve IRIs.  Do checking.
         parser.setProfile(RiotLib.profile(null, false, true, errorHandler)) ;
         return parser ;



Mime
View raw message