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/12/16 22:32:27 UTC
svn commit: r1422696 - in /jena/Scratch/AFS/Dev/trunk/src/main/java:
projects/prefixes2/ projects/riot_sse/ projects/riot_writer/
projects/validate/ riot/io/
Author: andy
Date: Sun Dec 16 21:32:25 2012
New Revision: 1422696
URL: http://svn.apache.org/viewvc?rev=1422696&view=rev
Log:
Align to jena-arq changes
Modified:
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes2/DatasetPrefixStorageMem.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_writer/TriGWriter.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/validate/ValidatorStage.java
jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStreamWriter.java
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes2/DatasetPrefixStorageMem.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes2/DatasetPrefixStorageMem.java?rev=1422696&r1=1422695&r2=1422696&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes2/DatasetPrefixStorageMem.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes2/DatasetPrefixStorageMem.java Sun Dec 16 21:32:25 2012
@@ -18,9 +18,12 @@
package projects.prefixes2;
-import java.util.* ;
+import java.util.HashMap ;
+import java.util.HashSet ;
+import java.util.Map ;
+import java.util.Set ;
-import org.openjena.riot.system.PrefixMap ;
+import org.apache.jena.riot.system.PrefixMap ;
import com.hp.hpl.jena.shared.PrefixMapping ;
import com.hp.hpl.jena.sparql.core.DatasetPrefixStorage ;
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=1422696&r1=1422695&r2=1422696&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 Sun Dec 16 21:32:25 2012
@@ -18,13 +18,13 @@
package projects.riot_sse;
-import org.apache.jena.atlas.lib.SinkNull ;
+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.openjena.riot.lang.LangBase ;
-import org.openjena.riot.system.ParserProfile ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
@@ -34,7 +34,7 @@ import com.hp.hpl.jena.sparql.sse.lang.P
/** Parse the SSE (SPARQL/Lisp) syntax */
-public class LangSSE extends LangBase<Object>
+public class LangSSE extends LangBase
{
// Tokenizer needs tuning to yield + - * < and > as tokens.
@@ -46,7 +46,7 @@ public class LangSSE extends LangBase<Ob
ParserProfile profile,
ParseHandler handler)
{
- super(tokens, profile, new SinkNull<Object>()) ;
+ super(tokens, profile, RDFParserOutputLib.sinkNull()) ;
this.handler = handler ;
}
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=1422696&r1=1422695&r2=1422696&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 Sun Dec 16 21:32:25 2012
@@ -22,12 +22,12 @@ import java.io.InputStream ;
import java.io.Reader ;
import java.io.StringReader ;
+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 org.openjena.riot.system.ParserProfile ;
-import org.openjena.riot.system.RiotLib ;
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_writer/TriGWriter.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TriGWriter.java?rev=1422696&r1=1422695&r2=1422696&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 Sun Dec 16 21:32:25 2012
@@ -25,12 +25,12 @@ import java.util.Iterator ;
import java.util.Map ;
import org.apache.jena.atlas.io.IndentedWriter ;
-import org.apache.jena.atlas.lib.Sink ;
+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 org.openjena.riot.lang.SinkQuadsToDataset ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
@@ -38,7 +38,6 @@ import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.DatasetFactory ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
-import com.hp.hpl.jena.sparql.core.Quad ;
public class TriGWriter
{
@@ -48,9 +47,8 @@ public class TriGWriter
Tokenizer tokenizer = TokenizerFactory.makeTokenizerUTF8(new FileInputStream("D.trig")) ;
- Sink<Quad> sink = new SinkQuadsToDataset(dsg) ;
+ RDFParserOutput sink = RDFParserOutputLib.dataset(dsg) ;
RiotReader.createParserQuads(tokenizer, Lang.TRIG, null, sink).parse() ;
- sink.flush() ;
write(System.out, DatasetFactory.create(dsg)) ;
}
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/validate/ValidatorStage.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/validate/ValidatorStage.java?rev=1422696&r1=1422695&r2=1422696&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/validate/ValidatorStage.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/validate/ValidatorStage.java Sun Dec 16 21:32:25 2012
@@ -21,8 +21,8 @@ package projects.validate;
import org.apache.jena.atlas.lib.Sink ;
import org.apache.jena.iri.IRI ;
import org.apache.jena.riot.checker.* ;
-import org.openjena.riot.system.Checker ;
-import org.openjena.riot.system.IRIResolver ;
+import org.apache.jena.riot.system.Checker ;
+import org.apache.jena.riot.system.IRIResolver ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
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=1422696&r1=1422695&r2=1422696&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 Sun Dec 16 21:32:25 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.system.PrefixMap ;
import org.apache.jena.riot.tokens.Token ;
import org.openjena.riot.RiotException ;
-import org.openjena.riot.system.PrefixMap ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;