svn commit: r1422300 [1/2] - in /jena: Scratch/AFS/Dev/trunk/src-archive/riot/comms/ Scratch/AFS/Dev/trunk/src-archive/riot/io/section/ Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/ Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/ Scr...

[an...@apache.org]

Author: andy
Date: Sat Dec 15 18:02:38 2012
New Revision: 1422300

URL: http://svn.apache.org/viewvc?rev=1422300&view=rev
Log:
Partial migration out of org.openjena.riot package into org.apahe.jena.riot.

Added:
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/
      - copied from r1418391, jena/trunk/jena-arq/src/main/java/org/openjena/riot/checker/
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/
      - copied from r1418391, jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/
      - copied from r1418391, jena/trunk/jena-arq/src/main/java/org/openjena/riot/web/
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/TypedInputStreamHttp.java
      - copied, changed from r1418391, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/TypedInputStreamHttp.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/
      - copied from r1418391, jena/trunk/jena-arq/src/test/java/org/openjena/riot/tokens/
Removed:
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/HttpOp2.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/TypedInputStreamHttp.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/checker/CheckerBlankNodes.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/checker/CheckerIRI.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/checker/CheckerLiterals.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/checker/CheckerVar.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/checker/CheckerVisitor.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/checker/NodeChecker.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/checker/NodeCheckerNull.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/PrintTokenizer.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/Token.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/TokenChecker.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/TokenCheckerBase.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/TokenCheckerLib.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/TokenType.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/Tokenizer.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/TokenizerFactory.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/TokenizerText.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/TokenizerWrapper.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/web/
    jena/trunk/jena-arq/src/test/java/org/openjena/riot/tokens/TestTokenForNode.java
    jena/trunk/jena-arq/src/test/java/org/openjena/riot/tokens/TestTokenizer.java
Modified:
    jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TokenStreamEndpoint.java
    jena/Scratch/AFS/Dev/trunk/src-archive/riot/io/section/TokenInputSection.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/TestTokenIO.java
    jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenComms.java
    jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStream.java
    jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStreamBase.java
    jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStreamWrapper.java
    jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStream.java
    jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStreamWrapper.java
    jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStreamWriter.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemote.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemoteForm.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactory.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/JSONP.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/ParserBase.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/TokenizerJSON.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Dataset.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Model.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebReader2.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerBlankNodes.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerIRI.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerLiterals.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerVar.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerVisitor.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/NodeChecker.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/NodeCheckerNull.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL2.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/PrintTokenizer.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenChecker.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenCheckerBase.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenCheckerLib.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenType.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Tokenizer.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerFactory.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerWrapper.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/ContentProducer.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpCaptureResponse.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpNames.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseHandler.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseLib.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotLoader.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/SerializationFactoryFinder.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangBase.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangEngine.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNQuads.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNTriples.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNTuple.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangRDFJSON.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangRDFXML.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTriG.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtle.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtleBase.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/Checker.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderNTriples2.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderRIOT.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderRdfJson.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderTurtle2.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ParserProfile.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ParserProfileBase.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ParserProfileChecker.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/RiotLib.java
    jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java
    jena/trunk/jena-arq/src/main/java/riotcmd/CmdTokens.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/UpdateTest.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenizer.java
    jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot1.java
    jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestIRI.java
    jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangNQuads.java
    jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangNTriples.java
    jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangNTuples.java
    jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangRdfJson.java
    jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangTrig.java
    jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangTurtle.java
    jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestParserFactory.java
    jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestTurtleTerms.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java

Modified: jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TokenStreamEndpoint.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TokenStreamEndpoint.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TokenStreamEndpoint.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TokenStreamEndpoint.java Sat Dec 15 18:02:38 2012
@@ -27,8 +27,8 @@ import java.net.Socket ;
 import java.nio.channels.SocketChannel ;
 
 import org.apache.jena.atlas.io.IO ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
 import riot.comms.client.DirectChannel ;
 import riot.io.* ;
 

Modified: jena/Scratch/AFS/Dev/trunk/src-archive/riot/io/section/TokenInputSection.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src-archive/riot/io/section/TokenInputSection.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-archive/riot/io/section/TokenInputSection.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src-archive/riot/io/section/TokenInputSection.java Sat Dec 15 18:02:38 2012
@@ -23,7 +23,7 @@ import java.util.List ;
 import java.util.NoSuchElementException ;
 
 import org.apache.jena.atlas.lib.Pool ;
-import org.openjena.riot.tokens.Token ;
+import org.apache.jena.riot.tokens.Token ;
 import riot.comms.End ;
 import riot.comms.TokenStreamEndpoint ;
 import riot.io.TokenComms ;

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=1422300&r1=1422299&r2=1422300&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 15 18:02:38 2012
@@ -19,12 +19,12 @@
 package projects.riot_sse;
 
 import org.apache.jena.atlas.lib.SinkNull ;
+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.openjena.riot.tokens.Token ;
-import org.openjena.riot.tokens.TokenType ;
-import org.openjena.riot.tokens.Tokenizer ;
 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=1422300&r1=1422299&r2=1422300&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 15 18:02:38 2012
@@ -22,12 +22,12 @@ import java.io.InputStream ;
 import java.io.Reader ;
 import java.io.StringReader ;
 
+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 org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
 
 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=1422300&r1=1422299&r2=1422300&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 15 18:02:38 2012
@@ -26,11 +26,11 @@ import java.util.Map ;
 
 import org.apache.jena.atlas.io.IndentedWriter ;
 import org.apache.jena.atlas.lib.Sink ;
+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 org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
 
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;

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=1422300&r1=1422299&r2=1422300&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 Sat Dec 15 18:02:38 2012
@@ -20,7 +20,7 @@ package projects.validate;
 
 import org.apache.jena.atlas.lib.Sink ;
 import org.apache.jena.iri.IRI ;
-import org.openjena.riot.checker.* ;
+import org.apache.jena.riot.checker.* ;
 import org.openjena.riot.system.Checker ;
 import org.openjena.riot.system.IRIResolver ;
 

Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TestTokenIO.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TestTokenIO.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TestTokenIO.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TestTokenIO.java Sat Dec 15 18:02:38 2012
@@ -18,8 +18,8 @@
 
 package riot.io;
 
-import static org.openjena.riot.tokens.Token.tokenForChar ;
-import static org.openjena.riot.tokens.Token.tokenForNode ;
+import static org.apache.jena.riot.tokens.Token.tokenForChar ;
+import static org.apache.jena.riot.tokens.Token.tokenForNode ;
 
 import java.io.ByteArrayInputStream ;
 import java.io.ByteArrayOutputStream ;
@@ -33,14 +33,14 @@ import org.apache.jena.atlas.junit.BaseT
 import org.apache.jena.atlas.lib.Chars ;
 import org.apache.jena.atlas.lib.Sink ;
 import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.riot.tokens.Token ;
+import org.apache.jena.riot.tokens.TokenType ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
 import org.junit.AfterClass ;
 import org.junit.Before ;
 import org.junit.BeforeClass ;
 import org.junit.Test ;
-import org.openjena.riot.tokens.Token ;
-import org.openjena.riot.tokens.TokenType ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
 
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.sparql.sse.SSE ;

Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenComms.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenComms.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenComms.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenComms.java Sat Dec 15 18:02:38 2012
@@ -21,9 +21,9 @@ package riot.io;
 import java.io.UnsupportedEncodingException ;
 import java.util.List ;
 
-import org.openjena.riot.tokens.Token ;
-import org.openjena.riot.tokens.TokenType ;
-import org.openjena.riot.tokens.TokenizerText ;
+import org.apache.jena.riot.tokens.Token ;
+import org.apache.jena.riot.tokens.TokenType ;
+import org.apache.jena.riot.tokens.TokenizerText ;
 
 
 public class TokenComms

Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStream.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStream.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStream.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStream.java Sat Dec 15 18:02:38 2012
@@ -22,7 +22,7 @@ import java.util.Iterator ;
 import java.util.List ;
 
 import org.apache.jena.atlas.lib.Closeable ;
-import org.openjena.riot.tokens.Token ;
+import org.apache.jena.riot.tokens.Token ;
 
 /** A stream of tokens */
 public interface TokenInputStream extends Iterator<List<Token>>, Iterable<List<Token>>, Closeable

Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStreamBase.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStreamBase.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStreamBase.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStreamBase.java Sat Dec 15 18:02:38 2012
@@ -25,10 +25,10 @@ import java.util.List ;
 import java.util.Map ;
 import java.util.NoSuchElementException ;
 
-import org.openjena.riot.tokens.PrintTokenizer ;
-import org.openjena.riot.tokens.Token ;
-import static org.openjena.riot.tokens.TokenType.* ;
-import org.openjena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.PrintTokenizer ;
+import org.apache.jena.riot.tokens.Token ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import static org.apache.jena.riot.tokens.TokenType.* ;
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
 

Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStreamWrapper.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStreamWrapper.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStreamWrapper.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStreamWrapper.java Sat Dec 15 18:02:38 2012
@@ -22,7 +22,7 @@ import java.util.Iterator ;
 import java.util.List ;
 
 import org.apache.jena.atlas.lib.Closeable ;
-import org.openjena.riot.tokens.Token ;
+import org.apache.jena.riot.tokens.Token ;
 
 public class TokenInputStreamWrapper implements Iterator<List<Token>>, Iterable<List<Token>>, Closeable
 {

Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStream.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStream.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStream.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStream.java Sat Dec 15 18:02:38 2012
@@ -22,7 +22,7 @@ import java.io.Writer ;
 
 import org.apache.jena.atlas.lib.Closeable ;
 import org.apache.jena.atlas.lib.Sync ;
-import org.openjena.riot.tokens.Token ;
+import org.apache.jena.riot.tokens.Token ;
 
 import com.hp.hpl.jena.graph.Node ;
 

Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStreamWrapper.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStreamWrapper.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStreamWrapper.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStreamWrapper.java Sat Dec 15 18:02:38 2012
@@ -20,7 +20,7 @@ package riot.io;
 
 import java.io.Writer ;
 
-import org.openjena.riot.tokens.Token ;
+import org.apache.jena.riot.tokens.Token ;
 
 import com.hp.hpl.jena.graph.Node ;
 

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=1422300&r1=1422299&r2=1422300&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 15 18:02:38 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.tokens.Token ;
 import org.openjena.riot.RiotException ;
 import org.openjena.riot.system.PrefixMap ;
-import org.openjena.riot.tokens.Token ;
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
 

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java Sat Dec 15 18:02:38 2012
@@ -18,9 +18,9 @@
 
 package com.hp.hpl.jena.sparql.engine.binding;
 
-import static org.openjena.riot.tokens.TokenType.DOT ;
-import static org.openjena.riot.tokens.TokenType.IRI ;
-import static org.openjena.riot.tokens.TokenType.PREFIXED_NAME ;
+import static org.apache.jena.riot.tokens.TokenType.DOT ;
+import static org.apache.jena.riot.tokens.TokenType.IRI ;
+import static org.apache.jena.riot.tokens.TokenType.PREFIXED_NAME ;
 
 import java.io.InputStream ;
 import java.util.ArrayList ;
@@ -38,16 +38,17 @@ import org.openjena.riot.system.ParserPr
 import org.openjena.riot.system.ParserProfileBase ;
 import org.openjena.riot.system.PrefixMap ;
 import org.openjena.riot.system.Prologue ;
-import org.openjena.riot.tokens.Token ;
-import org.openjena.riot.tokens.TokenType ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
 
 import com.hp.hpl.jena.graph.Node ;
 
 import org.apache.jena.atlas.iterator.IteratorSlotted ;
 import org.apache.jena.atlas.lib.Closeable ;
 import org.apache.jena.iri.IRI ;
+import org.apache.jena.riot.tokens.Token ;
+import org.apache.jena.riot.tokens.TokenType ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
+
 import com.hp.hpl.jena.rdf.model.AnonId ;
 import com.hp.hpl.jena.sparql.core.Var ;
 

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemote.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemote.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemote.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemote.java Sat Dec 15 18:02:38 2012
@@ -18,8 +18,8 @@
 
 package com.hp.hpl.jena.sparql.modify;
 
+import org.apache.jena.riot.web.HttpOp ;
 import org.openjena.riot.WebContent ;
-import org.openjena.riot.web.HttpOp ;
 
 import com.hp.hpl.jena.query.QuerySolution ;
 import com.hp.hpl.jena.sparql.ARQException ;

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemoteForm.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemoteForm.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemoteForm.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemoteForm.java Sat Dec 15 18:02:38 2012
@@ -24,9 +24,9 @@ import java.util.List ;
 import java.util.Map ;
 
 import org.apache.jena.atlas.lib.Pair ;
-import org.openjena.riot.web.HttpOp ;
-import org.openjena.riot.web.HttpResponseHandler ;
-import org.openjena.riot.web.HttpResponseLib ;
+import org.apache.jena.riot.web.HttpOp ;
+import org.apache.jena.riot.web.HttpResponseHandler ;
+import org.apache.jena.riot.web.HttpResponseLib ;
 
 import com.hp.hpl.jena.query.QuerySolution ;
 import com.hp.hpl.jena.sparql.ARQException ;

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactory.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactory.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactory.java Sat Dec 15 18:02:38 2012
@@ -18,11 +18,11 @@
 
 package com.hp.hpl.jena.sparql.util;
 
+import org.apache.jena.riot.tokens.Token ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
 import org.openjena.riot.RiotException ;
 import org.openjena.riot.system.PrefixMap ;
-import org.openjena.riot.tokens.Token ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
 
 import com.hp.hpl.jena.datatypes.RDFDatatype ;
 import com.hp.hpl.jena.datatypes.TypeMapper ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/JSONP.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/JSONP.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/JSONP.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/JSONP.java Sat Dec 15 18:02:38 2012
@@ -18,12 +18,12 @@
 
 package org.apache.jena.atlas.json.io.parser;
 
-import static org.openjena.riot.tokens.TokenType.COLON ;
-import static org.openjena.riot.tokens.TokenType.COMMA ;
-import static org.openjena.riot.tokens.TokenType.KEYWORD ;
-import static org.openjena.riot.tokens.TokenType.LBRACE ;
-import static org.openjena.riot.tokens.TokenType.RBRACE ;
-import static org.openjena.riot.tokens.TokenType.RBRACKET ;
+import static org.apache.jena.riot.tokens.TokenType.COLON ;
+import static org.apache.jena.riot.tokens.TokenType.COMMA ;
+import static org.apache.jena.riot.tokens.TokenType.KEYWORD ;
+import static org.apache.jena.riot.tokens.TokenType.LBRACE ;
+import static org.apache.jena.riot.tokens.TokenType.RBRACE ;
+import static org.apache.jena.riot.tokens.TokenType.RBRACKET ;
 import org.apache.jena.atlas.json.io.JSONHandler ;
 
 /** Json (extended) parser

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/ParserBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/ParserBase.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/ParserBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/ParserBase.java Sat Dec 15 18:02:38 2012
@@ -18,12 +18,12 @@
 
 package org.apache.jena.atlas.json.io.parser;
 
-import static org.openjena.riot.tokens.TokenType.EOF ;
+import static org.apache.jena.riot.tokens.TokenType.EOF ;
 import org.apache.jena.atlas.iterator.PeekIterator ;
 import org.apache.jena.atlas.json.JsonParseException ;
-import org.openjena.riot.tokens.Token ;
-import org.openjena.riot.tokens.TokenType ;
-import org.openjena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.Token ;
+import org.apache.jena.riot.tokens.TokenType ;
+import org.apache.jena.riot.tokens.Tokenizer ;
 
 
 public class ParserBase

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/TokenizerJSON.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/TokenizerJSON.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/TokenizerJSON.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/TokenizerJSON.java Sat Dec 15 18:02:38 2012
@@ -26,9 +26,9 @@ import java.util.NoSuchElementException 
 import org.apache.jena.atlas.io.IO ;
 import org.apache.jena.atlas.io.PeekReader ;
 import org.apache.jena.atlas.json.JsonParseException ;
-import org.openjena.riot.tokens.Token ;
-import org.openjena.riot.tokens.TokenType ;
-import org.openjena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.Token ;
+import org.apache.jena.riot.tokens.TokenType ;
+import org.apache.jena.riot.tokens.Tokenizer ;
 
 
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Dataset.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Dataset.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Dataset.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Dataset.java Sat Dec 15 18:02:38 2012
@@ -27,14 +27,14 @@ import java.io.StringReader ;
 
 import org.apache.jena.atlas.lib.Sink ;
 import org.apache.jena.atlas.web.ContentType ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
 import org.openjena.riot.Lang ;
 import org.openjena.riot.RiotException ;
 import org.openjena.riot.RiotNotFoundException ;
 import org.openjena.riot.RiotReader ;
 import org.openjena.riot.lang.LangRIOT ;
 import org.openjena.riot.lang.SinkQuadsToDataset ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
 
 import com.hp.hpl.jena.query.Dataset ;
 import com.hp.hpl.jena.sparql.core.DatasetGraph ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Model.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Model.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Model.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Model.java Sat Dec 15 18:02:38 2012
@@ -27,12 +27,12 @@ import java.io.StringReader ;
 
 import org.apache.jena.atlas.lib.Sink ;
 import org.apache.jena.atlas.web.ContentType ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
 import org.openjena.riot.* ;
 import org.openjena.riot.lang.LangRDFXML ;
 import org.openjena.riot.lang.LangRIOT ;
 import org.openjena.riot.lang.SinkTriplesToGraph ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
 
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Triple ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebReader2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebReader2.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebReader2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebReader2.java Sat Dec 15 18:02:38 2012
@@ -25,13 +25,13 @@ import java.io.StringReader ;
 import org.apache.jena.atlas.lib.Sink ;
 import org.apache.jena.atlas.web.ContentType ;
 import org.apache.jena.riot.stream.StreamManager ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
 import org.openjena.riot.* ;
 import org.openjena.riot.lang.LangRDFXML ;
 import org.openjena.riot.lang.LangRIOT ;
 import org.openjena.riot.lang.SinkQuadsToDataset ;
 import org.openjena.riot.lang.SinkTriplesToGraph ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerBlankNodes.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerBlankNodes.java?rev=1422300&r1=1418391&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerBlankNodes.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerBlankNodes.java Sat Dec 15 18:02:38 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.checker;
+package org.apache.jena.riot.checker;
 
 import org.openjena.riot.ErrorHandler ;
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerIRI.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerIRI.java?rev=1422300&r1=1418391&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerIRI.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerIRI.java Sat Dec 15 18:02:38 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.checker;
+package org.apache.jena.riot.checker;
 
 import java.util.Iterator ;
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerLiterals.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerLiterals.java?rev=1422300&r1=1418391&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerLiterals.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerLiterals.java Sat Dec 15 18:02:38 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.checker;
+package org.apache.jena.riot.checker;
 
 import java.util.regex.Pattern ;
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerVar.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerVar.java?rev=1422300&r1=1418391&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerVar.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerVar.java Sat Dec 15 18:02:38 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.checker;
+package org.apache.jena.riot.checker;
 
 import org.openjena.riot.ErrorHandler ;
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerVisitor.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerVisitor.java?rev=1422300&r1=1418391&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerVisitor.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerVisitor.java Sat Dec 15 18:02:38 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.checker;
+package org.apache.jena.riot.checker;
 
 import com.hp.hpl.jena.graph.NodeVisitor ;
 import com.hp.hpl.jena.graph.Node_ANY ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/NodeChecker.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/NodeChecker.java?rev=1422300&r1=1418391&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/NodeChecker.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/NodeChecker.java Sat Dec 15 18:02:38 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.checker;
+package org.apache.jena.riot.checker;
 
 import com.hp.hpl.jena.graph.Node ;
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/NodeCheckerNull.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/NodeCheckerNull.java?rev=1422300&r1=1418391&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/NodeCheckerNull.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/checker/NodeCheckerNull.java Sat Dec 15 18:02:38 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.checker;
+package org.apache.jena.riot.checker;
 
 import com.hp.hpl.jena.graph.Node ;
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL2.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL2.java Sat Dec 15 18:02:38 2012
@@ -18,13 +18,13 @@
 
 package org.apache.jena.riot.stream;
 
-import com.hp.hpl.jena.util.FileUtils ;
-
-import org.apache.jena.riot.HttpOp2 ;
 import org.apache.jena.riot.TypedInputStream2 ;
+import org.apache.jena.riot.web.HttpOp ;
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
 
+import com.hp.hpl.jena.util.FileUtils ;
+
 public class LocatorURL2 implements Locator
 {
     private static Logger log = LoggerFactory.getLogger(LocatorURL2.class) ;
@@ -42,7 +42,7 @@ public class LocatorURL2 implements Loca
             return null;
         }
         if ( uri.startsWith("http://") || uri.startsWith("https://"))
-            return HttpOp2.execHttpGet(uri, acceptTriples) ;
+            return HttpOp.execHttpGet(uri, acceptTriples) ;
         return null ;
     }
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/PrintTokenizer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/PrintTokenizer.java?rev=1422300&r1=1418391&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/PrintTokenizer.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/PrintTokenizer.java Sat Dec 15 18:02:38 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.tokens;
+package org.apache.jena.riot.tokens;
 
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java?rev=1422300&r1=1418391&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java Sat Dec 15 18:02:38 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.tokens;
+package org.apache.jena.riot.tokens;
 
 import static org.apache.jena.atlas.lib.Chars.CH_COMMA ;
 import static org.apache.jena.atlas.lib.Chars.CH_DOT ;
@@ -29,15 +29,15 @@ import static org.apache.jena.atlas.lib.
 import static org.apache.jena.atlas.lib.Chars.CH_SEMICOLON ;
 import static org.apache.jena.atlas.lib.Lib.equal ;
 import static org.apache.jena.atlas.lib.Lib.hashCodeObject ;
-import static org.openjena.riot.tokens.TokenType.BNODE ;
-import static org.openjena.riot.tokens.TokenType.DECIMAL ;
-import static org.openjena.riot.tokens.TokenType.DOUBLE ;
-import static org.openjena.riot.tokens.TokenType.INTEGER ;
-import static org.openjena.riot.tokens.TokenType.IRI ;
-import static org.openjena.riot.tokens.TokenType.LITERAL_DT ;
-import static org.openjena.riot.tokens.TokenType.LITERAL_LANG ;
-import static org.openjena.riot.tokens.TokenType.STRING ;
-import static org.openjena.riot.tokens.TokenType.VAR ;
+import static org.apache.jena.riot.tokens.TokenType.BNODE ;
+import static org.apache.jena.riot.tokens.TokenType.DECIMAL ;
+import static org.apache.jena.riot.tokens.TokenType.DOUBLE ;
+import static org.apache.jena.riot.tokens.TokenType.INTEGER ;
+import static org.apache.jena.riot.tokens.TokenType.IRI ;
+import static org.apache.jena.riot.tokens.TokenType.LITERAL_DT ;
+import static org.apache.jena.riot.tokens.TokenType.LITERAL_LANG ;
+import static org.apache.jena.riot.tokens.TokenType.STRING ;
+import static org.apache.jena.riot.tokens.TokenType.VAR ;
 
 import java.util.ArrayList ;
 import java.util.List ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenChecker.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenChecker.java?rev=1422300&r1=1418391&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenChecker.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenChecker.java Sat Dec 15 18:02:38 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.tokens;
+package org.apache.jena.riot.tokens;
 
 public interface TokenChecker
 {

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenCheckerBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenCheckerBase.java?rev=1422300&r1=1418391&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenCheckerBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenCheckerBase.java Sat Dec 15 18:02:38 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.tokens;
+package org.apache.jena.riot.tokens;
 
 /** Do nothing checker */
 public class TokenCheckerBase implements TokenChecker

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenCheckerLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenCheckerLib.java?rev=1422300&r1=1418391&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenCheckerLib.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenCheckerLib.java Sat Dec 15 18:02:38 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.tokens;
+package org.apache.jena.riot.tokens;
 
 /** Various algorithms */
 public class TokenCheckerLib

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenType.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenType.java?rev=1422300&r1=1418391&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenType.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenType.java Sat Dec 15 18:02:38 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.tokens;
+package org.apache.jena.riot.tokens;
 
 public enum TokenType
 {

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Tokenizer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Tokenizer.java?rev=1422300&r1=1418391&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Tokenizer.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Tokenizer.java Sat Dec 15 18:02:38 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.tokens;
+package org.apache.jena.riot.tokens;
 
 import java.util.Iterator ;
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerFactory.java?rev=1422300&r1=1418391&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerFactory.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerFactory.java Sat Dec 15 18:02:38 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.tokens;
+package org.apache.jena.riot.tokens;
 
 import java.io.ByteArrayInputStream ;
 import java.io.InputStream ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java?rev=1422300&r1=1418391&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java Sat Dec 15 18:02:38 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.tokens;
+package org.apache.jena.riot.tokens;
 
 import static org.apache.jena.atlas.lib.Chars.* ;
 import static org.openjena.riot.system.RiotChars.charInArray ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerWrapper.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerWrapper.java?rev=1422300&r1=1418391&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerWrapper.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerWrapper.java Sat Dec 15 18:02:38 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.tokens;
+package org.apache.jena.riot.tokens;
 
 public class TokenizerWrapper implements Tokenizer
 {

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/ContentProducer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/ContentProducer.java?rev=1422300&r1=1418391&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/ContentProducer.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/ContentProducer.java Sat Dec 15 18:02:38 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.web;
+package org.apache.jena.riot.web;
 
 /** Interface for sending content over HTTP POST.
  *  Simply avoid client code needing to always pull in org.apache.http. packages. */

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpCaptureResponse.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpCaptureResponse.java?rev=1422300&r1=1418391&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpCaptureResponse.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpCaptureResponse.java Sat Dec 15 18:02:38 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.web;
+package org.apache.jena.riot.web;
 
 /** Act-on-HTTP-response and produce some object */
 public interface HttpCaptureResponse<T> extends HttpResponseHandler

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpNames.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpNames.java?rev=1422300&r1=1418391&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpNames.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpNames.java Sat Dec 15 18:02:38 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.web;
+package org.apache.jena.riot.web;
 
 public class HttpNames
 {

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java?rev=1422300&r1=1418391&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java Sat Dec 15 18:02:38 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.web;
+package org.apache.jena.riot.web;
 
 import static java.lang.String.format ;
 
@@ -41,6 +41,7 @@ import org.apache.http.client.methods.Ht
 import org.apache.http.entity.EntityTemplate ;
 import org.apache.http.entity.InputStreamEntity ;
 import org.apache.http.entity.StringEntity ;
+import org.apache.http.impl.client.SystemDefaultHttpClient ;
 import org.apache.http.message.BasicNameValuePair ;
 import org.apache.jena.atlas.io.IO ;
 import org.apache.jena.atlas.lib.Pair ;
@@ -51,7 +52,6 @@ import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
 
 import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
-import org.apache.http.impl.client.SystemDefaultHttpClient;
 
 /** Simplified HTTP operations; simplification means only supporting certain uses of HTTP.
  * The expectation is that the simplified operations in this class can be used by other code to
@@ -115,6 +115,57 @@ public class HttpOp
         } catch (IOException ex) { IO.exception(ex) ; }
     }
     
+    public static TypedInputStreamHttp execHttpGet(String url, String acceptHeader)
+    {
+        try {
+            long id = counter.incrementAndGet() ;
+            String requestURI = determineRequestURI(url) ;
+            String baseIRI = determineBaseIRI(requestURI) ;
+    
+            HttpGet httpget = new HttpGet(requestURI);
+            if ( log.isDebugEnabled() )
+                log.debug(format("[%d] %s %s",id ,httpget.getMethod(),httpget.getURI().toString())) ;
+            // Accept
+            if ( acceptHeader != null )
+                httpget.addHeader(HttpNames.hAccept, acceptHeader) ;
+            
+            // Execute
+            HttpClient httpclient = new SystemDefaultHttpClient();        // Pool?
+            HttpResponse response = httpclient.execute(httpget) ;
+            
+            // Response
+            StatusLine statusLine = response.getStatusLine() ;
+            if ( statusLine.getStatusCode() == 404 )
+            {
+                log.debug(format("[%d] %s %s",id, statusLine.getStatusCode(), statusLine.getReasonPhrase())) ;
+                return null ;
+            }
+            if ( statusLine.getStatusCode() >= 400 )
+            {
+                log.debug(format("[%d] %s %s",id, statusLine.getStatusCode(), statusLine.getReasonPhrase())) ;
+                throw new HttpException(statusLine.getStatusCode()+" "+statusLine.getReasonPhrase()) ;
+            }
+    
+            HttpEntity entity = response.getEntity() ;
+            if ( entity == null )
+            {
+                // No content in the return.  Probably a mistake, but not guaranteed.
+                if ( log.isDebugEnabled() )
+                    log.debug(format("[%d] %d %s :: (empty)",id, statusLine.getStatusCode(), statusLine.getReasonPhrase())) ;
+                return null ;
+            }
+                
+            MediaType mt = MediaType.create(entity.getContentType().getValue()) ;
+            if ( log.isDebugEnabled() )
+                log.debug(format("[%d] %d %s :: %s",id, statusLine.getStatusCode(), statusLine.getReasonPhrase() , mt)) ;
+                
+            return new TypedInputStreamHttp(entity.getContent(), mt,
+                                       httpclient.getConnectionManager()) ;
+        }
+        catch (IOException ex) { IO.exception(ex) ; return null ; }
+    }
+
+    
     /** POST a string without response body.
      * <p>Execute an HTTP POST, with the string as content.
      * <p>No response content expected or processed. 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseHandler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseHandler.java?rev=1422300&r1=1418391&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseHandler.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseHandler.java Sat Dec 15 18:02:38 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.web ;
+package org.apache.jena.riot.web ;
 
 import java.io.IOException ;
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseLib.java?rev=1422300&r1=1418391&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseLib.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseLib.java Sat Dec 15 18:02:38 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.web;
+package org.apache.jena.riot.web;
 
 import java.io.IOException ;
 import java.io.InputStream ;

Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/TypedInputStreamHttp.java (from r1418391, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/TypedInputStreamHttp.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/TypedInputStreamHttp.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/TypedInputStreamHttp.java&p1=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/TypedInputStreamHttp.java&r1=1418391&r2=1422300&rev=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/TypedInputStreamHttp.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/TypedInputStreamHttp.java Sat Dec 15 18:02:38 2012
@@ -16,12 +16,13 @@
  * limitations under the License.
  */
 
-package org.apache.jena.riot;
+package org.apache.jena.riot.web;
 
 import java.io.InputStream ;
 
 import org.apache.http.conn.ClientConnectionManager ;
 import org.apache.jena.atlas.web.MediaType ;
+import org.apache.jena.riot.TypedInputStream2 ;
 
 /** Type streams for HTTP connections - includes Apache HTTP client specific cleanup */
 public class TypedInputStreamHttp extends TypedInputStream2 

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotLoader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotLoader.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotLoader.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotLoader.java Sat Dec 15 18:02:38 2012
@@ -23,11 +23,11 @@ import java.io.InputStream ;
 import org.apache.jena.atlas.io.IO ;
 import org.apache.jena.atlas.lib.IRILib ;
 import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
 import org.openjena.riot.lang.LangRIOT ;
 import org.openjena.riot.lang.SinkQuadsToDataset ;
 import org.openjena.riot.lang.SinkTriplesToGraph ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
 
 import com.hp.hpl.jena.graph.Factory ;
 import com.hp.hpl.jena.graph.Graph ;

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java Sat Dec 15 18:02:38 2012
@@ -32,12 +32,12 @@ import org.apache.jena.atlas.iterator.It
 import org.apache.jena.atlas.json.io.parser.TokenizerJSON ;
 import org.apache.jena.atlas.lib.IRILib ;
 import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
 import org.openjena.riot.lang.* ;
 import org.openjena.riot.system.IRIResolver ;
 import org.openjena.riot.system.RiotLib ;
 import org.openjena.riot.system.SinkExtendTriplesToQuads ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
 
 import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.sparql.core.Quad ;

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/SerializationFactoryFinder.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/SerializationFactoryFinder.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/SerializationFactoryFinder.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/SerializationFactoryFinder.java Sat Dec 15 18:02:38 2012
@@ -24,6 +24,8 @@ import java.util.Iterator ;
 
 import org.apache.jena.atlas.data.SerializationFactory ;
 import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
 import org.openjena.riot.lang.LabelToNode ;
 import org.openjena.riot.lang.LangNQuads ;
 import org.openjena.riot.lang.LangNTriples ;
@@ -33,8 +35,6 @@ import org.openjena.riot.out.SinkTripleO
 import org.openjena.riot.system.IRIResolver ;
 import org.openjena.riot.system.ParserProfileBase ;
 import org.openjena.riot.system.Prologue ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
 
 import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.sparql.core.Quad ;

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangBase.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangBase.java Sat Dec 15 18:02:38 2012
@@ -21,9 +21,9 @@ package org.openjena.riot.lang;
 import org.apache.jena.atlas.event.Event ;
 import org.apache.jena.atlas.event.EventManager ;
 import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.riot.tokens.Tokenizer ;
 import org.openjena.riot.SysRIOT ;
 import org.openjena.riot.system.ParserProfile ;
-import org.openjena.riot.tokens.Tokenizer ;
 
 
 public abstract class LangBase<X> extends LangEngine implements LangRIOT

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangEngine.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangEngine.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangEngine.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangEngine.java Sat Dec 15 18:02:38 2012
@@ -18,16 +18,16 @@
 
 package org.openjena.riot.lang;
 
-import static org.openjena.riot.tokens.TokenType.EOF ;
-import static org.openjena.riot.tokens.TokenType.NODE ;
+import static org.apache.jena.riot.tokens.TokenType.EOF ;
+import static org.apache.jena.riot.tokens.TokenType.NODE ;
 import org.apache.jena.atlas.AtlasException ;
 import org.apache.jena.atlas.iterator.PeekIterator ;
+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.ErrorHandler ;
 import org.openjena.riot.RiotParseException ;
 import org.openjena.riot.system.ParserProfile ;
-import org.openjena.riot.tokens.Token ;
-import org.openjena.riot.tokens.TokenType ;
-import org.openjena.riot.tokens.Tokenizer ;
 
 import com.hp.hpl.jena.graph.Node ;
 

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNQuads.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNQuads.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNQuads.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNQuads.java Sat Dec 15 18:02:38 2012
@@ -18,11 +18,11 @@
 
 package org.openjena.riot.lang;
 import org.apache.jena.atlas.lib.Sink ;
+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.system.ParserProfile ;
-import org.openjena.riot.tokens.Token ;
-import org.openjena.riot.tokens.TokenType ;
-import org.openjena.riot.tokens.Tokenizer ;
 
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.sparql.core.Quad ;

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNTriples.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNTriples.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNTriples.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNTriples.java Sat Dec 15 18:02:38 2012
@@ -19,11 +19,11 @@
 package org.openjena.riot.lang;
 
 import org.apache.jena.atlas.lib.Sink ;
+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.system.ParserProfile ;
-import org.openjena.riot.tokens.Token ;
-import org.openjena.riot.tokens.TokenType ;
-import org.openjena.riot.tokens.Tokenizer ;
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
 

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNTuple.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNTuple.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNTuple.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNTuple.java Sat Dec 15 18:02:38 2012
@@ -21,11 +21,11 @@ package org.openjena.riot.lang;
 import java.util.Iterator ;
 
 import org.apache.jena.atlas.lib.Sink ;
+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.system.ParserProfile ;
-import org.openjena.riot.tokens.Token ;
-import org.openjena.riot.tokens.TokenType ;
-import static org.openjena.riot.tokens.TokenType.* ;
-import org.openjena.riot.tokens.Tokenizer ;
+import static org.apache.jena.riot.tokens.TokenType.* ;
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
 

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangRDFJSON.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangRDFJSON.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangRDFJSON.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangRDFJSON.java Sat Dec 15 18:02:38 2012
@@ -24,11 +24,11 @@ import com.hp.hpl.jena.graph.Triple ;
 
 import org.apache.jena.atlas.json.io.parser.TokenizerJSON ;
 import org.apache.jena.atlas.lib.* ;
+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.tokens.Token;
-import org.openjena.riot.tokens.TokenType;
-import org.openjena.riot.tokens.Tokenizer;
 
 import org.openjena.riot.system.ParserProfile;
 

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangRDFXML.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangRDFXML.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangRDFXML.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangRDFXML.java Sat Dec 15 18:02:38 2012
@@ -24,9 +24,9 @@ import java.io.Reader ;
 
 import org.apache.jena.atlas.io.IO ;
 import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.riot.checker.CheckerLiterals ;
 import org.openjena.riot.ErrorHandler ;
 import org.openjena.riot.Lang ;
-import org.openjena.riot.checker.CheckerLiterals ;
 import org.openjena.riot.system.ParserProfile ;
 import org.openjena.riot.system.RiotLib ;
 import org.xml.sax.SAXException ;

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTriG.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTriG.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTriG.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTriG.java Sat Dec 15 18:02:38 2012
@@ -18,14 +18,14 @@
 
 package org.openjena.riot.lang;
 
-import static org.openjena.riot.tokens.TokenType.DOT ;
-import static org.openjena.riot.tokens.TokenType.RBRACE ;
+import static org.apache.jena.riot.tokens.TokenType.DOT ;
+import static org.apache.jena.riot.tokens.TokenType.RBRACE ;
 import org.apache.jena.atlas.lib.Sink ;
+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.system.ParserProfile ;
-import org.openjena.riot.tokens.Token ;
-import org.openjena.riot.tokens.TokenType ;
-import org.openjena.riot.tokens.Tokenizer ;
 
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.sparql.core.Quad ;

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtle.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtle.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtle.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtle.java Sat Dec 15 18:02:38 2012
@@ -18,11 +18,11 @@
 
 package org.openjena.riot.lang;
 
-import static org.openjena.riot.tokens.TokenType.DOT ;
+import static org.apache.jena.riot.tokens.TokenType.DOT ;
 import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.riot.tokens.Tokenizer ;
 import org.openjena.riot.Lang ;
 import org.openjena.riot.system.ParserProfile ;
-import org.openjena.riot.tokens.Tokenizer ;
 
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.graph.Triple ;

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtleBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtleBase.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtleBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtleBase.java Sat Dec 15 18:02:38 2012
@@ -18,16 +18,17 @@
 
 package org.openjena.riot.lang;
 
-import static org.openjena.riot.tokens.TokenType.* ;
+import static org.apache.jena.riot.tokens.TokenType.* ;
 import org.openjena.riot.system.ParserProfile ;
-import org.openjena.riot.tokens.Token ;
-import org.openjena.riot.tokens.TokenType ;
-import org.openjena.riot.tokens.Tokenizer ;
 
 import com.hp.hpl.jena.graph.Node ;
 
 import org.apache.jena.atlas.lib.Sink ;
 import org.apache.jena.iri.IRI ;
+import org.apache.jena.riot.tokens.Token ;
+import org.apache.jena.riot.tokens.TokenType ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+
 import com.hp.hpl.jena.sparql.graph.NodeConst ;
 import com.hp.hpl.jena.vocabulary.OWL ;
 

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/Checker.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/Checker.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/Checker.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/Checker.java Sat Dec 15 18:02:38 2012
@@ -20,15 +20,11 @@ package org.openjena.riot.system;
 
 import org.openjena.riot.ErrorHandler ;
 import org.openjena.riot.ErrorHandlerFactory ;
-import org.openjena.riot.checker.CheckerBlankNodes ;
-import org.openjena.riot.checker.CheckerIRI ;
-import org.openjena.riot.checker.CheckerLiterals ;
-import org.openjena.riot.checker.CheckerVar ;
-import org.openjena.riot.checker.NodeChecker ;
 
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.graph.Triple ;
 import org.apache.jena.iri.IRI ;
+import org.apache.jena.riot.checker.* ;
 
 /** A checker validates RDF terms. */
 public final class Checker

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderNTriples2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderNTriples2.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderNTriples2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderNTriples2.java Sat Dec 15 18:02:38 2012
@@ -19,10 +19,10 @@
 package org.openjena.riot.system;
 
 import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.riot.tokens.Tokenizer ;
 import org.openjena.riot.RiotLoader ;
 import org.openjena.riot.RiotReader ;
 import org.openjena.riot.lang.LangRIOT ;
-import org.openjena.riot.tokens.Tokenizer ;
 
 import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.rdf.model.Model ;

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderRIOT.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderRIOT.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderRIOT.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderRIOT.java Sat Dec 15 18:02:38 2012
@@ -25,8 +25,8 @@ import java.io.Reader ;
 import java.net.URL ;
 import java.net.URLConnection ;
 
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
 import org.slf4j.LoggerFactory ;
 
 import com.hp.hpl.jena.graph.GraphEvents ;

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderRdfJson.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderRdfJson.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderRdfJson.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderRdfJson.java Sat Dec 15 18:02:38 2012
@@ -24,10 +24,10 @@ import java.io.Reader;
 import org.apache.jena.atlas.io.PeekReader ;
 import org.apache.jena.atlas.json.io.parser.TokenizerJSON ;
 import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.riot.tokens.Tokenizer ;
 import org.openjena.riot.RiotLoader;
 import org.openjena.riot.RiotReader;
 import org.openjena.riot.lang.LangRIOT;
-import org.openjena.riot.tokens.Tokenizer;
 
 import com.hp.hpl.jena.graph.Triple;
 import com.hp.hpl.jena.rdf.model.Model;

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderTurtle2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderTurtle2.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderTurtle2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderTurtle2.java Sat Dec 15 18:02:38 2012
@@ -23,12 +23,13 @@ import java.util.Map ;
 import org.openjena.riot.RiotLoader ;
 import org.openjena.riot.RiotReader ;
 import org.openjena.riot.lang.LangTurtle ;
-import org.openjena.riot.tokens.Tokenizer ;
 
 import com.hp.hpl.jena.graph.Triple ;
 
 import org.apache.jena.atlas.lib.Sink ;
 import org.apache.jena.iri.IRI ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+
 import com.hp.hpl.jena.rdf.model.Model ;
 
 

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ParserProfile.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ParserProfile.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ParserProfile.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ParserProfile.java Sat Dec 15 18:02:38 2012
@@ -20,12 +20,13 @@ package org.openjena.riot.system;
 
 import org.openjena.riot.ErrorHandler ;
 import org.openjena.riot.lang.LabelToNode ;
-import org.openjena.riot.tokens.Token ;
 
 import com.hp.hpl.jena.datatypes.RDFDatatype ;
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.graph.Triple ;
 import org.apache.jena.iri.IRI ;
+import org.apache.jena.riot.tokens.Token ;
+
 import com.hp.hpl.jena.sparql.core.Quad ;
 
 public interface ParserProfile

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ParserProfileBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ParserProfileBase.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ParserProfileBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ParserProfileBase.java Sat Dec 15 18:02:38 2012
@@ -19,12 +19,12 @@
 package org.openjena.riot.system;
 
 import org.apache.jena.iri.IRI ;
+import org.apache.jena.riot.tokens.Token ;
+import org.apache.jena.riot.tokens.TokenType ;
 import org.openjena.riot.ErrorHandler ;
 import org.openjena.riot.RiotException ;
 import org.openjena.riot.SysRIOT ;
 import org.openjena.riot.lang.LabelToNode ;
-import org.openjena.riot.tokens.Token ;
-import org.openjena.riot.tokens.TokenType ;
 
 import com.hp.hpl.jena.datatypes.RDFDatatype ;
 import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ParserProfileChecker.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ParserProfileChecker.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ParserProfileChecker.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ParserProfileChecker.java Sat Dec 15 18:02:38 2012
@@ -20,13 +20,14 @@ package org.openjena.riot.system;
 
 import org.openjena.riot.ErrorHandler ;
 import org.openjena.riot.RiotException ;
-import org.openjena.riot.checker.CheckerIRI ;
-import org.openjena.riot.checker.CheckerLiterals ;
 
 import com.hp.hpl.jena.datatypes.RDFDatatype ;
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.graph.Triple ;
 import org.apache.jena.iri.IRI ;
+import org.apache.jena.riot.checker.CheckerIRI ;
+import org.apache.jena.riot.checker.CheckerLiterals ;
+
 import com.hp.hpl.jena.sparql.core.Quad ;
 
 public class ParserProfileChecker extends ParserProfileBase //implements ParserProfile 

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/RiotLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/RiotLib.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/RiotLib.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/RiotLib.java Sat Dec 15 18:02:38 2012
@@ -19,12 +19,12 @@
 package org.openjena.riot.system;
 
 import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.riot.tokens.Token ;
+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.Lang ;
-import org.openjena.riot.tokens.Token ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
 
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.query.ARQ ;

Modified: jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java Sat Dec 15 18:02:38 2012
@@ -31,6 +31,8 @@ import org.apache.jena.atlas.lib.Sink ;
 import org.apache.jena.atlas.lib.SinkCounting ;
 import org.apache.jena.atlas.lib.SinkNull ;
 import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
 import org.apache.log4j.PropertyConfigurator ;
 import org.openjena.riot.* ;
 import org.openjena.riot.lang.LabelToNode ;
@@ -43,8 +45,6 @@ import org.openjena.riot.process.inf.Inf
 import org.openjena.riot.process.inf.InferenceSetupRDFS ;
 import org.openjena.riot.system.RiotLib ;
 import org.openjena.riot.system.SyntaxLabels ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
 import arq.cmd.CmdException ;
 import arq.cmdline.* ;
 

Modified: jena/trunk/jena-arq/src/main/java/riotcmd/CmdTokens.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/CmdTokens.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/CmdTokens.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/CmdTokens.java Sat Dec 15 18:02:38 2012
@@ -21,9 +21,9 @@ package riotcmd;
 import java.io.InputStream ;
 
 import org.apache.jena.atlas.io.IO ;
-import org.openjena.riot.tokens.Token ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
+import org.apache.jena.riot.tokens.Token ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
 
 import com.hp.hpl.jena.sparql.util.Timer ;
 

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java Sat Dec 15 18:02:38 2012
@@ -25,13 +25,13 @@ import java.util.List ;
 
 import junit.framework.JUnit4TestAdapter ;
 import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.riot.tokens.Tokenizer ;
+import org.apache.jena.riot.tokens.TokenizerFactory ;
 import org.junit.AfterClass ;
 import org.junit.BeforeClass ;
 import org.junit.Test ;
 import org.openjena.riot.RiotException ;
 import org.openjena.riot.system.PrefixMap ;
-import org.openjena.riot.tokens.Tokenizer ;
-import org.openjena.riot.tokens.TokenizerFactory ;
 
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.rdf.model.AnonId ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java Sat Dec 15 18:02:38 2012
@@ -24,7 +24,7 @@ import java.io.PrintWriter ;
 import java.util.* ;
 
 import org.apache.jena.atlas.logging.Log ;
-import org.openjena.riot.checker.CheckerLiterals ;
+import org.apache.jena.riot.checker.CheckerLiterals ;
 
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.query.* ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/UpdateTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/UpdateTest.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/UpdateTest.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/UpdateTest.java Sat Dec 15 18:02:38 2012
@@ -22,7 +22,7 @@ import java.util.ArrayList ;
 import java.util.List ;
 
 import org.apache.jena.atlas.iterator.Iter ;
-import org.openjena.riot.checker.CheckerLiterals ;
+import org.apache.jena.riot.checker.CheckerLiterals ;
 
 import com.hp.hpl.jena.query.Dataset ;
 import com.hp.hpl.jena.query.DatasetFactory ;

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java?rev=1422300&r1=1422299&r2=1422300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java Sat Dec 15 18:02:38 2012
@@ -20,6 +20,8 @@ package org.apache.jena.riot;
 
 import org.apache.jena.riot.adapters.TS_RIOTAdapters ;
 import org.apache.jena.riot.stream.TS_IO2 ;
+import org.apache.jena.riot.tokens.TestTokenForNode ;
+import org.apache.jena.riot.tokens.TestTokenizer ;
 import org.junit.BeforeClass ;
 import org.junit.runner.RunWith ;
 import org.junit.runners.Suite ;
@@ -29,6 +31,9 @@ import org.openjena.riot.TS_Riot1 ;
 @RunWith(Suite.class)
 @Suite.SuiteClasses( {
       TS_Riot1.class
+      , TestTokenizer.class
+      , TestTokenForNode.class
+
       , TS_LangSuite.class
       , TS_ReaderRIOT.class
       , TS_IO2.class