jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1425329 - in /jena: Experimental/riot-reader/src/main/java/dev/ Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/ Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/ Scratch/AFS/Dev/trunk/src/main/java/riot/io/
Date Sat, 22 Dec 2012 18:11:32 GMT
Author: andy
Date: Sat Dec 22 18:11:32 2012
New Revision: 1425329

URL: http://svn.apache.org/viewvc?rev=1425329&view=rev
Log:
Sync with RIOT changes.

Modified:
    jena/Experimental/riot-reader/src/main/java/dev/MainWebReader.java
    jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/LangSSE.java
    jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/ParserSSE.java
    jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Basic.java
    jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TriGWriter.java
    jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TurtleWriter2.java
    jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStreamWriter.java

Modified: jena/Experimental/riot-reader/src/main/java/dev/MainWebReader.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/main/java/dev/MainWebReader.java?rev=1425329&r1=1425328&r2=1425329&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/main/java/dev/MainWebReader.java (original)
+++ jena/Experimental/riot-reader/src/main/java/dev/MainWebReader.java Sat Dec 22 18:11:32
2012
@@ -19,9 +19,9 @@
 package dev;
 
 import org.apache.jena.riot.RDFLanguages ;
-import org.apache.jena.riot.WebReader2 ;
-import org.openjena.riot.RIOT ;
-import org.openjena.riot.WebContent ;
+import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.jena.riot.RIOT ;
+import org.apache.jena.riot.WebContent ;
 
 import com.hp.hpl.jena.rdf.model.Model ;
 import com.hp.hpl.jena.rdf.model.ModelFactory ;
@@ -50,8 +50,8 @@ public class MainWebReader
         System.exit(0) ;
         
         Model m = ModelFactory.createDefaultModel() ;
-        WebReader2.read(m, "http://localhost:3030/ds/data?default", RDFLanguages.nameToLang(WebContent.contentTypeTurtle),
null) ;
-        WebReader2.read(m, "file:./D.ttl", null, null, null) ;
+        RDFDataMgr.read(m, "http://localhost:3030/ds/data?default", RDFLanguages.nameToLang(WebContent.contentTypeTurtle),
null) ;
+        RDFDataMgr.read(m, "file:./D.ttl", null, null, null) ;
         //SSE.write(m) ;
         System.out.println("triples = "+m.size()) ;
     }

Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/LangSSE.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/LangSSE.java?rev=1425329&r1=1425328&r2=1425329&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/LangSSE.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/LangSSE.java Sat Dec 22 18:11:32
2012
@@ -18,13 +18,13 @@
 
 package projects.riot_sse;
 
+import org.apache.jena.riot.Lang ;
 import org.apache.jena.riot.lang.LangBase ;
 import org.apache.jena.riot.lang.RDFParserOutputLib ;
 import org.apache.jena.riot.system.ParserProfile ;
 import org.apache.jena.riot.tokens.Token ;
 import org.apache.jena.riot.tokens.TokenType ;
 import org.apache.jena.riot.tokens.Tokenizer ;
-import org.openjena.riot.Lang ;
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
 

Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/ParserSSE.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/ParserSSE.java?rev=1425329&r1=1425328&r2=1425329&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/ParserSSE.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/ParserSSE.java Sat Dec 22 18:11:32
2012
@@ -22,12 +22,12 @@ import java.io.InputStream ;
 import java.io.Reader ;
 import java.io.StringReader ;
 
+import org.apache.jena.riot.system.ErrorHandler ;
+import org.apache.jena.riot.system.ErrorHandlerFactory ;
 import org.apache.jena.riot.system.ParserProfile ;
 import org.apache.jena.riot.system.RiotLib ;
 import org.apache.jena.riot.tokens.Tokenizer ;
 import org.apache.jena.riot.tokens.TokenizerFactory ;
-import org.openjena.riot.ErrorHandler ;
-import org.openjena.riot.ErrorHandlerFactory ;
 
 import com.hp.hpl.jena.shared.PrefixMapping ;
 import com.hp.hpl.jena.shared.impl.PrefixMappingImpl ;

Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Basic.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Basic.java?rev=1425329&r1=1425328&r2=1425329&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Basic.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Basic.java Sat Dec
22 18:11:32 2012
@@ -19,10 +19,10 @@
 package projects.riot_sse;
 
 import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.riot.RiotException ;
 import org.junit.AfterClass ;
 import org.junit.BeforeClass ;
 import org.junit.Test ;
-import org.openjena.riot.RiotException ;
 
 import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
 import com.hp.hpl.jena.graph.Node ;

Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TriGWriter.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TriGWriter.java?rev=1425329&r1=1425328&r2=1425329&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TriGWriter.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TriGWriter.java Sat Dec
22 18:11:32 2012
@@ -25,12 +25,12 @@ import java.util.Iterator ;
 import java.util.Map ;
 
 import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.RiotReader ;
 import org.apache.jena.riot.lang.RDFParserOutput ;
 import org.apache.jena.riot.lang.RDFParserOutputLib ;
 import org.apache.jena.riot.tokens.Tokenizer ;
 import org.apache.jena.riot.tokens.TokenizerFactory ;
-import org.openjena.riot.Lang ;
-import org.openjena.riot.RiotReader ;
 
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;
@@ -48,7 +48,7 @@ public class TriGWriter
         Tokenizer tokenizer = TokenizerFactory.makeTokenizerUTF8(new FileInputStream("D.trig"))
;
         
         RDFParserOutput sink = RDFParserOutputLib.dataset(dsg) ;
-        RiotReader.createParserQuads(tokenizer,  Lang.TRIG, null, sink).parse() ;
+        RiotReader.createParserQuads(tokenizer,  RDFLanguages.TriG, null, sink).parse() ;
         write(System.out, DatasetFactory.create(dsg)) ;
     }
     

Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TurtleWriter2.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TurtleWriter2.java?rev=1425329&r1=1425328&r2=1425329&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TurtleWriter2.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TurtleWriter2.java Sat Dec
22 18:11:32 2012
@@ -28,7 +28,7 @@ import java.util.Map.Entry ;
 import org.apache.jena.atlas.io.IndentedWriter ;
 import org.apache.jena.atlas.lib.Pair ;
 import org.apache.jena.atlas.lib.StrUtils ;
-import org.openjena.riot.SysRIOT ;
+import org.apache.jena.riot.IO_Jena ;
 import projects.viewgraph.GLib ;
 
 import com.hp.hpl.jena.graph.Graph ;
@@ -44,7 +44,7 @@ public class TurtleWriter2
 {
     public static void main(String ... args)
     {
-        SysRIOT.wireIntoJena() ;
+        IO_Jena.wireIntoJena() ;
         Model m = FileManager.get().loadModel("D.ttl") ;
         
         write(System.out, m) ;

Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStreamWriter.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStreamWriter.java?rev=1425329&r1=1425328&r2=1425329&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStreamWriter.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStreamWriter.java Sat Dec
22 18:11:32 2012
@@ -24,9 +24,9 @@ import java.util.ArrayList ;
 import java.util.List ;
 
 import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.riot.RiotException ;
 import org.apache.jena.riot.system.PrefixMap ;
 import org.apache.jena.riot.tokens.Token ;
-import org.openjena.riot.RiotException ;
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
 



Mime
View raw message